aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/state.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
commit5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch)
treeb7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/main/state.c
parent97f357506241a5314de9071befcd01be731f1dbb (diff)
parent0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff)
downloadvcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/state.c')
-rw-r--r--mesalib/src/mesa/main/state.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index 457a730de..9d9c952dc 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -407,19 +407,6 @@ update_multisample(struct gl_context *ctx)
/**
- * Update derived color/blend/logicop state.
- */
-static void
-update_color(struct gl_context *ctx)
-{
- /* This is needed to support 1.1's RGB logic ops AND
- * 1.0's blending logicops.
- */
- ctx->Color._LogicOpEnabled = _mesa_rgba_logicop_enabled(ctx);
-}
-
-
-/**
* Update the ctx->Color._ClampFragmentColor field
*/
static void
@@ -634,9 +621,6 @@ _mesa_update_state_locked( struct gl_context *ctx )
if (new_state & (_NEW_MULTISAMPLE | _NEW_BUFFERS))
update_multisample( ctx );
- if (new_state & _NEW_COLOR)
- update_color( ctx );
-
if (new_state & (_NEW_COLOR | _NEW_BUFFERS))
update_clamp_read_color(ctx);