Updated FFmpeg per dev comment, reupdated-dependencies and initialized more values

This commit is contained in:
Jarrod Norwell 2024-03-12 01:23:31 +08:00
parent a0ce82c528
commit 169fe4fabc
5 changed files with 12 additions and 12 deletions

@ -1 +1 @@
Subproject commit d65908c3d416e331e075c3a5ffe7bc670112a018 Subproject commit 53a952a7313f2c78d93a4f6805abe570fe35f96b

View File

@ -25,9 +25,9 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
namespace = "org.yuzu.yuzu_emu" namespace = "org.yuzu.yuzu_emu"
compileSdk = 34
compileSdkVersion = "android-34" ndkVersion = "26.2.11394342"
ndkVersion = "26.1.10909125"
buildFeatures { buildFeatures {
viewBinding = true viewBinding = true
@ -161,6 +161,7 @@ android {
path = file("../../../CMakeLists.txt") path = file("../../../CMakeLists.txt")
} }
} }
buildToolsVersion = "34.0.0"
defaultConfig { defaultConfig {
externalNativeBuild { externalNativeBuild {
@ -232,7 +233,7 @@ dependencies {
implementation("com.google.android.material:material:1.11.0") implementation("com.google.android.material:material:1.11.0")
implementation("androidx.preference:preference-ktx:1.2.1") implementation("androidx.preference:preference-ktx:1.2.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
implementation("io.coil-kt:coil:2.2.2") implementation("io.coil-kt:coil:2.6.0")
implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.window:window:1.2.0") implementation("androidx.window:window:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.constraintlayout:constraintlayout:2.1.4")
@ -240,7 +241,7 @@ dependencies {
implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
implementation("androidx.navigation:navigation-ui-ktx:2.7.7") implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
implementation("info.debatty:java-string-similarity:2.0.0") implementation("info.debatty:java-string-similarity:2.0.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
} }
fun runGitCommand(command: List<String>): String { fun runGitCommand(command: List<String>): String {

View File

@ -38,7 +38,7 @@ public:
} }
private: private:
libusb_context* ctx; libusb_context* ctx = nullptr;
int init_result{}; int init_result{};
}; };
@ -66,7 +66,7 @@ public:
} }
private: private:
libusb_device_handle* handle{}; libusb_device_handle* handle = nullptr;
}; };
GCAdapter::GCAdapter(std::string input_engine_) : InputEngine(std::move(input_engine_)) { GCAdapter::GCAdapter(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
@ -218,8 +218,7 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) {
Common::SetCurrentThreadName("ScanGCAdapter"); Common::SetCurrentThreadName("ScanGCAdapter");
usb_adapter_handle = nullptr; usb_adapter_handle = nullptr;
pads = {}; pads = {};
while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) { while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) {}
}
} }
bool GCAdapter::Setup() { bool GCAdapter::Setup() {

View File

@ -117,7 +117,7 @@ private:
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const; Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
std::unique_ptr<LibUSBDeviceHandle> usb_adapter_handle; std::unique_ptr<LibUSBDeviceHandle> usb_adapter_handle;
std::array<GCController, 4> pads; std::array<GCController, 4> pads{};
std::jthread adapter_input_thread; std::jthread adapter_input_thread;
std::jthread adapter_scan_thread; std::jthread adapter_scan_thread;

View File

@ -241,8 +241,8 @@ void BufferCacheRuntime::BindVertexBuffer(u32 index, Buffer& buffer, u32 offset,
void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings) { void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings) {
// TODO: Should HostBindings provide the correct runtime types to avoid these transforms? // TODO: Should HostBindings provide the correct runtime types to avoid these transforms?
std::array<GLuint, 32> buffer_handles; std::array<GLuint, 32> buffer_handles{};
std::array<GLsizei, 32> buffer_strides; std::array<GLsizei, 32> buffer_strides{};
std::ranges::transform(bindings.buffers, buffer_handles.begin(), std::ranges::transform(bindings.buffers, buffer_handles.begin(),
[](const Buffer* const buffer) { return buffer->Handle(); }); [](const Buffer* const buffer) { return buffer->Handle(); });
std::ranges::transform(bindings.strides, buffer_strides.begin(), std::ranges::transform(bindings.strides, buffer_strides.begin(),