From: Emma Anholt <emma@anholt.net>
Date: Tue, 13 Dec 2022 21:16:03 +0000 (-0800)
Subject: zink: Fix reversed cap declarations for ImageBuffer
X-Git-Tag: upstream/23.3.3~15547
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9dedbf66f62bdeda7126f0f6cd38c2597c930391;p=platform%2Fupstream%2Fmesa.git

zink: Fix reversed cap declarations for ImageBuffer

Fixes validation fails on
KHR-GLES31.core.texture_buffer.texture_buffer_texture_buffer_range.

Fixes: f55a4407ef97 ("zink: more accurately set {Sampled,Image}Buffer caps")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20308>
---

diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 7b0e7f9..9d9078e 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -990,9 +990,9 @@ get_bare_image_type(struct ntv_context *ctx, struct nir_variable *var, bool is_s
    }
    if (dimension == SpvDimBuffer) {
       if (is_sampler)
-         spirv_builder_emit_cap(&ctx->builder, SpvCapabilityImageBuffer);
-      else
          spirv_builder_emit_cap(&ctx->builder, SpvCapabilitySampledBuffer);
+      else
+         spirv_builder_emit_cap(&ctx->builder, SpvCapabilityImageBuffer);
    }
 
    bool arrayed = glsl_sampler_type_is_array(type);