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

vc4: Stop advertising support for VS color clamping.

Browse Source 
This is special GL behavior that the frontend is now able to handle for
us.

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:21:12 -08:00
parent e584d4f6dd
commit b9a9cd59ff
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/vc4/vc4_program.c
View File

@@ -2298,9 +2298,6 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage,
NIR_PASS_V(c->s, nir_lower_tex, &tex_options); NIR_PASS_V(c->s, nir_lower_tex, &tex_options);
if (c->vs_key && c->vs_key->clamp_color)
NIR_PASS_V(c->s, nir_lower_clamp_color_outputs);
if (c->key->ucp_enables) { if (c->key->ucp_enables) {
if (stage == QSTAGE_FRAG) { if (stage == QSTAGE_FRAG) {
NIR_PASS_V(c->s, nir_lower_clip_fs, NIR_PASS_V(c->s, nir_lower_clip_fs,
@@ -2785,7 +2782,6 @@ vc4_update_compiled_vs(struct vc4_context *vc4, uint8_t prim_mode)
vc4_setup_shared_key(vc4, &key->base, &vc4->verttex); vc4_setup_shared_key(vc4, &key->base, &vc4->verttex);
key->base.shader_state = vc4->prog.bind_vs; key->base.shader_state = vc4->prog.bind_vs;
key->fs_inputs = vc4->prog.fs->fs_inputs; key->fs_inputs = vc4->prog.fs->fs_inputs;
key->clamp_color = vc4->rasterizer->base.clamp_vertex_color;
for (int i = 0; i < ARRAY_SIZE(key->attr_formats); i++) for (int i = 0; i < ARRAY_SIZE(key->attr_formats); i++)
key->attr_formats[i] = vc4->vtx->pipe[i].src_format; key->attr_formats[i] = vc4->vtx->pipe[i].src_format;

1
src/gallium/drivers/vc4/vc4_qir.h
View File

@@ -348,7 +348,6 @@ struct vc4_vs_key {
enum pipe_format attr_formats[8]; enum pipe_format attr_formats[8];
bool is_coord; bool is_coord;
bool per_vertex_point_size; bool per_vertex_point_size;
bool clamp_color;
}; };
/** A basic block of QIR intructions. */ /** A basic block of QIR intructions. */

2
src/gallium/drivers/vc4/vc4_screen.c
View File

@@ -138,7 +138,6 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
switch (param) { switch (param) {
/* Supported features (boolean caps). */ /* Supported features (boolean caps). */
case PIPE_CAP_VERTEX_COLOR_CLAMPED:
case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: case PIPE_CAP_VERTEX_COLOR_UNCLAMPED:
case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: case PIPE_CAP_FRAGMENT_COLOR_CLAMPED:
case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT: case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
@@ -200,6 +199,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
return 1; return 1;
case PIPE_CAP_ALPHA_TEST: case PIPE_CAP_ALPHA_TEST:
case PIPE_CAP_VERTEX_COLOR_CLAMPED:
case PIPE_CAP_TWO_SIDED_COLOR: case PIPE_CAP_TWO_SIDED_COLOR:
return 0; return 0;