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

st/mesa: fix default interpolation for colors.

Browse Source 
Brian mentioned that mesa-demos/reflect was broken on softpipe,
by my previous commit. The problem was were blindly translating none
to perspective, when color/pntc at least need it linear.

this is the final version that fixes the reflect regression.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-01-06 13:31:07 +00:00
parent be21ded2ae
commit e1ff84371c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/state_tracker/st_program.c
View File

@@ -432,10 +432,13 @@ st_get_vp_variant(struct st_context *st,
static unsigned static unsigned
st_translate_interp(enum glsl_interp_qualifier glsl_qual) st_translate_interp(enum glsl_interp_qualifier glsl_qual, bool is_color)
{ {
switch (glsl_qual) { switch (glsl_qual) {
case INTERP_QUALIFIER_NONE: case INTERP_QUALIFIER_NONE:
if (is_color)
return TGSI_INTERPOLATE_LINEAR;
return TGSI_INTERPOLATE_PERSPECTIVE;
case INTERP_QUALIFIER_SMOOTH: case INTERP_QUALIFIER_SMOOTH:
return TGSI_INTERPOLATE_PERSPECTIVE; return TGSI_INTERPOLATE_PERSPECTIVE;
case INTERP_QUALIFIER_FLAT: case INTERP_QUALIFIER_FLAT:
@@ -538,12 +541,14 @@ st_translate_fragment_program(struct st_context *st,
case FRAG_ATTRIB_COL0: case FRAG_ATTRIB_COL0:
input_semantic_name[slot] = TGSI_SEMANTIC_COLOR; input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
input_semantic_index[slot] = 0; input_semantic_index[slot] = 0;
interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr]); interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr],
TRUE);
break; break;
case FRAG_ATTRIB_COL1: case FRAG_ATTRIB_COL1:
input_semantic_name[slot] = TGSI_SEMANTIC_COLOR; input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
input_semantic_index[slot] = 1; input_semantic_index[slot] = 1;
interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr]); interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr],
TRUE);
break; break;
case FRAG_ATTRIB_FOGC: case FRAG_ATTRIB_FOGC:
input_semantic_name[slot] = TGSI_SEMANTIC_FOG; input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
@@ -600,7 +605,8 @@ st_translate_fragment_program(struct st_context *st,
if (attr == FRAG_ATTRIB_PNTC) if (attr == FRAG_ATTRIB_PNTC)
interpMode[slot] = TGSI_INTERPOLATE_LINEAR; interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
else else
interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr]); interpMode[slot] = st_translate_interp(stfp->Base.InterpQualifier[attr],
FALSE);
break; break;
} }
} }