projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 4a1c15f8afc6950c1641b1a860dbafee32d4c587..680b818d2869632e02ee5e17da4af25e22a6fb9c 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810state.c
+++ b/src/mesa/drivers/dri/i810/i810state.c
@@ -5,7 +5,6 @@
 #include "glheader.h"
 #include "context.h"
 #include "macros.h"
-#include "enums.h"
 #include "dd.h"
 #include "colormac.h"
 
@@ -102,14 +101,23 @@ static void i810BlendFuncSeparate( GLcontext *ctx, GLenum sfactorRGB,
 
    switch (ctx->Color.BlendSrcRGB) {
    case GL_ZERO:                a |= SDM_SRC_ZERO; break;
-   case GL_SRC_ALPHA:           a |= SDM_SRC_SRC_ALPHA; break;
    case GL_ONE:                 a |= SDM_SRC_ONE; break;
-   case GL_DST_COLOR:           a |= SDM_SRC_DST_COLOR; break;
-   case GL_ONE_MINUS_DST_COLOR: a |= SDM_SRC_INV_DST_COLOR; break;
+   case GL_SRC_COLOR:           a |= SDM_SRC_SRC_COLOR; break;
+   case GL_ONE_MINUS_SRC_COLOR: a |= SDM_SRC_INV_SRC_COLOR; break;
+   case GL_SRC_ALPHA:           a |= SDM_SRC_SRC_ALPHA; break;
    case GL_ONE_MINUS_SRC_ALPHA: a |= SDM_SRC_INV_SRC_ALPHA; break;
    case GL_DST_ALPHA:           a |= SDM_SRC_ONE; break;
    case GL_ONE_MINUS_DST_ALPHA: a |= SDM_SRC_ZERO; break;
-   case GL_SRC_ALPHA_SATURATE:  /*a |= SDM_SRC_SRC_ALPHA; break;*/
+   case GL_DST_COLOR:           a |= SDM_SRC_DST_COLOR; break;
+   case GL_ONE_MINUS_DST_COLOR: a |= SDM_SRC_INV_DST_COLOR; break;
+
+   /* (f, f, f, 1), f = min(As, 1 - Ad) = min(As, 1 - 1) = 0
+    * So (f, f, f, 1) = (0, 0, 0, 1).  Since there is no destination alpha and
+    * the only supported alpha operation is GL_FUNC_ADD, the result modulating
+    * the source alpha with the alpha factor is largely irrelevant.
+    */
+   case GL_SRC_ALPHA_SATURATE:  a |= SDM_SRC_ZERO; break;
+
    case GL_CONSTANT_COLOR:
    case GL_ONE_MINUS_CONSTANT_COLOR:
    case GL_CONSTANT_ALPHA:
@@ -121,14 +129,17 @@ static void i810BlendFuncSeparate( GLcontext *ctx, GLenum sfactorRGB,
    }
 
    switch (ctx->Color.BlendDstRGB) {
-   case GL_SRC_ALPHA:           a |= SDM_DST_SRC_ALPHA; break;
-   case GL_ONE_MINUS_SRC_ALPHA: a |= SDM_DST_INV_SRC_ALPHA; break;
    case GL_ZERO:                a |= SDM_DST_ZERO; break;
    case GL_ONE:                 a |= SDM_DST_ONE; break;
    case GL_SRC_COLOR:           a |= SDM_DST_SRC_COLOR; break;
    case GL_ONE_MINUS_SRC_COLOR: a |= SDM_DST_INV_SRC_COLOR; break;
+   case GL_SRC_ALPHA:           a |= SDM_DST_SRC_ALPHA; break;
+   case GL_ONE_MINUS_SRC_ALPHA: a |= SDM_DST_INV_SRC_ALPHA; break;
    case GL_DST_ALPHA:           a |= SDM_DST_ONE; break;
    case GL_ONE_MINUS_DST_ALPHA: a |= SDM_DST_ZERO; break;
+   case GL_DST_COLOR:           a |= SDM_DST_DST_COLOR; break;
+   case GL_ONE_MINUS_DST_COLOR: a |= SDM_DST_INV_DST_COLOR; break;
+
    case GL_CONSTANT_COLOR:
    case GL_ONE_MINUS_CONSTANT_COLOR:
    case GL_CONSTANT_ALPHA:
@@ -284,11 +295,11 @@ void i810DrawBuffer(GLcontext *ctx, GLenum mode )
    /*
     * _DrawDestMask is easier to cope with than <mode>.
     */
-   switch ( ctx->Color._DrawDestMask ) {
-   case DD_FRONT_LEFT_BIT:
+   switch ( ctx->DrawBuffer->_ColorDrawBufferMask[0]) {
+   case BUFFER_BIT_FRONT_LEFT:
      front = 1;
      break;
-   case DD_BACK_LEFT_BIT:
+   case BUFFER_BIT_BACK_LEFT:
      front = 0;
      break;
    default:
@@ -316,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);
 }
 
 
@@ -591,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;
@@ -731,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 );
 
@@ -746,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 );
 
@@ -762,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 );
 
@@ -776,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 );
 
@@ -788,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 );
 
@@ -800,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 );
 
@@ -924,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);
    }