fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3: split kill from no_earlyz

Browse source 
Unlike other conditions which prevent early-discard of fragments, kill
does not prevent early LRZ test.  Split `has_kill` from `no_earlyz` so
we can take advantage of this.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5298>
This commit is contained in:
Rob Clark 2020-06-01 17:29:00 -07:00 • committed by Marge Bot
parent 346bb81f40
commit ebcf3545db
9 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/freedreno/ir3/ir3_compiler_nir.c
View file

@ -1892,7 +1892,7 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr)
array_insert(ctx->ir, ctx->ir->predicates, kill);
array_insert(b, b->keeps, kill);
ctx->so->no_earlyz = true;
ctx->so->has_kill = true;
break;
}

9
src/freedreno/ir3/ir3_shader.h
View file

@ -534,9 +534,16 @@ struct ir3_shader_variant {
bool need_fine_derivatives;
/* do we have kill, image write, etc (which prevents early-z): */
/* do we have image write, etc (which prevents early-z): */
bool no_earlyz;
/* do we have kill, which also prevents early-z, but not necessarily
* early-lrz (as long as lrz-write is disabled, which must be handled
* outside of ir3. Unlike other no_earlyz cases, kill doesn't have
* side effects that prevent early-lrz discard.
*/
bool has_kill;
bool per_samp;
/* for astc srgb workaround, the number/base of additional

2
src/freedreno/vulkan/tu_pipeline.c
View file

@ -1385,7 +1385,7 @@ tu6_emit_fs_outputs(struct tu_cs *cs,
uint32_t gras_su_depth_plane_cntl = 0;
uint32_t rb_depth_plane_cntl = 0;
if (fs->no_earlyz || fs->writes_pos) {
if (fs->no_earlyz || fs->has_kill || fs->writes_pos) {
gras_su_depth_plane_cntl |= A6XX_GRAS_SU_DEPTH_PLANE_CNTL_FRAG_WRITES_Z;
rb_depth_plane_cntl |= A6XX_RB_DEPTH_PLANE_CNTL_FRAG_WRITES_Z;
}

2
src/gallium/drivers/freedreno/a3xx/fd3_emit.c
View file

@ -575,7 +575,7 @@ fd3_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
val |= A3XX_RB_DEPTH_CONTROL_FRAG_WRITES_Z;
val |= A3XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE;
}
if (fp->no_earlyz) {
if (fp->no_earlyz || fp->has_kill) {
val |= A3XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE;
}
if (!ctx->rasterizer->depth_clip_near) {

2
src/gallium/drivers/freedreno/a4xx/fd4_emit.c
View file

@ -581,7 +581,7 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
if (dirty & (FD_DIRTY_ZSA | FD_DIRTY_RASTERIZER | FD_DIRTY_PROG)) {
struct fd4_zsa_stateobj *zsa = fd4_zsa_stateobj(ctx->zsa);
bool fragz = fp->no_earlyz | fp->writes_pos;
bool fragz = fp->no_earlyz | fp->has_kill | fp->writes_pos;
bool clamp = !ctx->rasterizer->depth_clip_near;
OUT_PKT0(ring, REG_A4XX_RB_DEPTH_CONTROL, 1);

2
src/gallium/drivers/freedreno/a5xx/fd5_draw.c
View file

@ -142,7 +142,7 @@ fd5_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
/* figure out whether we need to disable LRZ write for binning
* pass using draw pass's fp:
*/
emit.no_lrz_write = fp->writes_pos || fp->no_earlyz;
emit.no_lrz_write = fp->writes_pos || fp->no_earlyz || fp->has_kill;
emit.binning_pass = false;
emit.dirty = dirty;

2
src/gallium/drivers/freedreno/a5xx/fd5_emit.c
View file

@ -602,7 +602,7 @@ fd5_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
if (dirty & (FD_DIRTY_ZSA | FD_DIRTY_RASTERIZER | FD_DIRTY_PROG)) {
struct fd5_zsa_stateobj *zsa = fd5_zsa_stateobj(ctx->zsa);
bool fragz = fp->no_earlyz | fp->writes_pos;
bool fragz = fp->no_earlyz || fp->has_kill || fp->writes_pos;
OUT_PKT4(ring, REG_A5XX_RB_DEPTH_CNTL, 1);
OUT_RING(ring, zsa->rb_depth_cntl);

2
src/gallium/drivers/freedreno/a6xx/fd6_draw.c
View file

@ -220,7 +220,7 @@ fd6_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
/* figure out whether we need to disable LRZ write for binning
* pass using draw pass's fs:
*/
emit.no_lrz_write = emit.fs->writes_pos || emit.fs->no_earlyz;
emit.no_lrz_write = emit.fs->writes_pos || emit.fs->no_earlyz || emit.fs->has_kill;
struct fd_ringbuffer *ring = ctx->batch->draw;

2
src/gallium/drivers/freedreno/a6xx/fd6_program.c
View file

@ -835,7 +835,7 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
OUT_RING(ring,
COND(primid_passthru, A6XX_VFD_CONTROL_6_PRIMID_PASSTHRU)); /* VFD_CONTROL_6 */
bool fragz = fs->no_earlyz | fs->writes_pos;
bool fragz = fs->no_earlyz || fs->has_kill || fs->writes_pos;
OUT_PKT4(ring, REG_A6XX_RB_DEPTH_PLANE_CNTL, 1);
OUT_RING(ring, COND(fragz, A6XX_RB_DEPTH_PLANE_CNTL_FRAG_WRITES_Z));