summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro PiƱeiro <apinheiro@igalia.com>2020-11-02 23:37:54 +0100
committerMarge Bot <eric+marge@anholt.net>2020-11-03 10:55:08 +0000
commit09b2bd1df935a0dc71bc4da75076341e4dbd85d6 (patch)
tree05714abaf2edeabc42d8beab791f6e71b41090d3
parent21ffacff8c70c35649679fd67f2ee770245751e4 (diff)
broadcom/compiler: remove v3d_fs_key depth_enabled field.
It is not used right now, so keeping it adds some noise/confusion. So far configuring Z test are done through the CFG_BITS. See v3dX(emit_state) at v3dx_emit.c for v3d, and pack_cfg_bits at v3dv_pipeline.c for v3dv. There flags like z_updates_enable and others are filled up. That key field seems like a leftover coming from using vc4 as reference, as that driver defines and uses a field with name name. Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7421>
-rw-r--r--src/broadcom/compiler/v3d_compiler.h1
-rw-r--r--src/broadcom/vulkan/v3dv_pipeline.c5
-rw-r--r--src/gallium/drivers/v3d/v3d_program.c2
3 files changed, 0 insertions, 8 deletions
diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index 748035cfb94..8d78bb4f183 100644
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -360,7 +360,6 @@ struct v3d_key {
struct v3d_fs_key {
struct v3d_key base;
- bool depth_enabled;
bool is_points;
bool is_lines;
bool line_smoothing;
diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c
index 74eb9bf057c..14e46291374 100644
--- a/src/broadcom/vulkan/v3dv_pipeline.c
+++ b/src/broadcom/vulkan/v3dv_pipeline.c
@@ -1145,11 +1145,6 @@ pipeline_populate_v3d_fs_key(struct v3d_fs_key *key,
}
}
- const VkPipelineDepthStencilStateCreateInfo *ds_info =
- pCreateInfo->pDepthStencilState;
-
- key->depth_enabled = (ds_info == NULL ? false : ds_info->depthTestEnable);
-
/* Vulkan doesn't support alpha test */
key->alpha_test = false;
key->alpha_test_func = COMPARE_FUNC_NEVER;
diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c
index 7780bc52f56..3ea9d953abc 100644
--- a/src/gallium/drivers/v3d/v3d_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -559,8 +559,6 @@ v3d_update_compiled_fs(struct v3d_context *v3d, uint8_t prim_mode)
key->sample_alpha_to_one = v3d->blend->base.alpha_to_one;
}
- key->depth_enabled = (v3d->zsa->base.depth.enabled ||
- v3d->zsa->base.stencil[0].enabled);
if (v3d->zsa->base.alpha.enabled) {
key->alpha_test = true;
key->alpha_test_func = v3d->zsa->base.alpha.func;