zink: properly emit PhysicalStorageBufferAddresses cap
authorKarol Herbst <kherbst@redhat.com>
Sun, 15 Oct 2023 11:29:24 +0000 (13:29 +0200)
committerMarge Bot <emma+marge@anholt.net>
Sun, 15 Oct 2023 12:19:05 +0000 (12:19 +0000)
The PhysicalStorageBuffer64 addressing model requires this cap. Fixes
vulkan validation error.

Fixes: ddc5c304899 ("zink: handle global and scratch vars")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25736>

src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c

index 401e1d8..bb944fd 100644 (file)
@@ -4410,9 +4410,10 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
    if (gl_shader_stage_is_compute(s->info.stage)) {
       if (s->info.cs.ptr_size == 32)
          model = SpvAddressingModelPhysical32;
-      else if (s->info.cs.ptr_size == 64)
+      else if (s->info.cs.ptr_size == 64) {
+         spirv_builder_emit_cap(&ctx.builder, SpvCapabilityPhysicalStorageBufferAddresses);
          model = SpvAddressingModelPhysicalStorageBuffer64;
-      else
+      else
          model = SpvAddressingModelLogical;
    }