diff --git a/.gitmodules b/.gitmodules index e9f3ba542..a4a76da50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url = https://github.com/catchorg/Catch2 [submodule "dynarmic"] path = externals/dynarmic - url = https://github.com/merryhime/dynarmic.git + url = https://github.com/GPUCode/dynarmic.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git diff --git a/externals/dynarmic b/externals/dynarmic index 165621a87..7d51269f5 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 165621a872ffb802c7a26ef5900e1e62681f1a88 +Subproject commit 7d51269f59c662add7c7c580c025f4dce7592664 diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index e6ec8cd29..512d75470 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -581,12 +581,13 @@ bool RasterizerVulkan::Draw(bool accelerate, bool is_indexed) { pipeline_cache.BindPipeline(pipeline_info, true); const u64 vertex_size = vertex_batch.size() * sizeof(HardwareVertex); + const u32 vertex_count = static_cast(vertex_batch.size()); auto [buffer, offset, _] = stream_buffer.Map(vertex_size, sizeof(HardwareVertex)); std::memcpy(buffer, vertex_batch.data(), vertex_size); stream_buffer.Commit(vertex_size); - scheduler.Record([this, offset = offset, vertex_count = vertex_batch.size()](vk::CommandBuffer cmdbuf) { + scheduler.Record([this, offset = offset, vertex_count](vk::CommandBuffer cmdbuf) { cmdbuf.bindVertexBuffers(0, stream_buffer.Handle(), offset); cmdbuf.draw(vertex_count, 1, 0, 0); });