diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
| commit | e2ba90a9cc762cf00a168f0a59d31e7dc52fc42e (patch) | |
| tree | fe3206d7602ad935296884742980f3c4d30bd867 /src/mesa/drivers/dri/s3v/s3v_state.c | |
| parent | 11a4292d4eb515813b82b8d688a318adef66b3e6 (diff) | |
| parent | b4b8800315637d9218a81c76f09df7d601710d29 (diff) | |
Merge commit 'eee/mesa-es' into android
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_state.c b/src/mesa/drivers/dri/s3v/s3v_state.c index c71c89a3e1..561f42c705 100644 --- a/src/mesa/drivers/dri/s3v/s3v_state.c +++ b/src/mesa/drivers/dri/s3v/s3v_state.c @@ -2,7 +2,6 @@ * Author: Max Lingua <sunmax@libero.it> */ -#include <X11/Xlibint.h> #include "s3v_context.h" #include "s3v_macros.h" #include "s3v_dri.h" @@ -24,7 +23,7 @@ static void s3vUpdateAlphaMode( GLcontext *ctx ) { s3vContextPtr vmesa = S3V_CONTEXT(ctx); - CARD32 cmd = vmesa->CMD; + uint32_t cmd = vmesa->CMD; cmd &= ~ALPHA_BLEND_MASK; if ( ctx->Color.BlendEnabled ) { @@ -173,7 +172,7 @@ static void s3vDDClear( GLcontext *ctx, GLbitfield mask ) static void s3vUpdateZMode( GLcontext *ctx ) { s3vContextPtr vmesa = S3V_CONTEXT(ctx); - CARD32 cmd = vmesa->CMD; + uint32_t cmd = vmesa->CMD; DEBUG(("Depth.Test = %i\n", ctx->Depth.Test)); DEBUG(("CMD was = 0x%x ", cmd)); |