diff options
| author | Eric Anholt <eric@anholt.net> | 2021-04-19 11:49:14 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-04-20 19:42:27 +0200 |
| commit | ee3c6aa21a53acf825ddbc274c1e76987a43d724 (patch) | |
| tree | 2e1e37cee2c006945272c24112830ef9cd7a9617 /src | |
| parent | e5ecf4b534e1dee2741c279fe7a4ddd11b00908e (diff) | |
freedreno/a6xx: Don't try to do Z-as-RGBA blits for mismatched formats.
Fixes piglit crashes doing glCopyTexSubImage from (for example)
PIPE_FORMAT_Z24_UNORM_S8_UINT to PIPE_FORMAT_Z32_FLOAT_S8X24_UINT where,
in addition to reading the source Z values incorrectly, we would try to
dereference the missing separate stencil of the Z24S8 buffer.
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10328>
(cherry picked from commit ed04fd44ca5d7827100b334840c7fa95d38d23ce)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_blitter.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c index 33ee7eaf3a4..9896d1f6da2 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c @@ -1006,6 +1006,9 @@ handle_zs_blit(struct fd_context *ctx, dump_blit_info(info); } + if (info->src.format != info->dst.format) + return false; + struct fd_resource *src = fd_resource(info->src.resource); struct fd_resource *dst = fd_resource(info->dst.resource); 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 1b4684c104b..c2dd405fbca 100644 --- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt +++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt @@ -34,8 +34,6 @@ spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-scissor-offscreen,Fail spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@rasterpos,Crash -spec@!opengl 1.1@copyteximage 1d,Crash -spec@!opengl 1.1@copyteximage 2d,Crash spec@!opengl 1.1@draw-pixels,Fail spec@!opengl 1.1@getteximage-depth,Fail spec@!opengl 1.1@getteximage-formats,Fail @@ -178,15 +176,9 @@ spec@arb_texture_buffer_object@formats (fs- arb),Fail spec@arb_texture_buffer_object@formats (vs- arb),Fail spec@arb_texture_compression@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_cube_map@copyteximage cube,Crash -spec@arb_texture_cube_map@copyteximage cube samples=2,Crash -spec@arb_texture_cube_map@copyteximage cube samples=4,Crash spec@arb_texture_float@fbo-blending-formats,Fail spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_rectangle@1-1-linear-texture,Fail -spec@arb_texture_rectangle@copyteximage rect,Crash -spec@arb_texture_rectangle@copyteximage rect samples=2,Crash -spec@arb_texture_rectangle@copyteximage rect samples=4,Crash spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail @@ -281,12 +273,6 @@ spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail spec@ext_packed_float@query-rgba-signed-components,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_array@copyteximage 1d_array,Crash -spec@ext_texture_array@copyteximage 1d_array samples=2,Crash -spec@ext_texture_array@copyteximage 1d_array samples=4,Crash -spec@ext_texture_array@copyteximage 2d_array,Crash -spec@ext_texture_array@copyteximage 2d_array samples=2,Crash -spec@ext_texture_array@copyteximage 2d_array samples=4,Crash spec@ext_texture_array@fbo-depth-array depth-layered-clear,Crash spec@ext_texture_array@fbo-depth-array stencil-layered-clear,Crash spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail |