uint*t -> u_int*t changes

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_state.c

diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 519c707a5ab30c3ba68e260d3b8cf12e0ea7be32..4d9d92fdb66cbea555bb457cc99b26f29800d343 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -27,6 +27,7 @@
 
 #include "gamma_context.h"
 #include "gamma_macros.h"
+#include "buffers.h"
 #include "macros.h"
 #include "glint_dri.h"
 #include "colormac.h"
@@ -44,9 +45,9 @@
 static void gammaUpdateAlphaMode( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 a = gmesa->AlphaTestMode;
-   CARD32 b = gmesa->AlphaBlendMode;
-   CARD32 f = gmesa->AB_FBReadMode_Save = 0;
+   u_int32_t a = gmesa->AlphaTestMode;
+   u_int32_t b = gmesa->AlphaBlendMode;
+   u_int32_t f = gmesa->AB_FBReadMode_Save = 0;
    GLubyte refByte = (GLint) (ctx->Color.AlphaRef * 255.0);
 
    a &= ~(AT_CompareMask | AT_RefValueMask);
@@ -177,10 +178,12 @@ static void gammaDDAlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref )
    gmesa->new_state |= GAMMA_NEW_ALPHA;
 }
 
-static void gammaDDBlendEquation( GLcontext *ctx, GLenum mode )
+static void gammaDDBlendEquationSeparate( GLcontext *ctx, 
+                                         GLenum modeRGB, GLenum modeA )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
 
+   assert( modeRGB == modeA );
    FLUSH_BATCH( gmesa );
 
    gmesa->new_state |= GAMMA_NEW_ALPHA;
@@ -417,10 +420,10 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 static void gammaUpdateZMode( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 z = gmesa->DepthMode;
-   CARD32 delta = gmesa->DeltaMode;
-   CARD32 window = gmesa->Window;
-   CARD32 lbread = gmesa->LBReadMode;
+   u_int32_t z = gmesa->DepthMode;
+   u_int32_t delta = gmesa->DeltaMode;
+   u_int32_t window = gmesa->Window;
+   u_int32_t lbread = gmesa->LBReadMode;
 
    z &= ~DM_CompareMask;
 
@@ -536,9 +539,9 @@ static void gammaDDFlush( GLcontext *ctx )
 static void gammaUpdateFogAttrib( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 f = gmesa->FogMode;
-   CARD32 g = gmesa->GeometryMode;
-   CARD32 d = gmesa->DeltaMode;
+   u_int32_t f = gmesa->FogMode;
+   u_int32_t g = gmesa->GeometryMode;
+   u_int32_t d = gmesa->DeltaMode;
 
    if (ctx->Fog.Enabled) {
       f |= FogModeEnable;
@@ -580,6 +583,7 @@ static void gammaUpdateFogAttrib( GLcontext *ctx )
    }
 }
 
+#if 0
 static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
@@ -587,6 +591,7 @@ static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
    FLUSH_BATCH( gmesa );
    gmesa->new_state |= GAMMA_NEW_FOG;
 }
+#endif
 
 /* =============================================================
  * Lines
@@ -632,7 +637,7 @@ static void gammaDDPointSize( GLcontext *ctx, GLfloat size )
 static void gammaUpdatePolygon( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
+   u_int32_t g = gmesa->GeometryMode;
 
    g &= ~(GM_PolyOffsetFillEnable | GM_PolyOffsetPointEnable |
           GM_PolyOffsetLineEnable);
@@ -750,7 +755,7 @@ static void gammaDDScissor( GLcontext *ctx,
 static void gammaUpdateCull( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
+   u_int32_t g = gmesa->GeometryMode;
 
    g &= ~(GM_PolyCullMask | GM_FFMask);
 
@@ -970,8 +975,8 @@ static void gammaDDLightModelfv( GLcontext *ctx, GLenum pname,
 static void gammaDDShadeModel( GLcontext *ctx, GLenum mode )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
-   CARD32 c = gmesa->ColorDDAMode;
+   u_int32_t g = gmesa->GeometryMode;
+   u_int32_t c = gmesa->ColorDDAMode;
 
    g &= ~GM_ShadingMask;
    c &= ~ColorDDAShadingMask;
@@ -1094,6 +1099,8 @@ void gammaUpdateWindow( GLcontext *ctx )
 static void gammaDDViewport( GLcontext *ctx, GLint x, GLint y,
                            GLsizei width, GLsizei height )
 {
+   /* update size of Mesa/software ancillary buffers */
+   _mesa_ResizeBuffersMESA();
    gammaUpdateWindow( ctx );
 }
 
@@ -1238,7 +1245,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 
    case GL_DITHER:
       do {
-        CARD32 d = gmesa->DitherMode;
+        u_int32_t d = gmesa->DitherMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1270,7 +1277,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 #if ENABLELIGHTING
    case GL_LIGHTING:
       do {
-        CARD32 l = gmesa->LightingMode;
+        u_int32_t l = gmesa->LightingMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1288,7 +1295,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 
    case GL_COLOR_MATERIAL:
       do {
-        CARD32 m = gmesa->MaterialMode;
+        u_int32_t m = gmesa->MaterialMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1689,7 +1696,7 @@ void gammaDDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.ColorMask               = gammaDDColorMask;
 
    ctx->Driver.AlphaFunc               = gammaDDAlphaFunc;
-   ctx->Driver.BlendEquation           = gammaDDBlendEquation;
+   ctx->Driver.BlendEquationSeparate   = gammaDDBlendEquationSeparate;
    ctx->Driver.BlendFuncSeparate       = gammaDDBlendFuncSeparate;
    ctx->Driver.ClearDepth              = gammaDDClearDepth;
    ctx->Driver.CullFace                        = gammaDDCullFace;