fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 10:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: fix the constant interp bitmask for flat mode

Browse source 
Fix the constant interpolation enable bit mask for flat light mode.
FRAG_BIT_COL0 attribute bit might be 0, in which case we need to
shift one more bit right.

This would fix the oglc specularColor test fail on both Sandybridge and
Ivybridge.

v2: move the constant interp bitmask setup code into for(; attr <
FRAG_ATTRIB_MAX; attr++) loop suggested by Eric.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
This commit is contained in:
Yuanhan Liu 2011-09-06 09:29:37 +08:00
parent e3c94fac4e
commit cd6b8421ca
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/drivers/dri/i965/gen6_sf_state.c
View file

@ -263,12 +263,6 @@ upload_sf_state(struct brw_context *brw)
(1 << GEN6_SF_TRIFAN_PROVOKE_SHIFT);
}
/* flat shading */
if (ctx->Light.ShadeModel == GL_FLAT) {
dw17 |= ((brw->fragment_program->Base.InputsRead & (FRAG_BIT_COL0 | FRAG_BIT_COL1)) >>
((brw->fragment_program->Base.InputsRead & FRAG_BIT_WPOS) ? 0 : 1));
}
/* Create the mapping from the FS inputs we produce to the VS outputs
* they source from.
*/
@ -286,6 +280,19 @@ upload_sf_state(struct brw_context *brw)
if (attr == FRAG_ATTRIB_PNTC)
dw16 |= (1 << input_index);
/* flat shading */
if (ctx->Light.ShadeModel == GL_FLAT) {
/*
* Setup the Constant Interpolation Enable bit mask for each
* corresponding attribute(currently, we only care two attrs:
* FRAG_BIT_COL0 and FRAG_BIT_COL1).
*
* FIXME: should we care other attributes?
*/
if (attr == FRAG_ATTRIB_COL0 || attr == FRAG_ATTRIB_COL1)
dw17 |= (1 << input_index);
}
/* The hardware can only do the overrides on 16 overrides at a
* time, and the other up to 16 have to be lined up so that the
* input index = the output index. We'll need to do some

19
src/mesa/drivers/dri/i965/gen7_sf_state.c
View file

@ -68,13 +68,7 @@ upload_sbe_state(struct brw_context *brw)
dw1 |= GEN6_SF_POINT_SPRITE_LOWERLEFT;
dw10 = 0;
/* _NEW_LIGHT (flat shading) */
dw11 = 0;
if (ctx->Light.ShadeModel == GL_FLAT) {
dw11 |= ((brw->fragment_program->Base.InputsRead & (FRAG_BIT_COL0 | FRAG_BIT_COL1)) >>
((brw->fragment_program->Base.InputsRead & FRAG_BIT_WPOS) ? 0 : 1));
}
/* Create the mapping from the FS inputs we produce to the VS outputs
* they source from.
@ -92,6 +86,19 @@ upload_sbe_state(struct brw_context *brw)
if (attr == FRAG_ATTRIB_PNTC)
dw10 |= (1 << input_index);
/* flat shading */
if (ctx->Light.ShadeModel == GL_FLAT) {
/*
* Setup the Constant Interpolation Enable bit mask for each
* corresponding attribute(currently, we only care two attrs:
* FRAG_BIT_COL0 and FRAG_BIT_COL1).
*
* FIXME: should we care other attributes?
*/
if (attr == FRAG_ATTRIB_COL0 || attr == FRAG_ATTRIB_COL1)
dw11 |= (1 << input_index);
}
/* The hardware can only do the overrides on 16 overrides at a
* time, and the other up to 16 have to be lined up so that the
* input index = the output index. We'll need to do some