commit 3e6366be6851a29934fbc1baec96bc2eb2d7ad51
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Thu Jul 09 16:34:41 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Mon Aug 03 14:22:39 2020 +0000
tree 6b10e96e2becd349767147085956ab4e274e0af0
parent 99b44536bf2335989cad6ef33d148115fd4316cf

zink: handle VK_EXT_vertex_attribute_divisor setup

this just enables the extension

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5913>

src/gallium/drivers/zink/zink_screen.c

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 248c7ef..64ea007 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -760,7 +760,7 @@
 {
    struct zink_screen *screen = CALLOC_STRUCT(zink_screen);
    bool have_tf_ext = false, have_cond_render_ext = false, have_EXT_index_type_uint8 = false,
-      have_EXT_robustness2_features = false;
+      have_EXT_robustness2_features = false, have_EXT_vertex_attribute_divisor = false;
    if (!screen)
       return NULL;
 
@@ -805,6 +805,9 @@
             if (!strcmp(extensions[i].extensionName,
                         VK_EXT_ROBUSTNESS_2_EXTENSION_NAME))
                have_EXT_robustness2_features = true;
+            if (!strcmp(extensions[i].extensionName,
+                        VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME))
+               have_EXT_vertex_attribute_divisor = true;
 
          }
          FREE(extensions);
@@ -836,6 +839,11 @@
       screen->rb2_feats.pNext = feats.pNext;
       feats.pNext = &screen->rb2_feats;
    }
+   if (have_EXT_vertex_attribute_divisor) {
+      screen->vdiv_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;
+      screen->vdiv_feats.pNext = feats.pNext;
+      feats.pNext = &screen->vdiv_feats;
+   }
    vkGetPhysicalDeviceFeatures2(screen->pdev, &feats);
    memcpy(&screen->feats, &feats.features, sizeof(screen->feats));
    if (have_tf_ext && tf_feats.transformFeedback)
@@ -845,8 +853,11 @@
    if (have_EXT_index_type_uint8 && index_uint8_feats.indexTypeUint8)
       screen->have_EXT_index_type_uint8 = true;
    screen->have_EXT_robustness2_features = have_EXT_robustness2_features;
+   if (have_EXT_vertex_attribute_divisor && screen->vdiv_feats.vertexAttributeInstanceRateDivisor)
+      screen->have_EXT_vertex_attribute_divisor = true;
 
    VkPhysicalDeviceProperties2 props = {};
+   VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vdiv_props = {};
    props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
    if (screen->have_EXT_transform_feedback) {
       screen->tf_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT;
@@ -858,8 +869,14 @@
       screen->rb2_props.pNext = props.pNext;
       props.pNext = &screen->rb2_props;
    }
+   if (have_EXT_vertex_attribute_divisor) {
+      vdiv_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT;
+      vdiv_props.pNext = props.pNext;
+      props.pNext = &vdiv_props;
+   }
    vkGetPhysicalDeviceProperties2(screen->pdev, &props);
    memcpy(&screen->props, &props.properties, sizeof(screen->props));
+   screen->max_vertex_attrib_divisor = vdiv_props.maxVertexAttribDivisor;
 
    if (!screen->have_KHR_maintenance1) {
       debug_printf("ZINK: VK_KHR_maintenance1 required!\n");
@@ -881,7 +898,7 @@
     * this requires us to pass the whole VkPhysicalDeviceFeatures2 struct
     */
    dci.pNext = &feats;
-   const char *extensions[7] = {
+   const char *extensions[8] = {
       VK_KHR_MAINTENANCE1_EXTENSION_NAME,
    };
    num_extensions = 1;
@@ -906,6 +923,8 @@
       extensions[num_extensions++] = VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME;
    if (screen->have_EXT_robustness2_features)
       extensions[num_extensions++] = VK_EXT_ROBUSTNESS_2_EXTENSION_NAME;
+   if (screen->have_EXT_vertex_attribute_divisor)
+      extensions[num_extensions++] = VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME;
    assert(num_extensions <= ARRAY_SIZE(extensions));
 
    dci.ppEnabledExtensionNames = extensions;

src/gallium/drivers/zink/zink_screen.h

diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 38d1ba9..a4fae65 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -51,6 +51,8 @@
    VkPhysicalDeviceTransformFeedbackPropertiesEXT tf_props;
    VkPhysicalDeviceRobustness2PropertiesEXT rb2_props;
    VkPhysicalDeviceRobustness2FeaturesEXT rb2_feats;
+   VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vdiv_feats;
+   uint32_t max_vertex_attrib_divisor;
 
    bool have_KHR_maintenance1;
    bool have_KHR_external_memory_fd;
@@ -58,6 +60,7 @@
    bool have_EXT_transform_feedback;
    bool have_EXT_index_type_uint8;
    bool have_EXT_robustness2_features;
+   bool have_EXT_vertex_attribute_divisor;
 
    bool have_X8_D24_UNORM_PACK32;
    bool have_D24_UNORM_S8_UINT;