archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

vk: Cleanup compiler warnings

Browse source
This commit is contained in:
kd-11 2025-06-23 01:43:31 +03:00 • committed by kd-11
parent 8130babad3
commit 3f635033cc
9 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/VK/VKCompute.cpp
View file

@ -353,7 +353,7 @@ namespace vk
m_src = fmt::replace_all(m_src, syntax_replace); 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({ src->value, 0, block_length }, 0, 0);
m_program->bind_uniform({ dst->value, 0, 4 }, 0, 1); m_program->bind_uniform({ dst->value, 0, 4 }, 0, 1);

2
rpcs3/Emu/RSX/VK/VKCompute.h
View file

@ -35,7 +35,7 @@ namespace vk
void destroy(); void destroy();
virtual std::vector<glsl::program_input> get_inputs(); virtual std::vector<glsl::program_input> 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); void load_program(const vk::command_buffer& cmd);

3
rpcs3/Emu/RSX/VK/VKDraw.cpp
View file

@ -761,9 +761,6 @@ void VKGSRender::emit_geometry(u32 sub_index)
return; 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 // Programs data is dependent on vertex state
auto upload_info = upload_vertex_data(); auto upload_info = upload_vertex_data();
if (!upload_info.vertex_draw_count) if (!upload_info.vertex_draw_count)

3
rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
View file

@ -62,7 +62,6 @@ void VKFragmentDecompilerThread::prepareBindingTable()
if (has_textures) [[ likely ]] if (has_textures) [[ likely ]]
{ {
unsigned num_textures = 0;
for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM]) for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
{ {
if (!PT.type.starts_with("sampler")) if (!PT.type.starts_with("sampler"))
@ -72,8 +71,6 @@ void VKFragmentDecompilerThread::prepareBindingTable()
for (const ParamItem& PI : PT.items) for (const ParamItem& PI : PT.items)
{ {
num_textures++;
const auto texture_id = vk::get_texture_index(PI.name); const auto texture_id = vk::get_texture_index(PI.name);
const auto mask = 1u << texture_id; const auto mask = 1u << texture_id;

2
rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
View file

@ -337,7 +337,7 @@ namespace vk
m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_view); 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 // Non-caching write
auto& set = m_sets[set_id]; auto& set = m_sets[set_id];

4
rpcs3/Emu/RSX/VK/VKProgramPipeline.h
View file

@ -170,7 +170,7 @@ namespace vk
class program class program
{ {
VkDevice m_device = VK_NULL_HANDLE; VkDevice m_device = VK_NULL_HANDLE;
VkPipeline m_pipeline = VK_NULL_HANDLE; VkPipeline m_pipeline = VK_NULL_HANDLE;
VkPipelineLayout m_pipeline_layout = 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, 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(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 VkPipelineLayout layout() const { return m_pipeline_layout; }
inline VkPipeline value() const { return m_pipeline; } inline VkPipeline value() const { return m_pipeline; }

2
rpcs3/Emu/RSX/VK/VKResolveHelper.h
View file

@ -51,7 +51,7 @@ namespace vk
return result; 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 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)); auto resolved_view = resolve->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));

4
rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
View file

@ -46,7 +46,7 @@ namespace vk
return location; 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)); 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(); const VkDescriptorImageInfo* texture_ptr = sampled_images.data();
for (u32 i = 0; i < 4; ++i, ++binding, texture_ptr += 16) 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);
} }
} }

2
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
View file

@ -97,7 +97,7 @@ namespace vk
return result; 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 // Bind relevant stuff
if (!m_sampler) if (!m_sampler)