Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[meta] fix some compilation errors (#2741)

crueter94ca83a6ca2c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08162bb48a..e0466da3bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -574,7 +574,8 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
endif()
if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
- find_package(httplib)
+ # Workaround: httplib will kill itself if you attempt to do a find_package propagation
+ # find_package(httplib CONFIG)
endif()
if (ENABLE_WEB_SERVICE)
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index dde8c22d5f..669357588a 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -29,7 +29,8 @@
"repo": "yhirose/cpp-httplib",
"tag": "v%VERSION%",
"hash": "b364500f76e2ecb0fe21b032d831272e3f1dfeea71af74e325f8fc4ce9dcdb3c941b97a5b422bdeafb9facd058597b90f8bfc284fb9afe3c33fefa15dd5a010b",
- "git_version": "0.26.0"
+ "git_version": "0.26.0",
+ "find_args": "MODULE GLOBAL"
},
"cpp-jwt": {
"version": "1.4",
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
index 0f0d27c6f7..379db85cd0 100644
--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
@@ -341,7 +341,7 @@ BufferCacheRuntime::BufferCacheRuntime(const Device& device_, MemoryAllocator& m
device.GetUniformBufferAlignment() //check if the device has it
);
// add the ability to change the size in settings in future
- uniform_ring.Init(device, memory_allocator, 8 * 1024 * 1024 /* 8 MiB */, ubo_align ? ubo_align : 256);
+ uniform_ring.Init(memory_allocator, 8 * 1024 * 1024 /* 8 MiB */, ubo_align ? ubo_align : 256);
quad_array_index_buffer = std::make_shared<QuadArrayIndexBuffer>(device_, memory_allocator_,
scheduler_, staging_pool_);
quad_strip_index_buffer = std::make_shared<QuadStripIndexBuffer>(device_, memory_allocator_,
@@ -360,9 +360,8 @@ void BufferCacheRuntime::FreeDeferredStagingBuffer(StagingBufferRef& ref) {
staging_pool.FreeDeferred(ref);
}
-void BufferCacheRuntime::UniformRing::Init(const Device& device,
- MemoryAllocator& alloc,
- u64 bytes, u32 alignment) {
+void BufferCacheRuntime::UniformRing::Init(MemoryAllocator& alloc, u32 alignment, u64 bytes)
+{
for (size_t i = 0; i < NUM_FRAMES; ++i) {
VkBufferCreateInfo ci{
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h
index 86bce01596..dd187d9420 100644
--- a/src/video_core/renderer_vulkan/vk_buffer_cache.h
+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h
@@ -172,7 +172,7 @@ private:
u32 align = 256;
size_t current_frame = 0;
- void Init(const Device& device, MemoryAllocator& alloc, u64 bytes, u32 alignment);
+ void Init(MemoryAllocator& alloc, u32 alignment, u64 bytes);
void BeginFrame() {
current_frame = (current_frame + 1) % NUM_FRAMES;
head = 0;