Minor r200 vertex program cleanups. Remove disabled leftovers from r300 vertex progra...

[mesa.git] / src / mesa / drivers / dri / i810 / i810state.c

diff --git a/src/mesa/drivers/dri/i810/i810state.c b/src/mesa/drivers/dri/i810/i810state.c
index 62dc819b32b78a8bf0942bfe2e463a86f548a98e..680b818d2869632e02ee5e17da4af25e22a6fb9c 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810state.c
+++ b/src/mesa/drivers/dri/i810/i810state.c
@@ -3,10 +3,8 @@
 #include <stdio.h>
 
 #include "glheader.h"
-#include "buffers.h"
 #include "context.h"
 #include "macros.h"
-#include "enums.h"
 #include "dd.h"
 #include "colormac.h"
 
@@ -329,11 +327,6 @@ void i810DrawBuffer(GLcontext *ctx, GLenum mode )
                                             imesa->i810Screen->backPitchBits);
      i810XMesaSetBackClipRects( imesa );
    }
-
-   /* We want to update the s/w rast state too so that r200SetBuffer()
-    * gets called.
-    */
-   _swrast_DrawBuffer(ctx, mode);
 }
 
 
@@ -604,6 +597,7 @@ static void i810Enable(GLcontext *ctx, GLenum cap, GLboolean state)
         imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
       break;
    case GL_TEXTURE_2D:
