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

broadcom/vc5: Refactor the implicit coords/stores_pending logic.

Browse source 
Since I just fixed a bug due to forgetting to do these right, do it once
in the helper func.
This commit is contained in:
Eric Anholt 2018-03-30 16:43:51 -07:00
parent ec60559f97
commit b946218c48
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ load_general(struct vc5_cl *cl, struct pipe_surface *psurf, int buffer)
static void
store_general(struct vc5_job *job,
struct vc5_cl *cl, struct pipe_surface *psurf, int buffer,
int pipe_bit, bool last_store, bool general_color_clear)
int pipe_bit, uint32_t *stores_pending, bool general_color_clear)
{
struct vc5_surface *surf = vc5_surface(psurf);
bool separate_stencil = surf->separate_stencil && buffer == STENCIL;
@ -92,6 +92,9 @@ store_general(struct vc5_job *job,
surf = vc5_surface(psurf);
}
*stores_pending &= ~pipe_bit;
bool last_store = !(*stores_pending);
struct vc5_resource *rsc = vc5_resource(psurf->texture);
rsc->writes++;
@ -146,6 +149,11 @@ store_general(struct vc5_job *job,
surf->padded_height_of_output_image_in_uif_blocks;
#endif /* V3D_VERSION < 40 */
}
/* There must be a TILE_COORDINATES_IMPLICIT between each store. */
if (V3D_VERSION < 40 && !last_store) {
cl_emit(cl, TILE_COORDINATES_IMPLICIT, coords);
}
}
static int
@ -282,11 +290,8 @@ vc5_rcl_emit_stores(struct vc5_job *job, struct vc5_cl *cl)
continue;
}
stores_pending &= ~bit;
store_general(job, cl, psurf, RENDER_TARGET_0 + i, bit,
!stores_pending, general_color_clear);
if (V3D_VERSION < 40 && stores_pending)
cl_emit(cl, TILE_COORDINATES_IMPLICIT, coords);
&stores_pending, general_color_clear);
}
if (job->resolve & PIPE_CLEAR_DEPTHSTENCIL && job->zsbuf &&
@ -294,38 +299,23 @@ vc5_rcl_emit_stores(struct vc5_job *job, struct vc5_cl *cl)
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,
&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,
&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);
}
&stores_pending, general_color_clear);
}
}