From 3f635033cce8ee4990d7c3321fe8a6509c9e1922 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 23 Jun 2025 01:43:31 +0300 Subject: [PATCH] vk: Cleanup compiler warnings --- rpcs3/Emu/RSX/VK/VKCompute.cpp | 2 +- rpcs3/Emu/RSX/VK/VKCompute.h | 2 +- rpcs3/Emu/RSX/VK/VKDraw.cpp | 3 --- rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp | 3 --- rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp | 2 +- rpcs3/Emu/RSX/VK/VKProgramPipeline.h | 4 ++-- rpcs3/Emu/RSX/VK/VKResolveHelper.h | 2 +- rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp | 4 ++-- rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp | 2 +- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKCompute.cpp b/rpcs3/Emu/RSX/VK/VKCompute.cpp index 9d91773988..3df2c9695a 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.cpp +++ b/rpcs3/Emu/RSX/VK/VKCompute.cpp @@ -353,7 +353,7 @@ namespace vk m_src = fmt::replace_all(m_src, syntax_replace); } - void cs_aggregator::bind_resources(const vk::command_buffer& cmd) + void cs_aggregator::bind_resources(const vk::command_buffer& /*cmd*/) { m_program->bind_uniform({ src->value, 0, block_length }, 0, 0); m_program->bind_uniform({ dst->value, 0, 4 }, 0, 1); diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h index 0dfa80f4f5..5d20a60391 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.h +++ b/rpcs3/Emu/RSX/VK/VKCompute.h @@ -35,7 +35,7 @@ namespace vk void destroy(); virtual std::vector get_inputs(); - virtual void bind_resources(const vk::command_buffer& cmd) {} + virtual void bind_resources(const vk::command_buffer& /*cmd*/) {} void load_program(const vk::command_buffer& cmd); diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp index ae5348c52f..2a6d195bef 100644 --- a/rpcs3/Emu/RSX/VK/VKDraw.cpp +++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp @@ -761,9 +761,6 @@ void VKGSRender::emit_geometry(u32 sub_index) return; } - const auto old_persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value; - const auto old_volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value; - // Programs data is dependent on vertex state auto upload_info = upload_vertex_data(); if (!upload_info.vertex_draw_count) diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index 94012840ec..040d528218 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -62,7 +62,6 @@ void VKFragmentDecompilerThread::prepareBindingTable() if (has_textures) [[ likely ]] { - unsigned num_textures = 0; for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM]) { if (!PT.type.starts_with("sampler")) @@ -72,8 +71,6 @@ void VKFragmentDecompilerThread::prepareBindingTable() for (const ParamItem& PI : PT.items) { - num_textures++; - const auto texture_id = vk::get_texture_index(PI.name); const auto mask = 1u << texture_id; diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index bd12828e08..aae8407103 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -337,7 +337,7 @@ namespace vk m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_view); } - void program::bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, VkDescriptorType type, int count, u32 set_id, u32 binding_point) + void program::bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, int count, u32 set_id, u32 binding_point) { // Non-caching write auto& set = m_sets[set_id]; diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h index 4b38d23fb8..c7faaa8c37 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h @@ -170,7 +170,7 @@ namespace vk class program { - VkDevice m_device = VK_NULL_HANDLE; + VkDevice m_device = VK_NULL_HANDLE; VkPipeline m_pipeline = VK_NULL_HANDLE; VkPipelineLayout m_pipeline_layout = VK_NULL_HANDLE; @@ -202,7 +202,7 @@ namespace vk void bind_uniform(const VkBufferView &buffer_view, u32 set_id, u32 binding_point); void bind_uniform(const VkBufferView &buffer_view, ::glsl::program_domain domain, program_input_type type, const std::string &binding_name); - void bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, VkDescriptorType type, int count, u32 set_id, u32 binding_point); + void bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, int count, u32 set_id, u32 binding_point); inline VkPipelineLayout layout() const { return m_pipeline_layout; } inline VkPipeline value() const { return m_pipeline; } diff --git a/rpcs3/Emu/RSX/VK/VKResolveHelper.h b/rpcs3/Emu/RSX/VK/VKResolveHelper.h index 05ea997096..23d243b032 100644 --- a/rpcs3/Emu/RSX/VK/VKResolveHelper.h +++ b/rpcs3/Emu/RSX/VK/VKResolveHelper.h @@ -51,7 +51,7 @@ namespace vk return result; } - void bind_resources(const vk::command_buffer& cmd) override + void bind_resources(const vk::command_buffer& /*cmd*/) override { auto msaa_view = multisampled->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED)); auto resolved_view = resolve->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY)); diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index 760e069fb6..d389423dd2 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -46,7 +46,7 @@ namespace vk return location; } - u32 shader_interpreter::init(VKFragmentProgram* vk_prog, u64 compiler_opt) const + u32 shader_interpreter::init(VKFragmentProgram* vk_prog, u64 /*compiler_opt*/) const { std::memset(&vk_prog->binding_table, 0xff, sizeof(vk_prog->binding_table)); @@ -413,7 +413,7 @@ namespace vk const VkDescriptorImageInfo* texture_ptr = sampled_images.data(); for (u32 i = 0; i < 4; ++i, ++binding, texture_ptr += 16) { - m_current_interpreter->bind_uniform_array(texture_ptr, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 16, set, binding); + m_current_interpreter->bind_uniform_array(texture_ptr, 16, set, binding); } } diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp index 23a4733c60..dc6562289e 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp +++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp @@ -97,7 +97,7 @@ namespace vk return result; } - void fsr_pass::bind_resources(const vk::command_buffer& cmd) + void fsr_pass::bind_resources(const vk::command_buffer& /*cmd*/) { // Bind relevant stuff if (!m_sampler)