<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> <div class="moz-cite-prefix">On 15/09/17 23:54, Jason Ekstrand wrote: </div> <blockquote type="cite" cite="mid:CAOFGe957h3buvb05OXXzPsMP3A3Oujt3QJkvf9B8Qr1QPeLRjA@mail.gmail.com"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Fri, Sep 15, 2017 at 7:11 AM, Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank" moz-do-not-send="true">lionel.g.landwerlin@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" moz-do-not-send="true">lionel.g.landwerlin@intel.com</a>> --- Â src/intel/vulkan/anv_descriptor_set.cÂ Â Â Â Â Â | 107 +++++++++++++++++------ Â src/intel/vulkan/anv_nir_apply_pipeline_layout.c |Â 44 +++++----- Â src/intel/vulkan/anv_private.hÂ Â Â Â Â Â Â Â Â Â |Â 24 ++++- Â src/intel/vulkan/genX_cmd_buffer.cÂ Â Â Â Â Â Â Â |Â 14 ++- Â src/intel/vulkan/genX_state.cÂ Â Â Â Â Â Â Â Â Â |Â 81 +++++++++-------- Â 5 files changed, 178 insertions(+), 92 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 91387c065e4..4e29310f5fa 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -35,6 +35,21 @@ Â * Descriptor set layouts. Â */ +static uint32_t +layout_binding_get_descriptor_count(const VkDescriptorSetLayoutBinding *binding) +{ +Â Â if (binding->pImmutableSamplers == NULL) +Â Â Â return binding->descriptorCount; + +Â Â uint32_t immutable_sampler_count = 0; +Â Â for (uint32_t i = 0; i < binding->descriptorCount; i++) { +Â Â Â ANV_FROM_HANDLE(anv_sampler, sampler, binding->pImmutableSamplers[i]); +Â Â Â immutable_sampler_count += sampler->nb_planes; +Â Â } + +Â Â return immutable_sampler_count; +} + Â VkResult anv_CreateDescriptorSetLayout( Â Â Â VkDeviceÂ Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â _device, Â Â Â const VkDescriptorSetLayoutCreateInfo*Â Â Â pCreateInfo, @@ -49,13 +64,13 @@ VkResult anv_CreateDescriptorSetLayout( Â Â uint32_t immutable_sampler_count = 0; Â Â for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) { Â Â Â Â max_binding = MAX2(max_binding, pCreateInfo->pBindings[j].binding); -Â Â Â if (pCreateInfo->pBindings[j].pImmutableSamplers) -Â Â Â Â Â immutable_sampler_count += pCreateInfo->pBindings[j].descriptorCount; +Â Â Â immutable_sampler_count += +Â Â Â Â Â layout_binding_get_descriptor_count(&pCreateInfo->pBindings[j]); Â Â } Â Â struct anv_descriptor_set_layout *set_layout; Â Â struct anv_descriptor_set_binding_layout *bindings; -Â Â struct anv_sampler **samplers; +Â Â struct anv_descriptor_set_immutable_sampler *samplers; Â Â ANV_MULTIALLOC(ma); Â Â anv_multialloc_add(&ma, &set_layout, 1); @@ -74,6 +89,7 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â memset(&set_layout->binding[b], -1, sizeof(set_layout->binding[b])); Â Â Â Â set_layout->binding[b].array_size = 0; +Â Â Â set_layout->binding[b].descriptor_size = 0; Â Â Â Â set_layout->binding[b].immutable_samplers = NULL; Â Â } @@ -108,17 +124,20 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â set_layout->binding[b].type = binding->descriptorType; Â #endif Â Â Â Â set_layout->binding[b].array_size = binding->descriptorCount; +Â Â Â set_layout->binding[b].descriptor_size = +Â Â Â Â Â layout_binding_get_descriptor_count(binding); Â Â Â Â set_layout->binding[b].descriptor_index = set_layout->size; -Â Â Â set_layout->size += binding->descriptorCount; +Â Â Â set_layout->size += set_layout->binding[b].descriptor_size; Â Â Â Â switch (binding->descriptorType) { Â Â Â Â case VK_DESCRIPTOR_TYPE_SAMPLER: -Â Â Â case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: +Â Â Â case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: { Â Â Â Â Â anv_foreach_stage(s, binding->stageFlags) { Â Â Â Â Â Â Â set_layout->binding[b].stage[s].sampler_index = sampler_count[s]; -Â Â Â Â Â Â sampler_count[s] += binding->descriptorCount; +Â Â Â Â Â Â sampler_count[s] += set_layout->binding[b].descriptor_size; Â Â Â Â Â } Â Â Â Â Â break; +Â Â Â } Â Â Â Â default: Â Â Â Â Â break; Â Â Â Â } @@ -140,7 +159,7 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: Â Â Â Â Â anv_foreach_stage(s, binding->stageFlags) { Â Â Â Â Â Â Â set_layout->binding[b].stage[s].surface_index = surface_count[s]; -Â Â Â Â Â Â surface_count[s] += binding->descriptorCount; +Â Â Â Â Â Â surface_count[s] += set_layout->binding[b].descriptor_size; Â Â Â Â Â } Â Â Â Â Â break; Â Â Â Â default: @@ -151,7 +170,7 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: Â Â Â Â case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: Â Â Â Â Â set_layout->binding[b].dynamic_offset_index = dynamic_offset_count; -Â Â Â Â Â dynamic_offset_count += binding->descriptorCount; +Â Â Â Â Â dynamic_offset_count += set_layout->binding[b].descriptor_size; </blockquote> <div> </div> <div>Are you sure about adjusting dynamic_offset_count here? </div> <div>Â </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Â Â Â Â Â break; Â Â Â Â default: Â Â Â Â Â break; @@ -162,7 +181,7 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: Â Â Â Â Â anv_foreach_stage(s, binding->stageFlags) { Â Â Â Â Â Â Â set_layout->binding[b].stage[s].image_index = image_count[s]; -Â Â Â Â Â Â image_count[s] += binding->descriptorCount; +Â Â Â Â Â Â image_count[s] += set_layout->binding[b].descriptor_size; Â Â Â Â Â } Â Â Â Â Â break; Â Â Â Â default: @@ -171,11 +190,18 @@ VkResult anv_CreateDescriptorSetLayout( Â Â Â Â if (binding->pImmutableSamplers) { Â Â Â Â Â set_layout->binding[b].immutable_samplers = samplers; -Â Â Â Â Â samplers += binding->descriptorCount; -Â Â Â Â Â for (uint32_t i = 0; i < binding->descriptorCount; i++) -Â Â Â Â Â Â set_layout->binding[b].immutable_samplers[i] = -Â Â Â Â Â Â Â Â anv_sampler_from_handle(binding->pImmutableSamplers[i]); +Â Â Â Â Â uint32_t sampler_offset = 0; +Â Â Â Â Â for (uint32_t i = 0; i < binding->descriptorCount; i++) { +Â Â Â Â Â Â ANV_FROM_HANDLE(anv_sampler, sampler, binding->pImmutableSamplers[i]); + +Â Â Â Â Â Â set_layout->binding[b].immutable_samplers[i].sampler = sampler; +Â Â Â Â Â Â set_layout->binding[b].immutable_samplers[i].descriptor_index_offset = +Â Â Â Â Â Â Â Â sampler_offset; +Â Â Â Â Â Â sampler_offset += sampler->nb_planes; +Â Â Â Â Â } + +Â Â Â Â Â samplers += sampler_offset; Â Â Â Â } else { Â Â Â Â Â set_layout->binding[b].immutable_samplers = NULL; Â Â Â Â } @@ -250,7 +276,7 @@ VkResult anv_CreatePipelineLayout( Â Â Â Â Â if (set_layout->binding[b].dynamic_offset_index < 0) Â Â Â Â Â Â Â continue; -Â Â Â Â Â dynamic_offset_count += set_layout->binding[b].array_size; +Â Â Â Â Â dynamic_offset_count += set_layout->binding[b].descriptor_size; Â Â Â Â Â for (gl_shader_stage s = 0; s < MESA_SHADER_STAGES; s++) { Â Â Â Â Â Â Â if (set_layout->binding[b].stage[s].surface_index >= 0) Â Â Â Â Â Â Â Â layout->stage[s].has_dynamic_offsets = true; @@ -318,11 +344,24 @@ VkResult anv_CreateDescriptorPool( Â Â uint32_t buffer_count = 0; Â Â for (uint32_t i = 0; i < pCreateInfo->poolSizeCount; i++) { Â Â Â Â switch (pCreateInfo->pPoolSizes[i].type) { +Â Â Â case VK_DESCRIPTOR_TYPE_SAMPLER: +Â Â Â case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: +Â Â Â Â Â /* We have to account that some descriptor layouts might have +Â Â Â Â Â * multiplanar images (atm up to 3 through the conversion +Â Â Â Â Â * VK_KHR_sampler_ycbcr_conversion extension). Therefor take the +Â Â Â Â Â * maximum amount of space that can be occupied by a single of those +Â Â Â Â Â * entries. +Â Â Â Â Â */ +Â Â Â Â Â descriptor_count += 3 * pCreateInfo->pPoolSizes[i].descriptorCount; </blockquote> <div> </div> <div>I'm not quite sure how I expected you to solve the multi-descriptor problem but it wasn't like this. :)Â An alternate solution would be to keep each image_view and sampler a single descriptor in the descriptor set and expand it out to multiple descriptors as-needed in anv_nir_apply_pipeline_layout by adding a "plane" entry to anv_pipeline_binding.Â I'm honestly not sure which one would work out better in the end. </div> <div>Â </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +Â Â Â Â Â break; + Â Â Â Â case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: Â Â Â Â case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: Â Â Â Â case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: Â Â Â Â case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: Â Â Â Â Â buffer_count += pCreateInfo->pPoolSizes[i].descriptorCount; +Â Â Â Â Â /* Fallthrough */ + Â Â Â Â default: Â Â Â Â Â descriptor_count += pCreateInfo->pPoolSizes[i].descriptorCount; Â Â Â Â Â break; @@ -461,13 +500,18 @@ anv_descriptor_set_create(struct anv_device *device, Â Â Â Â Â Â Â * set has an immutable sampler, UpdateDescriptorSets may never Â Â Â Â Â Â Â * touch it, so we need to make sure it's 100% valid now. Â Â Â Â Â Â Â */ -Â Â Â Â Â Â desc[i] = (struct anv_descriptor) { -Â Â Â Â Â Â Â Â .type = VK_DESCRIPTOR_TYPE_SAMPLER, -Â Â Â Â Â Â Â Â .sampler = layout->binding[b].immutable_samplers[i], -Â Â Â Â Â Â }; +Â Â Â Â Â Â struct anv_descriptor_set_immutable_sampler *sampler = +Â Â Â Â Â Â Â Â &layout->binding[b].immutable_samplers[i]; +Â Â Â Â Â Â for (uint32_t p = 0; p < sampler->sampler->nb_planes; p++) { +Â Â Â Â Â Â Â Â desc[sampler->descriptor_index_offset + p] = (struct anv_descriptor) { +Â Â Â Â Â Â Â Â Â .type = VK_DESCRIPTOR_TYPE_SAMPLER, +Â Â Â Â Â Â Â Â Â .sampler = sampler->sampler, +Â Â Â Â Â Â Â Â Â .plane = p, +Â Â Â Â Â Â Â Â }; +Â Â Â Â Â Â } Â Â Â Â Â } Â Â Â Â } -Â Â Â desc += layout->binding[b].array_size; +Â Â Â desc += layout->binding[b].descriptor_size; Â Â } Â Â /* Allocate surface state for the buffer views. */ @@ -579,8 +623,13 @@ anv_descriptor_set_write_image_view(struct anv_descriptor_set *set, Â { Â Â const struct anv_descriptor_set_binding_layout *bind_layout = Â Â Â Â &set->layout->binding[binding]; +Â Â const struct anv_descriptor_set_immutable_sampler *immutable_sampler = +Â Â Â bind_layout->immutable_samplers ? +Â Â Â &bind_layout->immutable_samplers[element] : NULL; +Â Â uint32_t descriptor_index_offset = +Â Â Â immutable_sampler ? immutable_sampler->descriptor_index_offset : element; Â Â struct anv_descriptor *desc = -Â Â Â &set->descriptors[bind_layout->descriptor_index + element]; +Â Â Â &set->descriptors[bind_layout->descriptor_index + descriptor_index_offset]; Â Â struct anv_image_view *image_view = NULL; Â Â struct anv_sampler *sampler = NULL; @@ -610,15 +659,19 @@ anv_descriptor_set_write_image_view(struct anv_descriptor_set *set, Â Â Â * it. Â Â Â */ Â Â sampler = bind_layout->immutable_samplers ? -Â Â Â Â Â Â Â bind_layout->immutable_samplers[element] : +Â Â Â Â Â Â Â bind_layout->immutable_samplers[element].sampler : Â Â Â Â Â Â Â sampler; -Â Â *desc = (struct anv_descriptor) { -Â Â Â .type = type, -Â Â Â .layout = info->imageLayout, -Â Â Â .image_view = image_view, -Â Â Â .sampler = sampler, -Â Â }; +Â Â uint32_t nb_planes = sampler != NULL ? sampler->nb_planes : 1; +Â Â for (uint32_t p = 0; p < nb_planes; p++) { +Â Â Â desc[p] = (struct anv_descriptor) { +Â Â Â Â Â .type = type, +Â Â Â Â Â .layout = info->imageLayout, +Â Â Â Â Â .image_view = image_view, +Â Â Â Â Â .sampler = sampler, +Â Â Â Â Â .plane = p, +Â Â Â }; +Â Â } Â } Â void diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 67bcf5e29ef..83d4c4ea30d 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -130,7 +130,7 @@ lower_res_index_intrinsic(nir_intrinsic_instr *intrin, Â static void Â lower_tex_deref(nir_tex_instr *tex, nir_deref_var *deref, -Â Â Â Â Â Â Â Â unsigned *const_index, unsigned array_size, +Â Â Â Â Â Â Â Â unsigned *const_index, unsigned descriptor_size, Â Â Â Â Â Â Â Â Â nir_tex_src_type src_type, Â Â Â Â Â Â Â Â Â struct apply_pipeline_layout_state *state) Â { @@ -146,7 +146,7 @@ lower_tex_deref(nir_tex_instr *tex, nir_deref_var *deref, Â Â Â Â Â Â Â Â Â Â Â Â Â nir_ssa_for_src(b, deref_array->indirect, 1)); Â Â Â Â Â if (state->add_bounds_checks) -Â Â Â Â Â Â index = nir_umin(b, index, nir_imm_int(b, array_size - 1)); +Â Â Â Â Â Â index = nir_umin(b, index, nir_imm_int(b, descriptor_size - 1)); Â Â Â Â Â nir_tex_src *new_srcs = rzalloc_array(tex, nir_tex_src, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â tex->num_srcs + 1); @@ -167,7 +167,7 @@ lower_tex_deref(nir_tex_instr *tex, nir_deref_var *deref, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nir_src_for_ssa(index)); Â Â Â Â Â tex->num_srcs++; Â Â Â Â } else { -Â Â Â Â Â *const_index += MIN2(deref_array->base_offset, array_size - 1); +Â Â Â Â Â *const_index += MIN2(deref_array->base_offset, descriptor_size - 1); Â Â Â Â } Â Â } Â } @@ -196,19 +196,18 @@ lower_tex(nir_tex_instr *tex, struct apply_pipeline_layout_state *state) Â Â unsigned set = tex->texture->var->data.descriptor_set; Â Â unsigned binding = tex->texture->var->data.binding; -Â Â unsigned array_size = -Â Â Â state->layout->set[set].layout->binding[binding].array_size; +Â Â unsigned descriptor_size = +Â Â Â state->layout->set[set].layout->binding[binding].descriptor_size; Â Â tex->texture_index = state->set[set].surface_offsets[binding]; -Â Â lower_tex_deref(tex, tex->texture, &tex->texture_index, array_size, +Â Â lower_tex_deref(tex, tex->texture, &tex->texture_index, descriptor_size, Â Â Â Â Â Â Â Â Â Â nir_tex_src_texture_offset, state); Â Â if (tex->sampler) { Â Â Â Â unsigned set = tex->sampler->var->data.descriptor_set; Â Â Â Â unsigned binding = tex->sampler->var->data.binding; -Â Â Â unsigned array_size = -Â Â Â Â Â state->layout->set[set].layout->binding[binding].array_size; -Â Â Â tex->sampler_index = state->set[set].sampler_offsets[binding]; -Â Â Â lower_tex_deref(tex, tex->sampler, &tex->sampler_index, array_size, +Â Â Â unsigned descriptor_size = +Â Â Â Â Â state->layout->set[set].layout->binding[binding].descriptor_size; +Â Â Â lower_tex_deref(tex, tex->sampler, &tex->sampler_index, descriptor_size, Â Â Â Â Â Â Â Â Â Â Â Â nir_tex_src_sampler_offset, state); Â Â } @@ -300,9 +299,9 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline, Â Â Â Â BITSET_FOREACH_SET(b, _tmp, state.set[set].used, Â Â Â Â Â Â Â Â Â Â Â Â Â set_layout->binding_count) { Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].surface_index >= 0) -Â Â Â Â Â Â map->surface_count += set_layout->binding[b].array_size; +Â Â Â Â Â Â map->surface_count += set_layout->binding[b].descriptor_size; Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].sampler_index >= 0) -Â Â Â Â Â Â map->sampler_count += set_layout->binding[b].array_size; +Â Â Â Â Â Â map->sampler_count += set_layout->binding[b].descriptor_size; Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].image_index >= 0) Â Â Â Â Â Â Â map->image_count += set_layout->binding[b].array_size; Â Â Â Â } @@ -317,31 +316,34 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline, Â Â Â Â BITSET_WORD b, _tmp; Â Â Â Â BITSET_FOREACH_SET(b, _tmp, state.set[set].used, Â Â Â Â Â Â Â Â Â Â Â Â Â set_layout->binding_count) { -Â Â Â Â Â unsigned array_size = set_layout->binding[b].array_size; +Â Â Â Â Â struct anv_descriptor_set_binding_layout *binding = +Â Â Â Â Â Â &set_layout->binding[b]; +Â Â Â Â Â /* unsigned array_size = set_layout->binding[b].array_size; */ +Â Â Â Â Â /* unsigned descriptor_size = set_layout->binding[b].descriptor_size; */ -Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].surface_index >= 0) { +Â Â Â Â Â if (binding->stage[shader->stage].surface_index >= 0) { Â Â Â Â Â Â Â state.set[set].surface_offsets[b] = surface; -Â Â Â Â Â Â for (unsigned i = 0; i < array_size; i++) { +Â Â Â Â Â Â for (unsigned i = 0; i < binding->descriptor_size; i++) { Â Â Â Â Â Â Â Â map->surface_to_descriptor[surface + i].set = set; Â Â Â Â Â Â Â Â map->surface_to_descriptor[surface + i].binding = b; Â Â Â Â Â Â Â Â map->surface_to_descriptor[surface + i].index = i; Â Â Â Â Â Â Â } -Â Â Â Â Â Â surface += array_size; +Â Â Â Â Â Â surface += binding->descriptor_size; Â Â Â Â Â } -Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].sampler_index >= 0) { +Â Â Â Â Â if (binding->stage[shader->stage].sampler_index >= 0) { Â Â Â Â Â Â Â state.set[set].sampler_offsets[b] = sampler; -Â Â Â Â Â Â for (unsigned i = 0; i < array_size; i++) { +Â Â Â Â Â Â for (unsigned i = 0; i < binding->descriptor_size; i++) { Â Â Â Â Â Â Â Â map->sampler_to_descriptor[sampler + i].set = set; Â Â Â Â Â Â Â Â map->sampler_to_descriptor[sampler + i].binding = b; Â Â Â Â Â Â Â Â map->sampler_to_descriptor[sampler + i].index = i; Â Â Â Â Â Â Â } -Â Â Â Â Â Â sampler += array_size; +Â Â Â Â Â Â sampler += binding->descriptor_size; Â Â Â Â Â } -Â Â Â Â Â if (set_layout->binding[b].stage[shader->stage].image_index >= 0) { +Â Â Â Â Â if (binding->stage[shader->stage].image_index >= 0) { Â Â Â Â Â Â Â state.set[set].image_offsets[b] = image; -Â Â Â Â Â Â image += array_size; +Â Â Â Â Â Â image += binding->descriptor_size; Â Â Â Â Â } Â Â Â Â } Â Â } diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index a4b263cea5e..41f01192aa6 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1168,6 +1168,18 @@ struct anv_vue_header { Â Â float PointWidth; Â }; +struct anv_descriptor_set_immutable_sampler { +Â Â /* Immutable sampler */ +Â Â struct anv_sampler *sampler; + +Â Â /* Offset to add to +Â Â * anv_descriptor_set_binding_layout.stage[s].sampler_index or +Â Â * anv_descriptor_set_binding_layout.descriptor_index to compute the offset +Â Â * in the descriptor table. +Â Â */ +Â Â uint16_t descriptor_index_offset; +}; + Â struct anv_descriptor_set_binding_layout { Â #ifndef NDEBUG Â Â /* The type of the descriptors in this binding */ @@ -1177,6 +1189,9 @@ struct anv_descriptor_set_binding_layout { Â Â /* Number of array elements in this binding */ Â Â uint16_t array_size; +Â Â /* Number of descriptors used in this binding */ +Â Â uint16_t descriptor_size; + Â Â /* Index into the flattend descriptor set */ Â Â uint16_t descriptor_index; @@ -1198,7 +1213,7 @@ struct anv_descriptor_set_binding_layout { Â Â } stage[MESA_SHADER_STAGES]; Â Â /* Immutable samplers (or NULL if no immutable samplers) */ -Â Â struct anv_sampler **immutable_samplers; +Â Â struct anv_descriptor_set_immutable_sampler *immutable_samplers; Â }; Â struct anv_descriptor_set_layout { @@ -1229,6 +1244,10 @@ struct anv_descriptor { Â Â Â Â Â VkImageLayout layout; Â Â Â Â Â struct anv_image_view *image_view; Â Â Â Â Â struct anv_sampler *sampler; + +Â Â Â Â Â /* Used to dertermine what plane of the sampler/image we need +Â Â Â Â Â * program. */ +Â Â Â Â Â uint32_t plane; Â Â Â Â }; Â Â Â Â struct { @@ -2504,7 +2523,8 @@ void anv_fill_buffer_surface_state(struct anv_device *device, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â uint32_t stride); Â struct anv_sampler { -Â Â uint32_t state[4]; +Â Â uint32_tÂ Â Â Â Â Â Â Â Â Â Â state[3][4]; +Â Â uint8_tÂ Â Â Â Â Â Â Â Â Â Â nb_planes; Â }; Â struct anv_framebuffer { diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index a16f67b108c..bea73dfb504 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -1736,7 +1736,8 @@ emit_samplers(struct anv_cmd_buffer *cmd_buffer, Â Â if (state->map == NULL) Â Â Â Â return VK_ERROR_OUT_OF_DEVICE_MEMORY; -Â Â for (uint32_t s = 0; s < map->sampler_count; s++) { +Â Â uint32_t s = 0; +Â Â while (s < map->sampler_count) { Â Â Â Â struct anv_pipeline_binding *binding = &map->sampler_to_descriptor[s]; Â Â Â Â struct anv_descriptor_set *set = Â Â Â Â Â cmd_buffer->state.descriptors[binding->set]; @@ -1744,19 +1745,24 @@ emit_samplers(struct anv_cmd_buffer *cmd_buffer, Â Â Â Â struct anv_descriptor *desc = &set->descriptors[offset + binding->index]; Â Â Â Â if (desc->type != VK_DESCRIPTOR_TYPE_SAMPLER && -Â Â Â Â Â desc->type != VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) +Â Â Â Â Â desc->type != VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) { +Â Â Â Â Â s += 1; Â Â Â Â Â continue; +Â Â Â } Â Â Â Â struct anv_sampler *sampler = desc->sampler; Â Â Â Â /* This can happen if we have an unfilled slot since TYPE_SAMPLER Â Â Â Â * happens to be zero. Â Â Â Â */ -Â Â Â if (sampler == NULL) +Â Â Â if (sampler == NULL) { +Â Â Â Â Â s += 1; Â Â Â Â Â continue; +Â Â Â } Â Â Â Â memcpy(state->map + (s * 16), -Â Â Â Â Â Â Â sampler->state, sizeof(sampler->state)); +Â Â Â Â Â Â Â sampler->state, sampler->nb_planes * sizeof(sampler->state[0])); +Â Â Â s += sampler->nb_planes; Â Â } Â Â anv_state_flush(cmd_buffer->device, *state); diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index d016aff4a54..91e180bc7e4 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -171,6 +171,9 @@ VkResult genX(CreateSampler)( Â Â if (!sampler) Â Â Â Â return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); +Â Â memset(sampler, 0, sizeof(*sampler)); </blockquote> <div> </div> <div>We have vk_zalloc for this. </div> <div>Â </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +Â Â sampler->nb_planes = 1; + Â Â uint32_t border_color_offset = device->border_colors.offset + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pCreateInfo->borderColor * 64; @@ -179,55 +182,57 @@ VkResult genX(CreateSampler)( Â Â bool enable_mag_filter_addr_rounding = Â Â Â Â pCreateInfo->magFilter != VK_FILTER_NEAREST; -Â Â struct GENX(SAMPLER_STATE) sampler_state = { -Â Â Â .SamplerDisable = false, -Â Â Â .TextureBorderColorMode = DX10OGL, +Â Â for (unsigned p = 0; p < sampler->nb_planes; p++) { </blockquote> <div> </div> <div>What's the difference between the N samplers you're creating here.Â I don't see any from my immediate reading of the diff but mayabe that's just because there's too much churn or maybe it's just in a different patch... </div> </div> </div> </div> </blockquote> I guess I could take all of this genX_* stuff into its own patch. <blockquote type="cite" cite="mid:CAOFGe957h3buvb05OXXzPsMP3A3Oujt3QJkvf9B8Qr1QPeLRjA@mail.gmail.com"> <div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote"> <div>Â </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +Â Â Â struct GENX(SAMPLER_STATE) sampler_state = { +Â Â Â Â Â .SamplerDisable = false, +Â Â Â Â Â .TextureBorderColorMode = DX10OGL, Â #if GEN_GEN >= 8 -Â Â Â .LODPreClampMode = CLAMP_MODE_OGL, +Â Â Â Â Â .LODPreClampMode = CLAMP_MODE_OGL, Â #else -Â Â Â .LODPreClampEnable = CLAMP_ENABLE_OGL, +Â Â Â Â Â .LODPreClampEnable = CLAMP_ENABLE_OGL, Â #endif Â #if GEN_GEN == 8 -Â Â Â .BaseMipLevel = 0.0, +Â Â Â Â Â .BaseMipLevel = 0.0, Â #endif -Â Â Â .MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode], -Â Â Â .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pCreateInfo->anisotropyEnable), -Â Â Â .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pCreateInfo->anisotropyEnable), -Â Â Â .TextureLODBias = anv_clamp_f(pCreateInfo->mipLodBias, -16, 15.996), -Â Â Â .AnisotropicAlgorithm = EWAApproximation, -Â Â Â .MinLOD = anv_clamp_f(pCreateInfo->minLod, 0, 14), -Â Â Â .MaxLOD = anv_clamp_f(pCreateInfo->maxLod, 0, 14), -Â Â Â .ChromaKeyEnable = 0, -Â Â Â .ChromaKeyIndex = 0, -Â Â Â .ChromaKeyMode = 0, -Â Â Â .ShadowFunction = vk_to_gen_shadow_compare_op[pCreateInfo->compareOp], -Â Â Â .CubeSurfaceControlMode = OVERRIDE, - -Â Â Â .BorderColorPointer = border_color_offset, +Â Â Â Â Â .MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode], +Â Â Â Â Â .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pCreateInfo->anisotropyEnable), +Â Â Â Â Â .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pCreateInfo->anisotropyEnable), +Â Â Â Â Â .TextureLODBias = anv_clamp_f(pCreateInfo->mipLodBias, -16, 15.996), +Â Â Â Â Â .AnisotropicAlgorithm = EWAApproximation, +Â Â Â Â Â .MinLOD = anv_clamp_f(pCreateInfo->minLod, 0, 14), +Â Â Â Â Â .MaxLOD = anv_clamp_f(pCreateInfo->maxLod, 0, 14), +Â Â Â Â Â .ChromaKeyEnable = 0, +Â Â Â Â Â .ChromaKeyIndex = 0, +Â Â Â Â Â .ChromaKeyMode = 0, +Â Â Â Â Â .ShadowFunction = vk_to_gen_shadow_compare_op[pCreateInfo->compareOp], +Â Â Â Â Â .CubeSurfaceControlMode = OVERRIDE, + +Â Â Â Â Â .BorderColorPointer = border_color_offset, Â #if GEN_GEN >= 8 -Â Â Â .LODClampMagnificationMode = MIPNONE, +Â Â Â Â Â .LODClampMagnificationMode = MIPNONE, Â #endif -Â Â Â .MaximumAnisotropy = vk_to_gen_max_anisotropy(pCreateInfo->maxAnisotropy), -Â Â Â .RAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, -Â Â Â .RAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, -Â Â Â .VAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, -Â Â Â .VAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, -Â Â Â .UAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, -Â Â Â .UAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, -Â Â Â .TrilinearFilterQuality = 0, -Â Â Â .NonnormalizedCoordinateEnable = pCreateInfo->unnormalizedCoordinates, -Â Â Â .TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeU], -Â Â Â .TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeV], -Â Â Â .TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeW], -Â Â }; - -Â Â GENX(SAMPLER_STATE_pack)(NULL, sampler->state, &sampler_state); +Â Â Â Â Â .MaximumAnisotropy = vk_to_gen_max_anisotropy(pCreateInfo->maxAnisotropy), +Â Â Â Â Â .RAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, +Â Â Â Â Â .RAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, +Â Â Â Â Â .VAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, +Â Â Â Â Â .VAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, +Â Â Â Â Â .UAddressMinFilterRoundingEnable = enable_min_filter_addr_rounding, +Â Â Â Â Â .UAddressMagFilterRoundingEnable = enable_mag_filter_addr_rounding, +Â Â Â Â Â .TrilinearFilterQuality = 0, +Â Â Â Â Â .NonnormalizedCoordinateEnable = pCreateInfo->unnormalizedCoordinates, +Â Â Â Â Â .TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeU], +Â Â Â Â Â .TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeV], +Â Â Â Â Â .TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeW], +Â Â Â }; + +Â Â Â GENX(SAMPLER_STATE_pack)(NULL, sampler->state[p], &sampler_state); +Â Â } Â Â *pSampler = anv_sampler_to_handle(sampler); -- 2.14.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" moz-do-not-send="true">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank" moz-do-not-send="true">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote> </div> </div> </div> </blockquote> </body> </html>