diff options
| author | Eric Anholt <eric@anholt.net> | 2009-09-01 12:31:24 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-09-01 12:46:02 -0700 |
| commit | b134a727782a255529d093ee9b6da181719919fc (patch) | |
| tree | 8e140b97e5bc3a5d70c93c3c2a4169f3d5b74850 | |
| parent | 828476981083d0852f3dd02c11071ffb1ff9e33a (diff) | |
s3v: Fix driver build for ARB_sync.
This driver was including Xlibint.h to get the CARD32 typedef to use for
32-bit unsigned integers, which #defined Status to something. CARD32 isn't
actually a 32-bit unsigned integer, so replacing with uint32_t usage should
fix bugs on 64-bit along with the build.
| -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)); |