dri: unify __DriverAPIRec

[mesa.git] / src / mesa / drivers / dri / intel / intel_pixel.c

diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c
index a30014165593439d1e203de686db399f6bb5a096..ae2ac0537d3322acbb0d66adf3a49a67f77f88ed 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_pixel.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel.c
@@ -29,14 +29,7 @@
 #include "main/state.h"
 #include "main/bufferobj.h"
 #include "main/context.h"
-#include "main/enable.h"
-#include "main/matrix.h"
-#include "main/texstate.h"
-#include "main/varray.h"
-#include "main/viewport.h"
 #include "swrast/swrast.h"
-#include "shader/arbprogram.h"
-#include "shader/program.h"
 
 #include "intel_context.h"
 #include "intel_pixel.h"
@@ -45,7 +38,7 @@
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 
 static GLenum
-effective_func(GLenum func, GLboolean src_alpha_is_one)
+effective_func(GLenum func, bool src_alpha_is_one)
 {
    if (src_alpha_is_one) {
       if (func == GL_SRC_ALPHA)
@@ -61,86 +54,72 @@ effective_func(GLenum func, GLboolean src_alpha_is_one)
  * Check if any fragment operations are in effect which might effect
  * glDraw/CopyPixels.
  */
-GLboolean
-intel_check_blit_fragment_ops(GLcontext * ctx, GLboolean src_alpha_is_one)
+bool
+intel_check_blit_fragment_ops(struct gl_context * ctx, bool src_alpha_is_one)
 {
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
    if (ctx->FragmentProgram._Enabled) {
       DBG("fallback due to fragment program\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Color.BlendEnabled &&
-       (effective_func(ctx->Color.BlendSrcRGB, src_alpha_is_one) != GL_ONE ||
-       effective_func(ctx->Color.BlendDstRGB, src_alpha_is_one) != GL_ZERO ||
-       ctx->Color.BlendEquationRGB != GL_FUNC_ADD ||
-       effective_func(ctx->Color.BlendSrcA, src_alpha_is_one) != GL_ONE ||
-       effective_func(ctx->Color.BlendDstA, src_alpha_is_one) != GL_ZERO ||
-       ctx->Color.BlendEquationA != GL_FUNC_ADD)) {
+       (effective_func(ctx->Color.Blend[0].SrcRGB, src_alpha_is_one) != GL_ONE ||
+       effective_func(ctx->Color.Blend[0].DstRGB, src_alpha_is_one) != GL_ZERO ||
+       ctx->Color.Blend[0].EquationRGB != GL_FUNC_ADD ||
+       effective_func(ctx->Color.Blend[0].SrcA, src_alpha_is_one) != GL_ONE ||
+       effective_func(ctx->Color.Blend[0].DstA, src_alpha_is_one) != GL_ZERO ||
+       ctx->Color.Blend[0].EquationA != GL_FUNC_ADD)) {
       DBG("fallback due to blend\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Texture._EnabledUnits) {
       DBG("fallback due to texturing\n");
-      return GL_FALSE;
+      return false;
    }
 
-   if (!(ctx->Color.ColorMask[0] &&
-        ctx->Color.ColorMask[1] &&
-        ctx->Color.ColorMask[2] &&
-        ctx->Color.ColorMask[3])) {
+   if (!(ctx->Color.ColorMask[0][0] &&
+        ctx->Color.ColorMask[0][1] &&
+        ctx->Color.ColorMask[0][2] &&
+        ctx->Color.ColorMask[0][3])) {
       DBG("fallback due to color masking\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Color.AlphaEnabled) {
       DBG("fallback due to alpha\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Depth.Test) {
       DBG("fallback due to depth test\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Fog.Enabled) {
       DBG("fallback due to fog\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->_ImageTransferState) {
       DBG("fallback due to image transfer\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->Stencil._Enabled) {
       DBG("fallback due to image stencil\n");
-      return GL_FALSE;
+      return false;
    }
 
    if (ctx->RenderMode != GL_RENDER) {
       DBG("fallback due to render mode\n");
-      return GL_FALSE;
+      return false;
    }
 
-   return GL_TRUE;
-}
-
-
-GLboolean
-intel_check_meta_tex_fragment_ops(GLcontext * ctx)
-{
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   /* Some of _ImageTransferState (scale, bias) could be done with
-    * fragment programs on i915.
-    */
-   return !(ctx->_ImageTransferState || ctx->Fog.Enabled ||     /* not done yet */
-            ctx->Texture._EnabledUnits || ctx->FragmentProgram._Enabled);
+   return true;
 }
 
 /* The intel_region struct doesn't really do enough to capture the
@@ -153,27 +132,26 @@ intel_check_meta_tex_fragment_ops(GLcontext * ctx)
  * \param format  as given to glDraw/ReadPixels
  * \param type  as given to glDraw/ReadPixels
  */
-GLboolean
+bool
 intel_check_blit_format(struct intel_region * region,
                         GLenum format, GLenum type)
 {
    if (region->cpp == 4 &&
        (type == GL_UNSIGNED_INT_8_8_8_8_REV ||
         type == GL_UNSIGNED_BYTE) && format == GL_BGRA) {
-      return GL_TRUE;
+      return true;
    }
 
    if (region->cpp == 2 &&
        type == GL_UNSIGNED_SHORT_5_6_5_REV && format == GL_BGR) {
-      return GL_TRUE;
+      return true;
    }
 
-   if (INTEL_DEBUG & DEBUG_PIXEL)
-      fprintf(stderr, "%s: bad format for blit (cpp %d, type %s format %s)\n",
-              __FUNCTION__, region->cpp,
-              _mesa_lookup_enum_by_nr(type), _mesa_lookup_enum_by_nr(format));
+   DBG("%s: bad format for blit (cpp %d, type %s format %s)\n",
+       __FUNCTION__, region->cpp,
+       _mesa_lookup_enum_by_nr(type), _mesa_lookup_enum_by_nr(format));
 
-   return GL_FALSE;
+   return false;
 }
 
 void