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@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13743>
(cherry picked from commit a68a0c9e1c)
This commit is contained in:
Emma Anholt 2021-11-10 12:10:43 -08:00 committed by Eric Engestrom
parent fdc6d4dc95
commit db338002c7
6 changed files with 3 additions and 23 deletions

View file

@ -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
},

View file

@ -277,11 +277,6 @@ spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@miptree-gles srgb-fp@sRGB decode full precision,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
spec@nv_image_formats@compiler@declaration-disallow-r16-snorm-2d-array.frag,Fail
spec@nv_image_formats@compiler@declaration-disallow-r16-snorm-2d-array.vert,Fail
spec@nv_image_formats@compiler@declaration-disallow-r16-snorm-2d.frag,Fail

View file

@ -514,11 +514,7 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb@sRGB decode,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail
spec@nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
spec@nv_copy_image@nv_copy_image-formats,Fail
spec@nv_copy_image@nv_copy_image-formats@Source: GL_DEPTH32F_STENCIL8/Destination: GL_DEPTH32F_STENCIL8,Fail
spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash

View file

@ -513,13 +513,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp@sRGB decode full precision,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb@sRGB decode,Fail
# "MESA: error: Unhandled ALU op: f2f64"
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageLoad,Fail
spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_external_essl3_imageStore,Fail
spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail

View file

@ -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;

View file

@ -839,11 +839,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gl hdr,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gl hdr@HDR Profile,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp@sRGB decode full precision,Fail
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
spec@nv_copy_depth_to_color@nv_copy_depth_to_color,Crash
spec@nv_copy_image@nv_copy_image-formats,Fail
spec@nv_copy_image@nv_copy_image-formats --samples=2,Fail
spec@nv_copy_image@nv_copy_image-formats --samples=2@Source: GL_ALPHA8/Destination: GL_ALPHA8,Fail