diff options
| author | Jason Ekstrand <[email protected]> | 2018-07-02 12:57:44 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2018-07-09 15:37:51 -0700 |
| commit | 227dabc2664b886e621de03d9ba82073e2fd16aa (patch) | |
| tree | a338644ff97a1aa5406f548c6c88f09f2b0bdbe5 | |
| parent | 2caf6c039289de1c26ad55c68708edd51f0b8277 (diff) | |
anv: Implement VK_EXT_vertex_attribute_divisor
Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 8 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_extensions.py | 1 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index a8b0bd2fc3e..04fd6a829ed 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -1140,6 +1140,14 @@ void anv_GetPhysicalDeviceProperties2( break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT: { + VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *props = + (VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *)ext; + /* We have to restrict this a bit for multiview */ + props->maxVertexAttribDivisor = UINT32_MAX / 16; + break; + } + default: anv_debug_ignored_stype(ext->sType); break; diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index 13c06f3c3cb..418618d2021 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -122,6 +122,7 @@ EXTENSIONS = [ 'device->has_context_priority'), Extension('VK_EXT_shader_viewport_index_layer', 1, True), Extension('VK_EXT_shader_stencil_export', 1, 'device->info.gen >= 9'), + Extension('VK_EXT_vertex_attribute_divisor', 2, True), ] class VkVersion: diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index e8489e72394..95a686f7833 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -33,6 +33,7 @@ #include "compiler/brw_nir.h" #include "anv_nir.h" #include "spirv/nir_spirv.h" +#include "vk_util.h" /* Needed for SWIZZLE macros */ #include "program/prog_instruction.h" @@ -1425,6 +1426,17 @@ anv_pipeline_init(struct anv_pipeline *pipeline, pipeline->vb[desc->binding].instance_divisor = 1; } + const VkPipelineVertexInputDivisorStateCreateInfoEXT *vi_div_state = + vk_find_struct_const(vi_info->pNext, + PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT); + if (vi_div_state) { + for (uint32_t i = 0; i < vi_div_state->vertexBindingDivisorCount; i++) { + const VkVertexInputBindingDivisorDescriptionEXT *desc = + &vi_div_state->pVertexBindingDivisors[i]; + + pipeline->vb[desc->binding].instance_divisor = desc->divisor; + } + } /* Our implementation of VK_KHR_multiview uses instancing to draw the * different views. If the client asks for instancing, we need to multiply |