OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Only enter the immutable samplers init loop when we have some.

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen
2017-09-17 12:59:24 +02:00
parent 68dc19d400
commit ef721c77f1
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/amd/vulkan/radv_descriptor_set.c
View File

@@ -67,6 +67,7 @@ VkResult radv_CreateDescriptorSetLayout(
set_layout->binding_count = max_binding + 1; set_layout->binding_count = max_binding + 1;
set_layout->shader_stages = 0; set_layout->shader_stages = 0;
set_layout->dynamic_shader_stages = 0; set_layout->dynamic_shader_stages = 0;
set_layout->has_immutable_samplers = false;
set_layout->size = 0; set_layout->size = 0;
memset(set_layout->binding, 0, size - sizeof(struct radv_descriptor_set_layout)); memset(set_layout->binding, 0, size - sizeof(struct radv_descriptor_set_layout));
@@ -132,6 +133,7 @@ VkResult radv_CreateDescriptorSetLayout(
if (binding->pImmutableSamplers) { if (binding->pImmutableSamplers) {
set_layout->binding[b].immutable_samplers_offset = samplers_offset; set_layout->binding[b].immutable_samplers_offset = samplers_offset;
set_layout->binding[b].immutable_samplers_equal = true; set_layout->binding[b].immutable_samplers_equal = true;
set_layout->has_immutable_samplers = true;
for (uint32_t i = 0; i < binding->descriptorCount; i++) for (uint32_t i = 0; i < binding->descriptorCount; i++)
@@ -329,21 +331,23 @@ radv_descriptor_set_create(struct radv_device *device,
return vk_error(VK_ERROR_OUT_OF_POOL_MEMORY_KHR); return vk_error(VK_ERROR_OUT_OF_POOL_MEMORY_KHR);
} }
for (unsigned i = 0; i < layout->binding_count; ++i) { if (layout->has_immutable_samplers) {
if (!layout->binding[i].immutable_samplers_offset || for (unsigned i = 0; i < layout->binding_count; ++i) {
layout->binding[i].immutable_samplers_equal) if (!layout->binding[i].immutable_samplers_offset ||
continue; layout->binding[i].immutable_samplers_equal)
continue;
unsigned offset = layout->binding[i].offset / 4; unsigned offset = layout->binding[i].offset / 4;
if (layout->binding[i].type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) if (layout->binding[i].type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)
offset += 16; offset += 16;
const uint32_t *samplers = (const uint32_t*)((const char*)layout + layout->binding[i].immutable_samplers_offset);
for (unsigned j = 0; j < layout->binding[i].array_size; ++j) {
memcpy(set->mapped_ptr + offset, samplers + 4 * j, 16);
offset += layout->binding[i].size / 4;
}
const uint32_t *samplers = (const uint32_t*)((const char*)layout + layout->binding[i].immutable_samplers_offset);
for (unsigned j = 0; j < layout->binding[i].array_size; ++j) {
memcpy(set->mapped_ptr + offset, samplers + 4 * j, 16);
offset += layout->binding[i].size / 4;
} }
} }
*out_set = set; *out_set = set;
return VK_SUCCESS; return VK_SUCCESS;

2
src/amd/vulkan/radv_descriptor_set.h
View File

@@ -68,6 +68,8 @@ struct radv_descriptor_set_layout {
/* Number of dynamic offsets used by this descriptor set */ /* Number of dynamic offsets used by this descriptor set */
uint16_t dynamic_offset_count; uint16_t dynamic_offset_count;
bool has_immutable_samplers;
/* Bindings in this descriptor set */ /* Bindings in this descriptor set */
struct radv_descriptor_set_binding_layout binding[0]; struct radv_descriptor_set_binding_layout binding[0];
}; };