From 7e971eb0328d5114cf273e67bce308be586c99ff Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Wed, 16 Mar 2016 17:41:28 +0100 Subject: [PATCH 1/2] vulkan: Fix for get_memory_mapping --- rpcs3/Emu/RSX/VK/VKHelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index 2c941fb29d..9616bc9018 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -44,7 +44,7 @@ namespace vk result.device_local = VK_MAX_MEMORY_TYPES; result.host_visible_coherent = VK_MAX_MEMORY_TYPES; - for (int i = 0; i < VK_MAX_MEMORY_TYPES; i++) + for (int i = 0; i < memory_properties.memoryTypeCount; i++) { bool is_device_local = !!(memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); if (is_device_local) From 6229733fbb64ab4fa659be84feb4d9171bfa7183 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Wed, 16 Mar 2016 19:06:55 +0100 Subject: [PATCH 2/2] vulkan: Use a shared pipeline layout --- rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp | 6 +- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 13 +- rpcs3/Emu/RSX/VK/VKHelpers.h | 20 +- rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp | 434 +++++++------------------ rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp | 16 +- rpcs3/Emu/RSX/VK/VKVertexProgram.cpp | 4 +- 6 files changed, 152 insertions(+), 341 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index 958b8e9283..97c22d81cc 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -32,7 +32,7 @@ void VKFragmentDecompilerThread::insertHeader(std::stringstream & OS) OS << "#version 420" << std::endl; OS << "#extension GL_ARB_separate_shader_objects: enable" << std::endl << std::endl; - OS << "layout(std140, set=1, binding = 0) uniform ScaleOffsetBuffer" << std::endl; + OS << "layout(std140, set=0, binding = 0) uniform ScaleOffsetBuffer" << std::endl; OS << "{" << std::endl; OS << " mat4 scaleOffsetMat;" << std::endl; OS << " float fog_param0;" << std::endl; @@ -110,11 +110,11 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS) inputs.push_back(in); - OS << "layout(set=1, binding=" << location++ << ") uniform " << samplerType << " " << PI.name << ";" << std::endl; + OS << "layout(set=0, binding=" << 19 + location++ << ") uniform " << samplerType << " " << PI.name << ";" << std::endl; } } - OS << "layout(std140, set=1, binding = 1) uniform FragmentConstantsBuffer" << std::endl; + OS << "layout(std140, set = 0, binding = 2) uniform FragmentConstantsBuffer" << std::endl; OS << "{" << std::endl; for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM]) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 7208532c8c..f8b9e151e4 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -389,16 +389,16 @@ void VKGSRender::end() vk::texture *texture0 = nullptr; for (int i = 0; i < rsx::limits::textures_count; ++i) { - if (m_program->has_uniform(vk::glsl::glsl_fragment_program, "tex" + std::to_string(i))) + if (m_program->has_uniform("tex" + std::to_string(i))) { if (!textures[i].enabled()) { - m_program->bind_uniform(vk::glsl::glsl_fragment_program, "tex" + std::to_string(i)); + m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL}, "tex" + std::to_string(i)); continue; } vk::texture &tex = (texture0)? (*texture0): m_texture_cache.upload_texture(m_command_buffer, textures[i], m_rtts); - m_program->bind_uniform(vk::glsl::glsl_fragment_program, "tex" + std::to_string(i), tex); + m_program->bind_uniform({ tex, tex, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "tex" + std::to_string(i)); texture0 = &tex; } } @@ -730,10 +730,9 @@ bool VKGSRender::load_program() m_prog_buffer.fill_fragment_constans_buffer({ reinterpret_cast(buf), gsl::narrow(fragment_constants_sz) }, fragment_program); m_uniform_buffer->unmap(); - m_program->bind_uniform(vk::glsl::glsl_vertex_program, "ScaleOffsetBuffer", m_uniform_buffer->value, scale_offset_offset, 256); - m_program->bind_uniform(vk::glsl::glsl_vertex_program, "VertexConstantsBuffer", m_uniform_buffer->value, vertex_constants_offset, 512 * 4 * sizeof(float)); - m_program->bind_uniform(vk::glsl::glsl_fragment_program, "ScaleOffsetBuffer", m_uniform_buffer->value, scale_offset_offset, 256); - m_program->bind_uniform(vk::glsl::glsl_fragment_program, "FragmentConstantsBuffer", m_uniform_buffer->value, fragment_constants_offset, fragment_constants_sz); + m_program->bind_uniform({ m_uniform_buffer->value, scale_offset_offset, 256 }, SCALE_OFFSET_BIND_SLOT); + m_program->bind_uniform({ m_uniform_buffer->value, vertex_constants_offset, 512 * 4 * sizeof(float) }, VERTEX_CONSTANT_BUFFERS_BIND_SLOT); + m_program->bind_uniform({ m_uniform_buffer->value, fragment_constants_offset, fragment_constants_sz }, FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT); return true; } diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 2629d7eb2c..f3137fa156 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1346,8 +1346,8 @@ namespace vk VkShaderModule vs, fs; VkPipeline pipeline_handle = nullptr; - VkDescriptorSetLayout descriptor_layouts[2];; - VkDescriptorSet descriptor_sets[2]; + VkDescriptorSetLayout descriptor_layouts; + VkDescriptorSet descriptor_sets; VkPipelineLayout pipeline_layout; int num_targets = 1; @@ -1395,7 +1395,6 @@ namespace vk void set_primitive_restart(VkBool32 state); void init_descriptor_layout(); - void update_descriptors(); void destroy_descriptors(); void set_draw_buffer_count(u8 draw_buffers); @@ -1404,12 +1403,15 @@ namespace vk void use(vk::command_buffer& commands, VkRenderPass pass, u32 subpass); - bool has_uniform(program_domain domain, std::string uniform_name); - bool bind_uniform(program_domain domain, std::string uniform_name); - bool bind_uniform(program_domain domain, std::string uniform_name, vk::texture &_texture); - bool bind_uniform(program_domain domain, std::string uniform_name, VkBuffer _buffer, VkDeviceSize offset, VkDeviceSize size); - bool bind_uniform(program_domain domain, std::string uniform_name, vk::buffer_deprecated &_buffer); - bool bind_uniform(program_domain domain, std::string uniform_name, vk::buffer_deprecated &_buffer, bool is_texel_store); + bool has_uniform(std::string uniform_name); +#define VERTEX_BUFFERS_FIRST_BIND_SLOT 3 +#define FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT 2 +#define VERTEX_CONSTANT_BUFFERS_BIND_SLOT 1 +#define TEXTURES_FIRST_BIND_SLOT 19 +#define SCALE_OFFSET_BIND_SLOT 0 + void bind_uniform(VkDescriptorImageInfo image_descriptor, std::string uniform_name); + void bind_uniform(VkDescriptorBufferInfo buffer_descriptor, uint32_t binding_point); + void bind_uniform(const VkBufferView &buffer_view, const std::string &binding_name); program& operator = (const program&) = delete; program& operator = (program&& other); diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index 0127866d1d..db369fcff1 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -382,213 +382,104 @@ namespace vk } } + namespace + { + std::tuple get_shared_pipeline_layout(VkDevice dev) + { + std::array bindings = {}; + + size_t idx = 0; + // Vertex buffer + for (int i = 0; i < 16; i++) + { + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + bindings[idx].descriptorCount = 1; + bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT; + bindings[idx].binding = VERTEX_BUFFERS_FIRST_BIND_SLOT + i; + idx++; + } + + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + bindings[idx].descriptorCount = 1; + bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; + bindings[idx].binding = FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT; + + idx++; + + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + bindings[idx].descriptorCount = 1; + bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT; + bindings[idx].binding = VERTEX_CONSTANT_BUFFERS_BIND_SLOT; + + idx++; + + for (int i = 0; i < 16; i++) + { + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; + bindings[idx].descriptorCount = 1; + bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; + bindings[idx].binding = TEXTURES_FIRST_BIND_SLOT + i; + idx++; + } + + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + bindings[idx].descriptorCount = 1; + bindings[idx].stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS; + bindings[idx].binding = SCALE_OFFSET_BIND_SLOT; + + VkDescriptorSetLayoutCreateInfo infos = {}; + infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + infos.pBindings = bindings.data(); + infos.bindingCount = bindings.size(); + + VkDescriptorSetLayout set_layout; + CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &set_layout)); + + VkPipelineLayoutCreateInfo layout_info = {}; + layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; + layout_info.setLayoutCount = 1; + layout_info.pSetLayouts = &set_layout; + + VkPipelineLayout result; + CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &result)); + return std::make_tuple(result, set_layout); + } + } + void program::init_descriptor_layout() { - if (pstate.descriptor_layouts[0] != nullptr) - throw EXCEPTION("Existing descriptors found!"); - if (descriptor_pool.valid()) descriptor_pool.destroy(); - std::vector layout_bindings[2]; - std::vector sizes; + std::tie(pstate.pipeline_layout, pstate.descriptor_layouts) = get_shared_pipeline_layout(*device); - program_input_type types[] = { input_type_uniform_buffer, input_type_texel_buffer, input_type_texture }; - program_domain stages[] = { glsl_vertex_program, glsl_fragment_program }; + VkDescriptorPoolSize uniform_buffer_pool = { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , 3}; + VkDescriptorPoolSize uniform_texel_pool = { VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , 16}; + VkDescriptorPoolSize texture_pool = { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , 16 }; - VkDescriptorType vk_ids[] = { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER }; - VkShaderStageFlags vk_stages[] = { VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_FRAGMENT_BIT }; - - for (auto &input : uniforms) - { - VkDescriptorSetLayoutBinding binding; - binding.binding = input.location; - binding.descriptorCount = 1; - binding.descriptorType = vk_ids[(u32)input.type]; - binding.pImmutableSamplers = nullptr; - binding.stageFlags = vk_stages[(u32)input.domain]; - - layout_bindings[(u32)input.domain].push_back(binding); - } - - for (int i = 0; i < 3; ++i) - { - u32 count = 0; - for (auto &input : uniforms) - { - if (input.type == types[i]) - count++; - } - - if (!count) continue; - - VkDescriptorPoolSize size; - size.descriptorCount = count; - size.type = vk_ids[i]; - - sizes.push_back(size); - } + std::vector sizes{ uniform_buffer_pool, uniform_texel_pool, texture_pool }; descriptor_pool.create((*device), sizes.data(), sizes.size()); - VkDescriptorSetLayoutCreateInfo infos; - infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; - infos.pNext = nullptr; - infos.flags = 0; - infos.pBindings = layout_bindings[0].data(); - infos.bindingCount = layout_bindings[0].size(); - - CHECK_RESULT(vkCreateDescriptorSetLayout((*device), &infos, nullptr, &pstate.descriptor_layouts[0])); - - infos.pBindings = layout_bindings[1].data(); - infos.bindingCount = layout_bindings[1].size(); - - CHECK_RESULT(vkCreateDescriptorSetLayout((*device), &infos, nullptr, &pstate.descriptor_layouts[1])); - - VkPipelineLayoutCreateInfo layout_info; - layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; - layout_info.pNext = nullptr; - layout_info.setLayoutCount = 2; - layout_info.pSetLayouts = pstate.descriptor_layouts; - layout_info.flags = 0; - layout_info.pPushConstantRanges = nullptr; - layout_info.pushConstantRangeCount = 0; - - CHECK_RESULT(vkCreatePipelineLayout((*device), &layout_info, nullptr, &pstate.pipeline_layout)); - - VkDescriptorSetAllocateInfo alloc_info; + VkDescriptorSetAllocateInfo alloc_info = {}; alloc_info.descriptorPool = descriptor_pool; - alloc_info.descriptorSetCount = 2; - alloc_info.pNext = nullptr; - alloc_info.pSetLayouts = pstate.descriptor_layouts; + alloc_info.descriptorSetCount = 1; + alloc_info.pSetLayouts = &pstate.descriptor_layouts; alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; - CHECK_RESULT(vkAllocateDescriptorSets((*device), &alloc_info, pstate.descriptor_sets)); - } - - void program::update_descriptors() - { - if (!pstate.descriptor_layouts[0]) - init_descriptor_layout(); - - std::vector descriptor_writers; - std::vector images(16); - std::vector buffers(16); - std::vector texel_buffers(16); - std::vector texel_buffer_views(16); - VkWriteDescriptorSet write; - - int image_index = 0; - int buffer_index = 0; - int texel_buffer_index = 0; - - for (auto &input : uniforms) - { - switch (input.type) - { - case input_type_texture: - { - auto &image = images[image_index++]; - image.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - image.sampler = null_sampler(); - image.imageView = null_image_view(); - - if (input.as_sampler.sampler && input.as_sampler.image_view) - { - image.imageView = input.as_sampler.image_view; - image.sampler = input.as_sampler.sampler; - image.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - } - else - LOG_ERROR(RSX, "Texture object was not bound: %s", input.name); - - memset(&write, 0, sizeof(write)); - write.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; - write.pImageInfo = ℑ - write.descriptorCount = 1; - - break; - } - case input_type_uniform_buffer: - { - auto &buffer = buffers[buffer_index++]; - buffer.buffer = null_buffer(); - buffer.offset = 0; - buffer.range = 0; - - if (input.as_buffer.buffer) - { - buffer.buffer = input.as_buffer.buffer; - buffer.range = input.as_buffer.size; - buffer.offset = input.as_buffer.offset; - } - else - LOG_ERROR(RSX, "UBO was not bound: %s", input.name); - - memset(&write, 0, sizeof(write)); - write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - write.pBufferInfo = &buffer; - write.descriptorCount = 1; - break; - } - case input_type_texel_buffer: - { - auto &buffer_view = texel_buffer_views[texel_buffer_index]; - buffer_view = null_buffer_view(); - - auto &buffer = texel_buffers[texel_buffer_index++]; - buffer.buffer = null_buffer(); - buffer.offset = 0; - buffer.range = 0; - - if (input.as_buffer.buffer && input.as_buffer.buffer_view) - { - buffer_view = input.as_buffer.buffer_view; - buffer.buffer = input.as_buffer.buffer; - buffer.range = input.as_buffer.size; - } - else - LOG_ERROR(RSX, "Texel buffer was not bound: %s", input.name); - - memset(&write, 0, sizeof(write)); - write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - write.pTexelBufferView = &buffer_view; - write.pBufferInfo = &buffer; - write.descriptorCount = 1; - break; - } - default: - throw EXCEPTION("Unhandled input type!"); - } - - write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - write.dstSet = pstate.descriptor_sets[input.domain]; - write.pNext = nullptr; - - write.dstBinding = input.location; - descriptor_writers.push_back(write); - } - - if (!descriptor_writers.size()) return; - if (descriptor_writers.size() != uniforms.size()) - throw EXCEPTION("Undefined uniform detected"); - - vkUpdateDescriptorSets((*device), descriptor_writers.size(), descriptor_writers.data(), 0, nullptr); + CHECK_RESULT(vkAllocateDescriptorSets((*device), &alloc_info, &pstate.descriptor_sets)); } void program::destroy_descriptors() { - if (pstate.descriptor_sets[0]) - vkFreeDescriptorSets((*device), descriptor_pool, 2, pstate.descriptor_sets); + if (pstate.descriptor_sets) + vkFreeDescriptorSets((*device), descriptor_pool, 1, &pstate.descriptor_sets); if (pstate.pipeline_layout) vkDestroyPipelineLayout((*device), pstate.pipeline_layout, nullptr); - if (pstate.descriptor_layouts[0]) - vkDestroyDescriptorSetLayout((*device), pstate.descriptor_layouts[0], nullptr); - - if (pstate.descriptor_layouts[1]) - vkDestroyDescriptorSetLayout((*device), pstate.descriptor_layouts[1], nullptr); + if (pstate.descriptor_layouts) + vkDestroyDescriptorSetLayout((*device), pstate.descriptor_layouts, nullptr); descriptor_pool.destroy(); } @@ -609,8 +500,7 @@ namespace vk for (auto &item : store) { - if (item.domain != domain) - uniforms.push_back(item); + uniforms.push_back(item); } for (auto &item : inputs) @@ -623,7 +513,6 @@ namespace vk { if (/*uniforms_changed*/true) { - update_descriptors(); uniforms_changed = false; } @@ -657,161 +546,84 @@ namespace vk } vkCmdBindPipeline(commands, VK_PIPELINE_BIND_POINT_GRAPHICS, pstate.pipeline_handle); - vkCmdBindDescriptorSets(commands, VK_PIPELINE_BIND_POINT_GRAPHICS, pstate.pipeline_layout, 0, 2, pstate.descriptor_sets, 0, nullptr); + vkCmdBindDescriptorSets(commands, VK_PIPELINE_BIND_POINT_GRAPHICS, pstate.pipeline_layout, 0, 1, &pstate.descriptor_sets, 0, nullptr); } - bool program::has_uniform(program_domain domain, std::string uniform_name) + bool program::has_uniform(std::string uniform_name) { for (auto &uniform : uniforms) { - if (uniform.name == uniform_name && - uniform.domain == domain) + if (uniform.name == uniform_name) return true; } return false; } - bool program::bind_uniform(program_domain domain, std::string uniform_name) + void program::bind_uniform(VkDescriptorImageInfo image_descriptor, std::string uniform_name) { + if (!pstate.descriptor_layouts) + init_descriptor_layout(); for (auto &uniform : uniforms) { - if (uniform.name == uniform_name && - uniform.domain == domain) + if (uniform.name == uniform_name) { - uniform.as_buffer.buffer = nullptr; - uniform.as_buffer.buffer_view = nullptr; - uniform.as_sampler.image_view = nullptr; - uniform.as_sampler.sampler = nullptr; + VkWriteDescriptorSet descriptor_writer = {}; + descriptor_writer.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptor_writer.dstSet = pstate.descriptor_sets; + descriptor_writer.descriptorCount = 1; + descriptor_writer.pImageInfo = &image_descriptor; + descriptor_writer.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; + descriptor_writer.dstArrayElement = 0; + descriptor_writer.dstBinding = uniform.location + TEXTURES_FIRST_BIND_SLOT; - uniforms_changed = true; - return true; + vkUpdateDescriptorSets((*device), 1, &descriptor_writer, 0, nullptr); + return; } } - return false; + throw EXCEPTION("texture not found"); } - bool program::bind_uniform(program_domain domain, std::string uniform_name, vk::texture &_texture) + void program::bind_uniform(VkDescriptorBufferInfo buffer_descriptor, uint32_t binding_point) { - for (auto &uniform : uniforms) - { - if (uniform.name == uniform_name && - uniform.domain == domain) - { - VkImageView view = _texture; - VkSampler sampler = _texture; + if (!pstate.descriptor_layouts) + init_descriptor_layout(); + VkWriteDescriptorSet descriptor_writer = {}; + descriptor_writer.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptor_writer.dstSet = pstate.descriptor_sets; + descriptor_writer.descriptorCount = 1; + descriptor_writer.pBufferInfo = &buffer_descriptor; + descriptor_writer.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + descriptor_writer.dstArrayElement = 0; + descriptor_writer.dstBinding = binding_point; - if (uniform.as_sampler.image_view != view || - uniform.as_sampler.sampler != sampler) - { - uniform.as_sampler.image_view = view; - uniform.as_sampler.sampler = sampler; - uniforms_changed = true; - } - - uniform.type = input_type_texture; - return true; - } - } - - return false; + vkUpdateDescriptorSets((*device), 1, &descriptor_writer, 0, nullptr); } - bool program::bind_uniform(program_domain domain, std::string uniform_name, VkBuffer _buffer, VkDeviceSize offset, VkDeviceSize size) + void program::bind_uniform(const VkBufferView &buffer_view, const std::string &binding_name) { - for (auto &uniform : uniforms) - { - if (uniform.name == uniform_name && - uniform.domain == domain) - { - if (uniform.as_buffer.buffer != _buffer || - uniform.as_buffer.size != size || - uniform.as_buffer.offset != offset) - { - uniform.as_buffer.size = size; - uniform.as_buffer.buffer = _buffer; - uniform.as_buffer.buffer_view = nullptr; //UBOs cannot be viewed! - uniform.as_buffer.offset = offset; - - uniforms_changed = true; - } - - uniform.type = input_type_uniform_buffer; - return true; - } - } - } - - bool program::bind_uniform(program_domain domain, std::string uniform_name, vk::buffer_deprecated &_buffer) - { - for (auto &uniform : uniforms) - { - if (uniform.name == uniform_name && - uniform.domain == domain) - { - VkBuffer buf = _buffer; - u64 size = _buffer.size(); - - if (uniform.as_buffer.buffer != buf || - uniform.as_buffer.size != size || - uniform.as_buffer.offset != 0) - { - uniform.as_buffer.size = size; - uniform.as_buffer.buffer = buf; - uniform.as_buffer.buffer_view = nullptr; //UBOs cannot be viewed! - uniform.as_buffer.offset = 0; - - uniforms_changed = true; - } - - uniform.type = input_type_uniform_buffer; - return true; - } - } - - throw EXCEPTION("Failed to bind program uniform %s", uniform_name); - return false; - } - - bool program::bind_uniform(program_domain domain, std::string uniform_name, vk::buffer_deprecated &_buffer, bool is_texel_store) - { - if (!is_texel_store) - { - return bind_uniform(domain, uniform_name, _buffer); - } + if (!pstate.descriptor_layouts) + init_descriptor_layout(); for (auto &uniform : uniforms) { - if (uniform.name == uniform_name && - uniform.domain == domain) + if (uniform.name == binding_name) { - VkBuffer buf = _buffer; - VkBufferView view = _buffer; - u64 size = _buffer.size(); + VkWriteDescriptorSet descriptor_writer = {}; + descriptor_writer.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptor_writer.dstSet = pstate.descriptor_sets; + descriptor_writer.descriptorCount = 1; + descriptor_writer.pTexelBufferView = &buffer_view; + descriptor_writer.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + descriptor_writer.dstArrayElement = 0; + descriptor_writer.dstBinding = uniform.location + VERTEX_BUFFERS_FIRST_BIND_SLOT; - if (uniform.as_buffer.buffer != buf || - uniform.as_buffer.buffer_view != view || - uniform.as_buffer.size != size || - uniform.as_buffer.offset != 0) - { - uniform.as_buffer.size = size; - uniform.as_buffer.buffer = buf; - uniform.as_buffer.buffer_view = view; - uniform.as_buffer.offset = 0; - - if (!view) - throw EXCEPTION("Invalid buffer passed as texel storage"); - - uniforms_changed = true; - } - - uniform.type = input_type_texel_buffer; - return true; + vkUpdateDescriptorSets((*device), 1, &descriptor_writer, 0, nullptr); + return; } } - - return false; + throw EXCEPTION("vertex buffer not found"); } void program::destroy() diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp index f70ead5347..47a3d9368f 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp @@ -280,12 +280,11 @@ VKGSRender::upload_vertex_data() { auto &vertex_info = vertex_arrays_info[index]; - if (!m_program->has_uniform(vk::glsl::glsl_vertex_program, reg_table[index])) + if (!m_program->has_uniform(reg_table[index])) continue; if (!vertex_info.size) // disabled { - m_program->bind_uniform(vk::glsl::glsl_vertex_program, reg_table[index]); continue; } @@ -334,7 +333,7 @@ VKGSRender::upload_vertex_data() buffer.set_format(format); //Link texture to uniform location - m_program->bind_uniform(vk::glsl::glsl_vertex_program, reg_table[index], buffer, true); + m_program->bind_uniform(buffer, reg_table[index]); } } @@ -350,14 +349,13 @@ VKGSRender::upload_vertex_data() { for (int index = 0; index < rsx::limits::vertex_count; ++index) { - if (!m_program->has_uniform(vk::glsl::glsl_vertex_program, reg_table[index])) - continue; - bool enabled = !!(input_mask & (1 << index)); + if (!m_program->has_uniform(reg_table[index])) + continue; + if (!enabled) { - m_program->bind_uniform(vk::glsl::glsl_vertex_program, reg_table[index]); continue; } @@ -423,7 +421,7 @@ VKGSRender::upload_vertex_data() buffer.sub_data(0, data_size, data_ptr); buffer.set_format(format); - m_program->bind_uniform(vk::glsl::glsl_vertex_program, reg_table[index], buffer, true); + m_program->bind_uniform(buffer, reg_table[index]); } else if (register_vertex_info[index].size > 0) { @@ -462,7 +460,7 @@ VKGSRender::upload_vertex_data() buffer.sub_data(0, data_size, data_ptr); buffer.set_format(format); - m_program->bind_uniform(vk::glsl::glsl_vertex_program, reg_table[index], buffer, true); + m_program->bind_uniform(buffer, reg_table[index]); break; } default: diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp index 6daf852435..4841597d93 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp @@ -30,7 +30,7 @@ void VKVertexDecompilerThread::insertHeader(std::stringstream &OS) { OS << "#version 450" << std::endl << std::endl; OS << "#extension GL_ARB_separate_shader_objects : enable" << std::endl; - OS << "layout(std140, set=0, binding = 0) uniform ScaleOffsetBuffer" << std::endl; + OS << "layout(std140, set = 0, binding = 0) uniform ScaleOffsetBuffer" << std::endl; OS << "{" << std::endl; OS << " mat4 scaleOffsetMat;" << std::endl; OS << " float fog_param0;\n"; @@ -81,7 +81,7 @@ void VKVertexDecompilerThread::insertInputs(std::stringstream & OS, const std::v this->inputs.push_back(in); - OS << "layout(set=0, binding=" << location++ << ")" << " uniform samplerBuffer" << " " << PI.name << "_buffer;" << std::endl; + OS << "layout(set = 0, binding=" << 3 + location++ << ")" << " uniform samplerBuffer" << " " << PI.name << "_buffer;" << std::endl; } } }