OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3d: Clean up vestiges of alpha test lowering.

Browse Source 
We had an unnecessary case in our uniforms upload switch statement, since
we no longer advertise the cap.

Fixes: 8ad931808e ("v3d: do not report alpha-test as supported")
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8601>
This commit is contained in:
Eric Anholt
2021-01-20 12:33:49 -08:00
parent b9a9cd59ff
commit 5ddc2f916f
5 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/broadcom/compiler/v3d_compiler.h
View File

@@ -280,8 +280,6 @@ enum quniform_contents {
QUNIFORM_IMAGE_DEPTH, QUNIFORM_IMAGE_DEPTH,
QUNIFORM_IMAGE_ARRAY_SIZE, QUNIFORM_IMAGE_ARRAY_SIZE,
QUNIFORM_ALPHA_REF,
QUNIFORM_LINE_WIDTH, QUNIFORM_LINE_WIDTH,
/* The line width sent to hardware. This includes the expanded width /* The line width sent to hardware. This includes the expanded width
@@ -386,7 +384,6 @@ struct v3d_fs_key {
bool is_points; bool is_points;
bool is_lines; bool is_lines;
bool line_smoothing; bool line_smoothing;
bool alpha_test;
bool point_coord_upper_left; bool point_coord_upper_left;
bool light_twoside; bool light_twoside;
bool msaa; bool msaa;
@@ -414,7 +411,6 @@ struct v3d_fs_key {
const uint8_t *swizzle; const uint8_t *swizzle;
} color_fmt[V3D_MAX_DRAW_BUFFERS]; } color_fmt[V3D_MAX_DRAW_BUFFERS];
uint8_t alpha_test_func;
uint8_t logicop_func; uint8_t logicop_func;
uint32_t point_sprite_mask; uint32_t point_sprite_mask;

1
src/broadcom/compiler/vir_dump.c
View File

@@ -30,7 +30,6 @@ vir_dump_uniform(enum quniform_contents contents,
uint32_t data) uint32_t data)
{ {
static const char *quniform_names[] = { static const char *quniform_names[] = {
[QUNIFORM_ALPHA_REF] = "alpha_ref",
[QUNIFORM_LINE_WIDTH] = "line_width", [QUNIFORM_LINE_WIDTH] = "line_width",
[QUNIFORM_AA_LINE_WIDTH] = "aa_line_width", [QUNIFORM_AA_LINE_WIDTH] = "aa_line_width",
[QUNIFORM_VIEWPORT_X_SCALE] = "vp_x_scale", [QUNIFORM_VIEWPORT_X_SCALE] = "vp_x_scale",

4
src/broadcom/vulkan/v3dv_pipeline.c
View File

@@ -1137,10 +1137,6 @@ pipeline_populate_v3d_fs_key(struct v3d_fs_key *key,
} }
} }
/* Vulkan doesn't support alpha test */
key->alpha_test = false;
key->alpha_test_func = COMPARE_FUNC_NEVER;
/* This is intended for V3D versions before 4.1, otherwise we just use the /* This is intended for V3D versions before 4.1, otherwise we just use the
* tile buffer load/store swap R/B bit. * tile buffer load/store swap R/B bit.
*/ */

5
src/gallium/drivers/v3d/v3d_program.c
View File

@@ -566,11 +566,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->sample_alpha_to_one = v3d->blend->base.alpha_to_one;
} }
if (v3d->zsa->base.alpha_enabled) {
key->alpha_test = true;
key->alpha_test_func = v3d->zsa->base.alpha_func;
}
key->swap_color_rb = v3d->swap_color_rb; key->swap_color_rb = v3d->swap_color_rb;
for (int i = 0; i < v3d->framebuffer.nr_cbufs; i++) { for (int i = 0; i < v3d->framebuffer.nr_cbufs; i++) {

9
src/gallium/drivers/v3d/v3d_uniforms.c
View File

@@ -307,11 +307,6 @@ v3d_write_uniforms(struct v3d_context *v3d, struct v3d_job *job,
data)); data));
break; break;
case QUNIFORM_ALPHA_REF:
cl_aligned_f(&uniforms,
v3d->zsa->base.alpha_ref_value);
break;
case QUNIFORM_LINE_WIDTH: case QUNIFORM_LINE_WIDTH:
cl_aligned_f(&uniforms, cl_aligned_f(&uniforms,
v3d->rasterizer->base.line_width); v3d->rasterizer->base.line_width);
@@ -469,10 +464,6 @@ v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader)
dirty |= VC5_DIRTY_SHADER_IMAGE; dirty |= VC5_DIRTY_SHADER_IMAGE;
break; break;
case QUNIFORM_ALPHA_REF:
dirty |= VC5_DIRTY_ZSA;
break;
case QUNIFORM_LINE_WIDTH: case QUNIFORM_LINE_WIDTH:
case QUNIFORM_AA_LINE_WIDTH: case QUNIFORM_AA_LINE_WIDTH:
dirty |= VC5_DIRTY_RASTERIZER; dirty |= VC5_DIRTY_RASTERIZER;