Mesa (master): zink: emit ImageCubeArray cap when accessing arrayed cube dimension images

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3d559985045d01e9219c68796e56a9505f12b178
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d559985045d01e9219c68796e56a9505f12b178

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Mar 22 16:13:36 2021 -0400

zink: emit ImageCubeArray cap when accessing arrayed cube dimension images

required by spec

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9987>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 99b6aa832fd..c2a31c82ae9 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
@@ -730,11 +730,14 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var)
    }
 
    SpvDim dimension = type_to_dim(glsl_get_sampler_dim(type), &is_ms);
+   bool arrayed = glsl_sampler_type_is_array(type);
+   if (dimension == SpvDimCube && arrayed)
+      spirv_builder_emit_cap(&ctx->builder, SpvCapabilityImageCubeArray);
 
    SpvId result_type = get_glsl_basetype(ctx, glsl_get_sampler_result_type(type));
    SpvId image_type = spirv_builder_type_image(&ctx->builder, result_type,
                                                dimension, false,
-                                               glsl_sampler_type_is_array(type),
+                                               arrayed,
                                                is_ms, is_sampler ? 1 : 2,
                                                get_image_format(var->data.image.format));