From 48011c42aaf0efc5afccc8fd90f4604182d21314 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 8 Jun 2018 08:32:34 -0700 Subject: [PATCH] v3d: Remove unused QUNIFORM_STENCIL left over from vc4. --- src/broadcom/compiler/v3d_compiler.h | 2 -- src/gallium/drivers/v3d/v3d_uniforms.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 4dba23c067e..4eeda23f5de 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -244,8 +244,6 @@ enum quniform_contents { QUNIFORM_TEXTURE_BORDER_COLOR, - QUNIFORM_STENCIL, - QUNIFORM_ALPHA_REF, QUNIFORM_SAMPLE_MASK, diff --git a/src/gallium/drivers/v3d/v3d_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c index ad46c691218..6f0ef915535 100644 --- a/src/gallium/drivers/v3d/v3d_uniforms.c +++ b/src/gallium/drivers/v3d/v3d_uniforms.c @@ -348,14 +348,6 @@ v3d_write_uniforms(struct v3d_context *v3d, struct v3d_compiled_shader *shader, uinfo->data[i])); break; - case QUNIFORM_STENCIL: - cl_aligned_u32(&uniforms, - v3d->zsa->stencil_uniforms[uinfo->data[i]] | - (uinfo->data[i] <= 1 ? - (v3d->stencil_ref.ref_value[uinfo->data[i]] << 8) : - 0)); - break; - case QUNIFORM_ALPHA_REF: cl_aligned_f(&uniforms, v3d->zsa->base.alpha.ref_value); @@ -469,7 +461,6 @@ v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader) dirty |= VC5_DIRTY_FRAGTEX | VC5_DIRTY_VERTTEX; break; - case QUNIFORM_STENCIL: case QUNIFORM_ALPHA_REF: dirty |= VC5_DIRTY_ZSA; break; -- 2.30.2