summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-08-26 18:05:53 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-09-05 18:01:36 +0200
commitde26f9e47e886e176aab6e5a2c3d4481efb64362 (patch)
treec576ed8b89dc87e9d5f750c4d33a18e0d57a7b20
parenta55ac3c300c189616627c05d924c40a8b55bfafa (diff)
mesa: restore color clamps on glPopAttrib
-rw-r--r--src/mesa/main/attrib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 8f92f089e7..2702105504 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1006,6 +1006,8 @@ _mesa_PopAttrib(void)
_mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
color->IndexLogicOpEnabled);
_mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
+ _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
+ _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
}
break;
case GL_CURRENT_BIT:
@@ -1128,6 +1130,7 @@ _mesa_PopAttrib(void)
/* materials */
memcpy(&ctx->Light.Material, &light->Material,
sizeof(struct gl_material));
+ _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
}
break;
case GL_LINE_BIT: