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

broadcom/vc5: Emit missing TILE_COORDINATES_IMPLICIT in separate z/s stores.

Browse source 
Fixes a simulator assertion failure in
KHR-GLES3.packed_depth_stencil.blit.depth32f_stencil8
This commit is contained in:
Eric Anholt 2018-03-30 16:39:14 -07:00
parent 8f2999120d
commit ec60559f97
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/drivers/vc5/vc5_rcl.c
View file

@ -291,31 +291,42 @@ vc5_rcl_emit_stores(struct vc5_job *job, struct vc5_cl *cl)
if (job->resolve & PIPE_CLEAR_DEPTHSTENCIL && job->zsbuf &&
!(V3D_VERSION < 40 && job->zsbuf->texture->nr_samples <= 1)) {
stores_pending &= ~PIPE_CLEAR_DEPTHSTENCIL;
struct vc5_resource *rsc = vc5_resource(job->zsbuf->texture);
if (rsc->separate_stencil) {
if (job->resolve & PIPE_CLEAR_DEPTH) {
stores_pending &= ~PIPE_CLEAR_DEPTH;
store_general(job, cl, job->zsbuf, Z,
PIPE_CLEAR_DEPTH,
!stores_pending,
general_color_clear);
if (V3D_VERSION < 40 && stores_pending) {
cl_emit(cl, TILE_COORDINATES_IMPLICIT,
coords);
}
}
if (job->resolve & PIPE_CLEAR_STENCIL) {
stores_pending &= ~PIPE_CLEAR_STENCIL;
store_general(job, cl, job->zsbuf, STENCIL,
PIPE_CLEAR_STENCIL,
!stores_pending,
general_color_clear);
if (V3D_VERSION < 40 && stores_pending) {
cl_emit(cl, TILE_COORDINATES_IMPLICIT,
coords);
}
}
} else {
stores_pending &= ~PIPE_CLEAR_DEPTHSTENCIL;
store_general(job, cl, job->zsbuf,
zs_buffer_from_pipe_bits(job->resolve),
job->resolve & PIPE_CLEAR_DEPTHSTENCIL,
!stores_pending, general_color_clear);
if (V3D_VERSION < 40 && stores_pending) {
cl_emit(cl, TILE_COORDINATES_IMPLICIT,
coords);
}
}
if (V3D_VERSION < 40 && stores_pending)
cl_emit(cl, TILE_COORDINATES_IMPLICIT, coords);
}
if (stores_pending) {