From ba968048c9ea80bec2b8412f2beb1660881e0b1c Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 26 Mar 2017 01:24:19 +0300 Subject: [PATCH] vk: Minor fixes to vertex counting and lower exception to notice if var does not exist --- rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp | 5 +++-- rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index 32cd8f3b66..0805c70e76 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -64,7 +64,7 @@ namespace vk } } - fmt::throw_exception("texture not found" HERE); + LOG_NOTICE(RSX, "texture not found in program: %s", uniform_name.c_str()); } void program::bind_uniform(VkDescriptorBufferInfo buffer_descriptor, uint32_t binding_point, VkDescriptorSet &descriptor_set) @@ -100,7 +100,8 @@ namespace vk return; } } - fmt::throw_exception("vertex buffer not found" HERE); + + LOG_NOTICE(RSX, "vertex buffer not found in program: %s", binding_name.c_str()); } } } diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp index f078b42111..969b8b4f12 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp @@ -375,7 +375,7 @@ namespace u32 min_index = rsx::method_registers.current_draw_clause.first_count_commands.front().first; u32 max_index = - rsx::method_registers.current_draw_clause.get_elements_count() + min_index; + rsx::method_registers.current_draw_clause.get_elements_count() + min_index - 1; if (primitives_emulated) { std::tie(index_count, index_info) =