mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-08 02:38:04 +02:00
freedreno/ir3: rename has_kill to no_earlyz
There are other cases where we need to disable early-z, like image writes. So rename to something more generic. Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
parent
f736250ab4
commit
dbac1a80d1
9 changed files with 10 additions and 10 deletions
|
|
@ -1395,7 +1395,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->has_kill = true;
|
||||
ctx->so->no_earlyz = true;
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -431,8 +431,8 @@ struct ir3_shader_variant {
|
|||
/* do we have one or more SSBO instructions: */
|
||||
bool has_ssbo;
|
||||
|
||||
/* do we have kill instructions: */
|
||||
bool has_kill;
|
||||
/* do we have kill, image write, etc (which prevents early-z): */
|
||||
bool no_earlyz;
|
||||
|
||||
/* Layout of constant registers, each section (in vec4). Pointer size
|
||||
* is 32b (a3xx, a4xx), or 64b (a5xx+), which effects the size of the
|
||||
|
|
|
|||
|
|
@ -785,7 +785,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->has_kill | fs->writes_pos) {
|
||||
if (fs->no_earlyz | 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -552,7 +552,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->has_kill) {
|
||||
if (fp->no_earlyz) {
|
||||
val |= A3XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE;
|
||||
}
|
||||
if (!ctx->rasterizer->depth_clip_near) {
|
||||
|
|
|
|||
|
|
@ -558,7 +558,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->has_kill | fp->writes_pos;
|
||||
bool fragz = fp->no_earlyz | fp->writes_pos;
|
||||
bool clamp = !ctx->rasterizer->depth_clip_near;
|
||||
|
||||
OUT_PKT0(ring, REG_A4XX_RB_DEPTH_CONTROL, 1);
|
||||
|
|
|
|||
|
|
@ -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->has_kill;
|
||||
emit.no_lrz_write = fp->writes_pos || fp->no_earlyz;
|
||||
|
||||
emit.binning_pass = false;
|
||||
emit.dirty = dirty;
|
||||
|
|
|
|||
|
|
@ -572,7 +572,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->has_kill | fp->writes_pos;
|
||||
bool fragz = fp->no_earlyz | fp->writes_pos;
|
||||
|
||||
OUT_PKT4(ring, REG_A5XX_RB_DEPTH_CNTL, 1);
|
||||
OUT_RING(ring, zsa->rb_depth_cntl);
|
||||
|
|
|
|||
|
|
@ -200,7 +200,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 fp:
|
||||
*/
|
||||
emit.no_lrz_write = fp->writes_pos || fp->has_kill;
|
||||
emit.no_lrz_write = fp->writes_pos || fp->no_earlyz;
|
||||
|
||||
struct fd_ringbuffer *ring = ctx->batch->draw;
|
||||
enum pc_di_primtype primtype = ctx->primtypes[info->mode];
|
||||
|
|
|
|||
|
|
@ -614,7 +614,7 @@ setup_stateobj(struct fd_ringbuffer *ring,
|
|||
OUT_RING(ring, 0x0000fcfc); /* VFD_CONTROL_5 */
|
||||
OUT_RING(ring, 0x00000000); /* VFD_CONTROL_6 */
|
||||
|
||||
bool fragz = s[FS].v->has_kill | s[FS].v->writes_pos;
|
||||
bool fragz = s[FS].v->no_earlyz | s[FS].v->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));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue