fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

freedreno/a6xx: Don't try to do Z-as-RGBA blits for mismatched formats.

Browse source 
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 ed04fd44ca)
This commit is contained in:
Eric Anholt 2021-04-19 11:49:14 -07:00 • committed by Eric Engestrom
parent e5ecf4b534
commit ee3c6aa21a
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -544,7 +544,7 @@
"description": "freedreno/a6xx: Don't try to do Z-as-RGBA blits for mismatched formats.",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

3
src/gallium/drivers/freedreno/a6xx/fd6_blitter.c
View file

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

14
src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
View file

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