Mesa (staging/20.1): anv: Advertise shaderIntegerFunctions2

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 53e48eb250ecc9d4ed2e9506957d6abfd27a0bf5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=53e48eb250ecc9d4ed2e9506957d6abfd27a0bf5

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Jul 22 15:23:46 2020 -0500

anv: Advertise shaderIntegerFunctions2

We advertised the extension string but never the feature bit.  Doh!

Fixes: c57338b92471 "anv: Enable SPV_INTEL_shader_integer_functions2..."
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6033>
(cherry picked from commit 7f06d194fd3650f3078574741ce56bdcba43279d)

---

 .pick_status.json             | 2 +-
 src/intel/vulkan/anv_device.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index ea46a4e3a7a..07857e596ba 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -409,7 +409,7 @@
         "description": "anv: Advertise shaderIntegerFunctions2",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c57338b924710b93193f921cd1e95d6de6b398ef"
     },
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index f620c1791d0..e0e53321521 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1297,6 +1297,13 @@ void anv_GetPhysicalDeviceFeatures2(
          break;
       }
 
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL: {
+         VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *features =
+            (VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *)ext;
+         features->shaderIntegerFunctions2 = true;
+         break;
+      }
+
       case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR: {
          VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR *features =
             (VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR *)ext;