From 250dba1dce55cd03ea23babcb1e9f9b30cc2b6b4 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 10 Sep 2025 08:43:30 -0700 Subject: [PATCH] freedreno/a6xx: Fallback to original blit in the snorm_copy path Unlike z/s blits, where we want the fallback to use the re-written blit, we don't want this in the handle_snorm_copy_blit() path. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ci/freedreno-a618-fails.txt | 18 ------------------ .../drivers/freedreno/a6xx/fd6_blitter.cc | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 31b01de8bfb..0a74d87d65c 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -107,24 +107,6 @@ spec@ext_framebuffer_multisample@sample-alpha-to-coverage 4 depth,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail -# These failures go away with FD_MESA_DEBUG=noblit, but don't seem to be related -# to the actual mipmap generation blits (which we do fall back on) -spec@ext_texture_snorm@fbo-generatemipmap-formats,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_ALPHA16_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_ALPHA16_SNORM NPOT,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY_SNORM NPOT,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY8_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY8_SNORM NPOT,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY16_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_INTENSITY16_SNORM NPOT,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_LUMINANCE16_ALPHA16_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_LUMINANCE16_ALPHA16_SNORM NPOT,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_LUMINANCE16_SNORM,Fail -spec@ext_texture_snorm@fbo-generatemipmap-formats@GL_LUMINANCE16_SNORM NPOT,Fail - -spec@ext_texture_snorm@multisample-formats 2 gl_ext_texture_snorm,Fail -spec@ext_texture_snorm@multisample-formats 4 gl_ext_texture_snorm,Fail spec@ext_transform_feedback@tessellation triangle_fan flat_first,Fail spec@ext_transform_feedback@tessellation triangle_strip flat_first,Fail spec@glsl-1.30@execution@texelfetch fs sampler3d 1x129x9-98x129x9,Fail diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc index 19967455202..3b9c4d0c646 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc @@ -1496,7 +1496,7 @@ handle_snorm_copy_blit(struct fd_context *ctx, blit.src.format = blit.dst.format = util_format_snorm_to_unorm(info->src.format); - return do_rewritten_blit(ctx, &blit); + return handle_rgba_blit(ctx, &blit); } template