From bc031b76d8d4016f88d6fee85fe32527c3bab01d Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 19 Jun 2025 14:53:55 -0400
Subject: [PATCH] spirv: Add new SPV_KHR_descriptor_heap Builtins

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40649>
---
 src/compiler/spirv/vtn_variables.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index ac0cb527b6d..5e8ae94efee 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1318,6 +1318,15 @@ vtn_get_builtin_location(struct vtn_builder *b,
       set_mode_system_value(b, mode);
       break;
 
+   case SpvBuiltInSamplerHeapEXT:
+      *location = SYSTEM_VALUE_SAMPLER_HEAP_PTR;
+      set_mode_system_value(b, mode);
+      break;
+   case SpvBuiltInResourceHeapEXT:
+      *location = SYSTEM_VALUE_RESOURCE_HEAP_PTR;
+      set_mode_system_value(b, mode);
+      break;
+
    default:
       vtn_fail("Unsupported builtin: %s (%u)",
                spirv_builtin_to_string(builtin), builtin);