fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 23:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix bug with emitting spec/fog report by Eric Anholt, this isn't the prettiest

Browse source 
fix but it does work
This commit is contained in:
Dave Airlie 2004-06-09 02:29:22 +00:00
parent 0590895ea7
commit 37a94995cf
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/drivers/dri/i830/i830_tris.c
View file

@ -731,6 +731,7 @@ static void i830RenderStart( GLcontext *ctx )
GLuint index = tnl->render_inputs;
GLuint v0 = STATE3D_VERTEX_FORMAT_CMD;
GLuint v2 = STATE3D_VERTEX_FORMAT_2_CMD;
GLuint force_emit = 0;
/* Important:
*/
@ -750,15 +751,31 @@ static void i830RenderStart( GLcontext *ctx )
EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, VRTX_HAS_DIFFUSE );
if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) {
if (index & _TNL_BIT_COLOR1)
EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, VRTX_HAS_SPEC );
else
EMIT_PAD( 3 );
if (index & _TNL_BIT_FOG)
EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1UB_1F, VRTX_HAS_SPEC );
if (index & _TNL_BIT_COLOR1)
{
if (imesa->vertex_attrs[imesa->vertex_attr_count].format != EMIT_3UB_3F_BGR)
force_emit=1;
EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, VRTX_HAS_SPEC );
}
else
{
if (imesa->vertex_attrs[imesa->vertex_attr_count].format != EMIT_PAD)
force_emit=1;
EMIT_PAD( 3 );
}
if (index & _TNL_BIT_FOG)
{
if (imesa->vertex_attrs[imesa->vertex_attr_count].format != EMIT_1UB_1F)
force_emit=1;
EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1UB_1F, VRTX_HAS_SPEC );
}
else
{
if (imesa->vertex_attrs[imesa->vertex_attr_count].format != EMIT_PAD)
force_emit=1;
EMIT_PAD( 1 );
}
}
if (index & _TNL_BITS_TEX_ANY) {
@ -807,7 +824,8 @@ static void i830RenderStart( GLcontext *ctx )
* statechange to a new hardware vertex format:
*/
if (v0 != imesa->Setup[I830_CTXREG_VF] ||
v2 != imesa->Setup[I830_CTXREG_VF2] ) {
v2 != imesa->Setup[I830_CTXREG_VF2] ||
force_emit == 1) {
I830_STATECHANGE( imesa, I830_UPLOAD_CTX );