diff options
| author | Brian Paul <[email protected]> | 2011-09-17 16:12:27 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-09-20 20:17:41 -0600 |
| commit | 8530d72c4e6ca8b8c741554ac446dd2ba8150e2e (patch) | |
| tree | dd1ac1bfe7ae84310b46aee87367eec0ddedbc10 | |
| parent | d71c03836e7c42bb42879ed7aa6a5cdbb19cd589 (diff) | |
r200: use _mesa_unclamped_float_rgba_to_ubyte()
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tex.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index b3755d8ddfe..03b4cc18bf7 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -414,7 +414,7 @@ static void r200Fogfv( struct gl_context *ctx, GLenum pname, const GLfloat *para { r200ContextPtr rmesa = R200_CONTEXT(ctx); union { int i; float f; } c, d; - GLchan col[4]; + GLubyte col[4]; GLuint i; c.i = rmesa->hw.fog.cmd[FOG_C]; @@ -480,7 +480,7 @@ static void r200Fogfv( struct gl_context *ctx, GLenum pname, const GLfloat *para break; case GL_FOG_COLOR: R200_STATECHANGE( rmesa, ctx ); - UNCLAMPED_FLOAT_TO_RGB_CHAN( col, ctx->Fog.Color ); + _mesa_unclamped_float_rgba_to_ubyte(col, ctx->Fog.Color ); i = radeonPackColor( 4, col[0], col[1], col[2], 0 ); rmesa->hw.ctx.cmd[CTX_PP_FOG_COLOR] &= ~R200_FOG_COLOR_MASK; rmesa->hw.ctx.cmd[CTX_PP_FOG_COLOR] |= i; diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index 7f26bfa2a29..27a7618b32b 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -313,7 +313,7 @@ static void r200TexEnv( struct gl_context *ctx, GLenum target, case GL_TEXTURE_ENV_COLOR: { GLubyte c[4]; GLuint envColor; - UNCLAMPED_FLOAT_TO_RGBA_CHAN( c, texUnit->EnvColor ); + _mesa_unclamped_float_rgba_to_ubyte(c, texUnit->EnvColor); envColor = radeonPackColor( 4, c[0], c[1], c[2], c[3] ); if ( rmesa->hw.tf.cmd[TF_TFACTOR_0 + unit] != envColor ) { R200_STATECHANGE( rmesa, tf ); |