Mesa (staging/21.3): mesa/st: Disable NV_copy_depth_to_color on non-doubles-capable HW.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: db338002c751f28998ac6937d5e12e553d646592
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db338002c751f28998ac6937d5e12e553d646592

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Nov 10 12:10:43 2021 -0800

mesa/st: Disable NV_copy_depth_to_color on non-doubles-capable HW.

The previous doubles check
(https://gitlab.freedesktop.org/mesa/mesa/-/issues/3459) checked that you
didn't have full doubles emulation turned on, but we also need to check
that you have doubles at all (emulated or not) or non-GL4 drivers will
fail.

Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13743>
(cherry picked from commit a68a0c9e1c69d14f210de569ed4d73f3e42857db)

---

 .pick_status.json                         | 2 +-
 src/broadcom/ci/v3d-rpi4-fails.txt        | 5 -----
 src/freedreno/ci/freedreno-a530-fails.txt | 6 +-----
 src/freedreno/ci/freedreno-a630-fails.txt | 7 -------
 src/mesa/state_tracker/st_extensions.c    | 1 +
 src/panfrost/ci/panfrost-g52-fails.txt    | 5 -----
 6 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 34fc9706695..1ffabfaed24 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1633,7 +1633,7 @@
         "description": "mesa/st: Disable NV_copy_depth_to_color on non-doubles-capable HW.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/broadcom/ci/v3d-rpi4-fails.txt b/src/broadcom/ci/v3d-rpi4-fails.txt
index b52c0a5431e..c0d90c2d266 100644
--- a/src/broadcom/ci/v3d-rpi4-fails.txt
+++ b/src/broadcom/ci/v3d-rpi4-fails.txt
@@ -277,11 +277,6 @@ spec at khr_texture_compression_astc@miptree-gles srgb-fp,Fail
 spec at khr_texture_compression_astc@miptree-gles srgb-fp at sRGB decode full precision,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp at sRGB decode full precision,Fail
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
 spec at nv_image_formats@compiler at declaration-disallow-r16-snorm-2d-array.frag,Fail
 spec at nv_image_formats@compiler at declaration-disallow-r16-snorm-2d-array.vert,Fail
 spec at nv_image_formats@compiler at declaration-disallow-r16-snorm-2d.frag,Fail
diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt
index f493e646de4..6001b6ef640 100644
--- a/src/freedreno/ci/freedreno-a530-fails.txt
+++ b/src/freedreno/ci/freedreno-a530-fails.txt
@@ -514,11 +514,7 @@ spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb at sRGB decode,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp at sRGB decode full precision,Fail
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
+
 spec at nv_copy_image@nv_copy_image-formats,Fail
 spec at nv_copy_image@nv_copy_image-formats at Source: GL_DEPTH32F_STENCIL8/Destination: GL_DEPTH32F_STENCIL8,Fail
 spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index d35e8dbf17f..43aa7b46901 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -513,13 +513,6 @@ spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp at sRGB decode full precision,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb at sRGB decode,Fail
 
-# "MESA: error: Unhandled ALU op: f2f64"
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
-
 spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageLoad,Fail
 spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageStore,Fail
 spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index f27051115d1..88811261c20 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1849,6 +1849,7 @@ void st_init_extensions(struct pipe_screen *screen,
    if (prefer_nir &&
        screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_INTEGERS) &&
        extensions->ARB_stencil_texturing &&
+       screen->get_param(screen, PIPE_CAP_DOUBLES) &&
        !(nir_options->lower_doubles_options & nir_lower_fp64_full_software))
       extensions->NV_copy_depth_to_color = TRUE;
 
diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
index 67b89ce7e49..dda54433aa0 100644
--- a/src/panfrost/ci/panfrost-g52-fails.txt
+++ b/src/panfrost/ci/panfrost-g52-fails.txt
@@ -839,11 +839,6 @@ spec at khr_texture_compression_astc@sliced-3d-miptree-gl hdr,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gl hdr at HDR Profile,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
 spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp at sRGB decode full precision,Fail
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
-spec at nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
 spec at nv_copy_image@nv_copy_image-formats,Fail
 spec at nv_copy_image@nv_copy_image-formats --samples=2,Fail
 spec at nv_copy_image@nv_copy_image-formats --samples=2 at Source: GL_ALPHA8/Destination: GL_ALPHA8,Fail