+   case GL_TEXTURE_RECTANGLE_NV:
       I810_STATECHANGE(imesa, I810_UPLOAD_CTX);
       if (ctx->Texture.CurrentUnit == 0) {
         imesa->Setup[I810_CTXREG_MT] &= ~MT_TEXEL0_ENABLE;
@@ -695,8 +689,6 @@ static void i810Viewport( GLcontext *ctx,
                          GLint x, GLint y,
                          GLsizei width, GLsizei height )
 {
-   /* update size of Mesa/software ancillary buffers */
-   _mesa_ResizeBuffersMESA();
    i810CalcViewport( ctx );
 }
 
@@ -746,13 +738,13 @@ void i810InitState( GLcontext *ctx )
                                     MC_UPDATE_DEST |
                                     MC_DEST_CURRENT |
                                     MC_UPDATE_ARG1 |
-                                    MC_ARG1_ITERATED_COLOR |
-                                    MC_ARG1_DONT_REPLICATE_ALPHA |
-                                    MC_ARG1_DONT_INVERT |
+                                    ((MC_ARG_ITERATED_COLOR |
+                                      MC_ARG_DONT_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG1_SHIFT) |
                                     MC_UPDATE_ARG2 |
-                                    MC_ARG2_ONE |
-                                    MC_ARG2_DONT_REPLICATE_ALPHA |
-                                    MC_ARG2_DONT_INVERT |
+                                    ((MC_ARG_ONE |
+                                      MC_ARG_DONT_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG2_SHIFT) |
                                     MC_UPDATE_OP |
                                     MC_OP_ARG1 );
 
@@ -761,13 +753,13 @@ void i810InitState( GLcontext *ctx )
                                     MC_UPDATE_DEST |
                                     MC_DEST_CURRENT |
                                     MC_UPDATE_ARG1 |
-                                    MC_ARG1_ONE |
-                                    MC_ARG1_DONT_REPLICATE_ALPHA |
-                                    MC_ARG1_DONT_INVERT |
+                                    ((MC_ARG_ONE |
+                                      MC_ARG_DONT_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG1_SHIFT) |
                                     MC_UPDATE_ARG2 |
-                                    MC_ARG2_ONE |
-                                    MC_ARG2_DONT_REPLICATE_ALPHA |
-                                    MC_ARG2_DONT_INVERT |
+                                    ((MC_ARG_ONE |
+                                      MC_ARG_DONT_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG2_SHIFT) |
                                     MC_UPDATE_OP |
                                     MC_OP_DISABLE );
 
@@ -777,13 +769,13 @@ void i810InitState( GLcontext *ctx )
                                     MC_UPDATE_DEST |
                                     MC_DEST_CURRENT |
                                     MC_UPDATE_ARG1 |
-                                    MC_ARG1_CURRENT_COLOR |
-                                    MC_ARG1_REPLICATE_ALPHA |
-                                    MC_ARG1_DONT_INVERT |
+                                    ((MC_ARG_CURRENT_COLOR |
+                                      MC_ARG_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG1_SHIFT) |
                                     MC_UPDATE_ARG2 |
-                                    MC_ARG2_ONE |
-                                    MC_ARG2_DONT_REPLICATE_ALPHA |
-                                    MC_ARG2_DONT_INVERT |
+                                    ((MC_ARG_ONE |
+                                      MC_ARG_DONT_REPLICATE_ALPHA |
+                                      MC_ARG_DONT_INVERT) << MC_ARG2_SHIFT) |
                                     MC_UPDATE_OP |
                                     MC_OP_DISABLE );
 
@@ -791,11 +783,11 @@ void i810InitState( GLcontext *ctx )
    imesa->Setup[I810_CTXREG_MA0] = ( GFX_OP_MAP_ALPHA_STAGES |
                                     MA_STAGE_0 |
                                     MA_UPDATE_ARG1 |
-                                    MA_ARG1_ITERATED_ALPHA |
-                                    MA_ARG1_DONT_INVERT |
+                                    ((MA_ARG_ITERATED_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG1_SHIFT) |
                                     MA_UPDATE_ARG2 |
-                                    MA_ARG2_CURRENT_ALPHA |
-                                    MA_ARG2_DONT_INVERT |
+                                    ((MA_ARG_CURRENT_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG2_SHIFT) |
                                     MA_UPDATE_OP |
                                     MA_OP_ARG1 );
 
@@ -803,11 +795,11 @@ void i810InitState( GLcontext *ctx )
    imesa->Setup[I810_CTXREG_MA1] = ( GFX_OP_MAP_ALPHA_STAGES |
                                     MA_STAGE_1 |
                                     MA_UPDATE_ARG1 |
-                                    MA_ARG1_CURRENT_ALPHA |
-                                    MA_ARG1_DONT_INVERT |
+                                    ((MA_ARG_CURRENT_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG1_SHIFT) |
                                     MA_UPDATE_ARG2 |
-                                    MA_ARG2_CURRENT_ALPHA |
-                                    MA_ARG2_DONT_INVERT |
+                                    ((MA_ARG_CURRENT_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG2_SHIFT) |
                                     MA_UPDATE_OP |
                                     MA_OP_ARG1 );
 
@@ -815,11 +807,11 @@ void i810InitState( GLcontext *ctx )
    imesa->Setup[I810_CTXREG_MA2] = ( GFX_OP_MAP_ALPHA_STAGES |
                                     MA_STAGE_2 |
                                     MA_UPDATE_ARG1 |
-                                    MA_ARG1_CURRENT_ALPHA |
-                                    MA_ARG1_DONT_INVERT |
+                                    ((MA_ARG_CURRENT_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG1_SHIFT) |
                                     MA_UPDATE_ARG2 |
-                                    MA_ARG2_CURRENT_ALPHA |
-                                    MA_ARG2_DONT_INVERT |
+                                    ((MA_ARG_CURRENT_ALPHA |
+                                      MA_ARG_DONT_INVERT) << MA_ARG2_SHIFT) |
                                     MA_UPDATE_OP |
                                     MA_OP_ARG1 );
 
@@ -939,14 +931,10 @@ void i810InitState( GLcontext *ctx )
 
    if (imesa->glCtx->Visual.doubleBufferMode && imesa->sarea->pf_current_page == 0) {
       /* use back buffer by default */
-      imesa->drawMap = i810Screen->back.map;
-      imesa->readMap = i810Screen->back.map;
       imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->backOffset |
                                              i810Screen->backPitchBits);
    } else {
       /* use front buffer by default */
-      imesa->drawMap = (char *)imesa->driScreen->pFB;
-      imesa->readMap = (char *)imesa->driScreen->pFB;
       imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->fbOffset |
                                              i810Screen->backPitchBits);
    }