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

vk: Use unique resource ids on buffer views

Browse source
This commit is contained in:
kd-11 2025-10-17 03:14:02 +03:00 committed by kd-11
parent 5a91ed01eb
commit eb453462c1
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -816,8 +816,8 @@ void VKGSRender::emit_geometry(u32 sub_index)
m_current_command_buffer->flags |= (vk::command_buffer::cb_has_occlusion_task | vk::command_buffer::cb_has_open_query); m_current_command_buffer->flags |= (vk::command_buffer::cb_has_occlusion_task | vk::command_buffer::cb_has_open_query);
} }
auto persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value; VkDescriptorBufferViewEx persistent_buffer = m_persistent_attribute_storage ? *m_persistent_attribute_storage : *null_buffer_view;
auto volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value; VkDescriptorBufferViewEx volatile_buffer = m_volatile_attribute_storage ? *m_volatile_attribute_storage : *null_buffer_view;
bool update_descriptors = false; bool update_descriptors = false;
if (m_current_draw.subdraw_id == 0) if (m_current_draw.subdraw_id == 0)

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

@ -17,11 +17,7 @@ namespace vk
bool operator == (const descriptor_slot_t& a, const VkDescriptorImageInfoEx& b) bool operator == (const descriptor_slot_t& a, const VkDescriptorImageInfoEx& b)
{ {
const auto ptr = std::get_if<VkDescriptorImageInfoEx>(&a); const auto ptr = std::get_if<VkDescriptorImageInfoEx>(&a);
return !!ptr && return !!ptr && ptr->resourceId == b.resourceId;
ptr->imageView == b.imageView &&
ptr->resourceId == b.resourceId &&
ptr->sampler == b.sampler &&
ptr->imageLayout == b.imageLayout;
} }
bool operator == (const descriptor_slot_t& a, const VkDescriptorBufferInfo& b) bool operator == (const descriptor_slot_t& a, const VkDescriptorBufferInfo& b)
@ -33,10 +29,10 @@ namespace vk
ptr->range == b.range; ptr->range == b.range;
} }
bool operator == (const descriptor_slot_t& a, const VkBufferView& b) bool operator == (const descriptor_slot_t& a, const VkDescriptorBufferViewEx& b)
{ {
const auto ptr = std::get_if<VkBufferView>(&a); const auto ptr = std::get_if<VkDescriptorBufferViewEx>(&a);
return !!ptr && *ptr == b; return !!ptr && ptr->resourceId == b.resourceId;
} }
bool operator == (const descriptor_slot_t& a, const std::span<const VkDescriptorImageInfoEx>& b) bool operator == (const descriptor_slot_t& a, const std::span<const VkDescriptorImageInfoEx>& b)
@ -334,7 +330,7 @@ namespace vk
m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_descriptor); m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_descriptor);
} }
void program::bind_uniform(const VkBufferView &buffer_view, u32 set_id, u32 binding_point) void program::bind_uniform(const VkDescriptorBufferViewEx& buffer_view, u32 set_id, u32 binding_point)
{ {
if (m_sets[set_id].m_descriptor_slots[binding_point] == buffer_view) if (m_sets[set_id].m_descriptor_slots[binding_point] == buffer_view)
{ {
@ -492,9 +488,9 @@ namespace vk
return; return;
} }
if (auto ptr = std::get_if<VkBufferView>(&slot)) if (auto ptr = std::get_if<VkDescriptorBufferViewEx>(&slot))
{ {
m_descriptor_set.push(*ptr, type, idx); m_descriptor_set.push(ptr->view, type, idx);
return; return;
} }
@ -543,9 +539,9 @@ namespace vk
return; return;
} }
if (auto ptr = std::get_if<VkBufferView>(&slot)) if (auto ptr = std::get_if<VkDescriptorBufferViewEx>(&slot))
{ {
m_descriptor_template[idx].pTexelBufferView = m_descriptor_set.store(*ptr); m_descriptor_template[idx].pTexelBufferView = m_descriptor_set.store(ptr->view);
return; return;
} }

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

@ -115,7 +115,7 @@ namespace vk
}; };
using descriptor_image_array_t = rsx::simple_array<VkDescriptorImageInfoEx>; using descriptor_image_array_t = rsx::simple_array<VkDescriptorImageInfoEx>;
using descriptor_slot_t = std::variant<VkDescriptorImageInfoEx, VkDescriptorBufferInfo, VkBufferView, descriptor_image_array_t>; using descriptor_slot_t = std::variant<VkDescriptorImageInfoEx, VkDescriptorBufferInfo, VkDescriptorBufferViewEx, descriptor_image_array_t>;
struct descriptor_table_t struct descriptor_table_t
{ {
@ -202,9 +202,9 @@ namespace vk
std::pair<u32, u32> get_uniform_location(::glsl::program_domain domain, program_input_type type, const std::string& uniform_name); std::pair<u32, u32> get_uniform_location(::glsl::program_domain domain, program_input_type type, const std::string& uniform_name);
void bind_uniform(const VkDescriptorImageInfoEx& image_descriptor, u32 set_id, u32 binding_point); void bind_uniform(const VkDescriptorImageInfoEx& image_descriptor, u32 set_id, u32 binding_point);
void bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 set_id, u32 binding_point); void bind_uniform(const VkDescriptorBufferInfo& buffer_descriptor, u32 set_id, u32 binding_point);
void bind_uniform(const VkBufferView &buffer_view, u32 set_id, u32 binding_point); void bind_uniform(const VkDescriptorBufferViewEx& 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 VkDescriptorBufferViewEx& buffer_view, ::glsl::program_domain domain, program_input_type type, const std::string &binding_name);
void bind_uniform_array(const std::span<const VkDescriptorImageInfoEx>& image_descriptors,u32 set_id, u32 binding_point); void bind_uniform_array(const std::span<const VkDescriptorImageInfoEx>& image_descriptors,u32 set_id, u32 binding_point);