Mesa (main): freedreno/a6xx: Apply the cube image size lowering to GL, too.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a48fc88571f9fbaaf82390187bc748fed0dfa02a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a48fc88571f9fbaaf82390187bc748fed0dfa02a

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Aug  5 12:57:13 2021 -0700

freedreno/a6xx: Apply the cube image size lowering to GL, too.

Fixes KHR-GLES31.core.texture_cube_map_array.texture_size_compute_sh.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12256>

---

 src/freedreno/ci/deqp-freedreno-a630-fails.txt                   | 6 ------
 src/freedreno/ir3/ir3_nir.c                                      | 5 +++++
 src/freedreno/vulkan/tu_shader.c                                 | 5 -----
 src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt | 1 -
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/freedreno/ci/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
index e26e8afd0ac..a6d94707bef 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
@@ -58,12 +58,6 @@ KHR-GLES31.core.geometry_shader.layered_framebuffer.stencil_support,Fail
 # " [31] Check failed. Received: [3,0,0,2] instead of: [5,0,0,2]"
 KHR-GLES31.core.shader_image_load_store.basic-glsl-misc-fs,Fail
 
-# Storage Type: IMMUTABLE imageSize() for imageCubeArray returned wrong values of [width][height][layers]. They are equal to[32][32][18] but should be [32][32][3].
-# Storage Type: IMMUTABLE imageSize() for imageCubeArray returned wrong values of [width][height][layers]. They are equal to[64][64][6] but should be [64][64][1].
-# Storage Type: IMMUTABLE imageSize() for imageCubeArray returned wrong values of [width][height][layers]. They are equal to[128][128][12] but should be [128][128][2].
-# Storage Type: IMMUTABLE imageSize() for imageCubeArray returned wrong values of [width][height][layers]. They are equal to[256][256][12] but should be [256][256][2].
-KHR-GLES31.core.texture_cube_map_array.texture_size_compute_sh,Fail
-
 # " Pixel data comparison failed; expected: (0.1, 0.2, 0.3, 0.4) rendered: (0, 0, 0, 0) epsilon: 0.00392157
 #   Pixel data comparison failed at esextcTessellationShaderPoints.cpp:597"
 KHR-GLES31.core.tessellation_shader.tessellation_shader_point_mode.point_rendering,Fail
diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index db646674d89..670750e5986 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -352,6 +352,11 @@ ir3_finalize_nir(struct ir3_compiler *compiler, nir_shader *s)
       .lower_tg4_offsets = true,
    };
 
+   nir_lower_image_options lower_image_opts = {
+      .lower_cube_size = true,
+   };
+   NIR_PASS_V(s, nir_lower_image, &lower_image_opts);
+
    if (compiler->gen >= 4) {
       /* a4xx seems to have *no* sam.p */
       tex_options.lower_txp = ~0; /* lower all txp */
diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index 578bcdb041c..55f38fff7fa 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -781,11 +781,6 @@ tu_shader_create(struct tu_device *dev,
 
    NIR_PASS_V(nir, tu_lower_io, shader, layout);
 
-   nir_lower_image_options lower_image_opts = {
-      .lower_cube_size = true,
-   };
-   NIR_PASS_V(nir, nir_lower_image, &lower_image_opts);
-
    nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
 
    ir3_finalize_nir(dev->compiler, nir);
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
index b9953b09782..4e85532d401 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
@@ -187,7 +187,6 @@ spec at arb_texture_view@bug-layers-image,Crash
 spec at arb_texture_view@mipgen,Fail
 spec at arb_texture_view@rendering-layers-image,Fail
 spec at arb_texture_view@rendering-layers-image at layers rendering of image1DArray,Fail
-spec at arb_texture_view@rendering-layers-image at layers rendering of imageCubeArray,Fail
 spec at arb_timer_query@timestamp-get,Fail
 spec at arb_transform_feedback3@arb_transform_feedback3-ext_interleaved_two_bufs_vs,Fail
 spec at arb_transform_feedback3@gl_skipcomponents1-1,Fail