diff options
| author | Marek Olšák <maraeo@gmail.com> | 2013-03-28 01:50:21 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2013-04-06 23:57:04 +0200 |
| commit | 21d407c1b8bf3be1eff87121d528d03c240ce207 (patch) | |
| tree | 5909f109a8e529e2e2663b42a10e56a5aca848d1 /src/mesa/main/state.c | |
| parent | c4629ad3f9440ec7ad3d9f4881d0aba41a93f2f5 (diff) | |
| download | external_mesa3d-21d407c1b8bf3be1eff87121d528d03c240ce207.zip external_mesa3d-21d407c1b8bf3be1eff87121d528d03c240ce207.tar.gz external_mesa3d-21d407c1b8bf3be1eff87121d528d03c240ce207.tar.bz2 | |
mesa: refactor clamping controls, get rid of _ClampReadColor
v2: cosmetic changes from Brian's email
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index fb8b71c..c94a244 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -51,6 +51,7 @@ #include "texobj.h" #include "texstate.h" #include "varray.h" +#include "blend.h" static void @@ -313,11 +314,7 @@ update_multisample(struct gl_context *ctx) static void update_clamp_fragment_color(struct gl_context *ctx) { - if (ctx->Color.ClampFragmentColor == GL_FIXED_ONLY_ARB) - ctx->Color._ClampFragmentColor = - !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode; - else - ctx->Color._ClampFragmentColor = ctx->Color.ClampFragmentColor; + ctx->Color._ClampFragmentColor = _mesa_get_clamp_fragment_color(ctx); } @@ -327,28 +324,11 @@ update_clamp_fragment_color(struct gl_context *ctx) static void update_clamp_vertex_color(struct gl_context *ctx) { - if (ctx->Light.ClampVertexColor == GL_FIXED_ONLY_ARB) - ctx->Light._ClampVertexColor = - !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode; - else - ctx->Light._ClampVertexColor = ctx->Light.ClampVertexColor; + ctx->Light._ClampVertexColor = _mesa_get_clamp_vertex_color(ctx); } /** - * Update the ctx->Color._ClampReadColor field - */ -static void -update_clamp_read_color(struct gl_context *ctx) -{ - if (ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB) - ctx->Color._ClampReadColor = - !ctx->ReadBuffer || !ctx->ReadBuffer->Visual.floatMode; - else - ctx->Color._ClampReadColor = ctx->Color.ClampReadColor; -} - -/** * Update the ctx->VertexProgram._TwoSideEnabled flag. */ static void @@ -525,9 +505,6 @@ _mesa_update_state_locked( struct gl_context *ctx ) if (new_state & (_NEW_MULTISAMPLE | _NEW_BUFFERS)) update_multisample( ctx ); - if (new_state & (_NEW_COLOR | _NEW_BUFFERS)) - update_clamp_read_color(ctx); - if(new_state & (_NEW_FRAG_CLAMP | _NEW_BUFFERS)) update_clamp_fragment_color(ctx); |