draw: corrections to allow for different cliptest cases
[mesa.git] / src / mesa / drivers / dri / intel / intel_pixel_bitmap.c
index 85e5ad2cdd4588bdebcb3ea9efcf61ae6ccbd9bd..23410f063c47ebaf10752696cebb4ee5a462633b 100644 (file)
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/bufferobj.h"
-#include "main/polygon.h"
-#include "main/pixelstore.h"
-#include "main/polygon.h"
 #include "main/state.h"
-#include "main/teximage.h"
-#include "main/texenv.h"
 #include "main/texobj.h"
-#include "main/texstate.h"
-#include "main/texparam.h"
-#include "main/varray.h"
-#include "main/attrib.h"
-#include "main/enable.h"
-#include "main/viewport.h"
-#include "shader/arbprogram.h"
-#include "glapi/dispatch.h"
+#include "main/context.h"
 #include "swrast/swrast.h"
+#include "drivers/common/meta.h"
 
 #include "intel_screen.h"
 #include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_blit.h"
 #include "intel_regions.h"
-#include "intel_buffer_objects.h"
 #include "intel_buffers.h"
 #include "intel_pixel.h"
 #include "intel_reg.h"
@@ -106,7 +94,7 @@ static void set_bit( GLubyte *dest, GLuint bit )
 }
 
 /* Extract a rectangle's worth of data from the bitmap.  Called
- * per-cliprect.
+ * per chunk of HW-sized bitmap.
  */
 static GLuint get_bitmap_rect(GLsizei width, GLsizei height,
                              const struct gl_pixelstore_attrib *unpack,
@@ -126,7 +114,7 @@ static GLuint get_bitmap_rect(GLsizei width, GLsizei height,
    GLuint count = 0;
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s %d,%d %dx%d bitmap %dx%d skip %d src_offset %d mask %d\n",
+      printf("%s %d,%d %dx%d bitmap %dx%d skip %d src_offset %d mask %d\n",
                   __FUNCTION__, x,y,w,h,width,height,unpack->SkipPixels, src_offset, mask);
 
    if (invert) {
@@ -191,11 +179,12 @@ do_blit_bitmap( GLcontext *ctx,
    GLfloat tmpColor[4];
    GLubyte ubcolor[4];
    GLuint color;
-   unsigned int num_cliprects;
-   drm_clip_rect_t *cliprects;
-   int x_off, y_off;
    GLsizei bitmap_width = width;
    GLsizei bitmap_height = height;
+   GLint px, py;
+   GLuint stipple[32];
+   GLint orig_dstx = dstx;
+   GLint orig_dsty = dsty;
 
    /* Update draw buffer bounds */
    _mesa_update_state(ctx);
@@ -236,90 +225,62 @@ do_blit_bitmap( GLcontext *ctx,
    if (!intel_check_blit_fragment_ops(ctx, tmpColor[3] == 1.0F))
       return GL_FALSE;
 
-   intel_get_cliprects(intel, &cliprects, &num_cliprects, &x_off, &y_off);
-   if (num_cliprects != 0) {
-      GLuint i;
-      GLint orig_dstx = dstx;
-      GLint orig_dsty = dsty;
-
-      /* Clip to buffer bounds and scissor. */
-      if (!_mesa_clip_to_region(fb->_Xmin, fb->_Ymin,
-                               fb->_Xmax, fb->_Ymax,
-                               &dstx, &dsty, &width, &height))
-            goto out;
-
-      dstx = x_off + dstx;
-      dsty = y_off + y_flip(fb, dsty, height);
-
-      for (i = 0; i < num_cliprects; i++) {
-        int box_x, box_y, box_w, box_h;
-        GLint px, py;
-        GLuint stipple[32];  
-
-        box_x = dstx;
-        box_y = dsty;
-        box_w = width;
-        box_h = height;
-
-        /* Clip to drawable cliprect */
-         if (!_mesa_clip_to_region(cliprects[i].x1,
-                                  cliprects[i].y1,
-                                  cliprects[i].x2,
-                                  cliprects[i].y2,
-                                  &box_x, &box_y, &box_w, &box_h))
-           continue;
+   intel_prepare_render(intel);
+
+   /* Clip to buffer bounds and scissor. */
+   if (!_mesa_clip_to_region(fb->_Xmin, fb->_Ymin,
+                            fb->_Xmax, fb->_Ymax,
+                            &dstx, &dsty, &width, &height))
+      goto out;
+
+   dsty = y_flip(fb, dsty, height);
 
 #define DY 32
 #define DX 32
 
-        /* Then, finally, chop it all into chunks that can be
-         * digested by hardware:
+   /* Chop it all into chunks that can be digested by hardware: */
+   for (py = 0; py < height; py += DY) {
+      for (px = 0; px < width; px += DX) {
+        int h = MIN2(DY, height - py);
+        int w = MIN2(DX, width - px);
+        GLuint sz = ALIGN(ALIGN(w,8) * h, 64)/8;
+        GLenum logic_op = ctx->Color.ColorLogicOpEnabled ?
+           ctx->Color.LogicOp : GL_COPY;
+
+        assert(sz <= sizeof(stipple));
+        memset(stipple, 0, sz);
+
+        /* May need to adjust this when padding has been introduced in
+         * sz above:
+         *
+         * Have to translate destination coordinates back into source
+         * coordinates.
          */
-        for (py = 0; py < box_h; py += DY) { 
-           for (px = 0; px < box_w; px += DX) { 
-              int h = MIN2(DY, box_h - py);
-              int w = MIN2(DX, box_w - px); 
-              GLuint sz = ALIGN(ALIGN(w,8) * h, 64)/8;
-              GLenum logic_op = ctx->Color.ColorLogicOpEnabled ?
-                 ctx->Color.LogicOp : GL_COPY;
-
-              assert(sz <= sizeof(stipple));
-              memset(stipple, 0, sz);
-
-              /* May need to adjust this when padding has been introduced in
-               * sz above:
-               *
-               * Have to translate destination coordinates back into source
-               * coordinates.
-               */
-              if (get_bitmap_rect(bitmap_width, bitmap_height, unpack,
-                                  bitmap,
-                                  -orig_dstx + (box_x + px - x_off),
-                                  -orig_dsty + y_flip(fb,
-                                                      box_y + py - y_off, h),
-                                  w, h,
-                                  (GLubyte *)stipple,
-                                  8,
-                                  fb->Name == 0 ? GL_TRUE : GL_FALSE) == 0)
-                 continue;
-
-              if (!intelEmitImmediateColorExpandBlit(intel,
-                                                     dst->cpp,
-                                                     (GLubyte *)stipple,
-                                                     sz,
-                                                     color,
-                                                     dst->pitch,
-                                                     dst->buffer,
-                                                     0,
-                                                     dst->tiling,
-                                                     box_x + px,
-                                                     box_y + py,
-                                                     w, h,
-                                                     logic_op)) {
-                 return GL_FALSE;
-              }
-           } 
-        } 
+        if (get_bitmap_rect(bitmap_width, bitmap_height, unpack,
+                            bitmap,
+                            -orig_dstx + (dstx + px),
+                            -orig_dsty + y_flip(fb, dsty + py, h),
+                            w, h,
+                            (GLubyte *)stipple,
+                            8,
+                            fb->Name == 0 ? GL_TRUE : GL_FALSE) == 0)
+           continue;
+
+        if (!intelEmitImmediateColorExpandBlit(intel,
+                                               dst->cpp,
+                                               (GLubyte *)stipple,
+                                               sz,
+                                               color,
+                                               dst->pitch,
+                                               dst->buffer,
+                                               0,
+                                               dst->tiling,
+                                               dstx + px,
+                                               dsty + py,
+                                               w, h,
+                                               logic_op)) {
+           return GL_FALSE;
+        }
       }
    }
 out:
@@ -338,178 +299,6 @@ out:
    return GL_TRUE;
 }
 
-static GLboolean
-intel_texture_bitmap(GLcontext * ctx,
-                    GLint dst_x, GLint dst_y,
-                    GLsizei width, GLsizei height,
-                    const struct gl_pixelstore_attrib *unpack,
-                    const GLubyte *bitmap)
-{
-   struct intel_context *intel = intel_context(ctx);
-   static const char *fp =
-      "!!ARBfp1.0\n"
-      "TEMP val;\n"
-      "PARAM color=program.local[0];\n"
-      "TEX val, fragment.texcoord[0], texture[0], 2D;\n"
-      "ADD val, val.wwww, {-.5, -.5, -.5, -.5};\n"
-      "KIL val;\n"
-      "MOV result.color, color;\n"
-      "END\n";
-   GLuint texname;
-   GLfloat vertices[4][4];
-   GLint old_active_texture;
-   GLubyte *a8_bitmap;
-   GLfloat dst_z;
-
-   /* We need a fragment program for the KIL effect */
-   if (!ctx->Extensions.ARB_fragment_program ||
-       !ctx->Extensions.ARB_vertex_program) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr,
-                "glBitmap fallback: No fragment/vertex program support\n");
-      return GL_FALSE;
-   }
-
-   /* We're going to mess with texturing with no regard to existing texture
-    * state, so if there is some set up we have to bail.
-    */
-   if (ctx->Texture._EnabledUnits != 0) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr, "glBitmap fallback: texturing enabled\n");
-      return GL_FALSE;
-   }
-
-   /* Can't do textured DrawPixels with a fragment program, unless we were
-    * to generate a new program that sampled our texture and put the results
-    * in the fragment color before the user's program started.
-    */
-   if (ctx->FragmentProgram.Enabled) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr, "glBitmap fallback: fragment program enabled\n");
-      return GL_FALSE;
-   }
-
-   if (ctx->VertexProgram.Enabled) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr, "glBitmap fallback: vertex program enabled\n");
-      return GL_FALSE;
-   }
-
-   if (!ctx->Extensions.ARB_texture_non_power_of_two &&
-       (!is_power_of_two(width) || !is_power_of_two(height))) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr,
-                "glBitmap() fallback: NPOT texture\n");
-      return GL_FALSE;
-   }
-
-   if (ctx->Fog.Enabled) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr, "glBitmap() fallback: fog\n");
-      return GL_FALSE;
-   }
-
-   /* Check that we can load in a texture this big. */
-   if (width > (1 << (ctx->Const.MaxTextureLevels - 1)) ||
-       height > (1 << (ctx->Const.MaxTextureLevels - 1))) {
-      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-        fprintf(stderr, "glBitmap fallback: bitmap too large (%dx%d)\n",
-                width, height);
-      return GL_FALSE;
-   }
-
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      bitmap = map_pbo(ctx, width, height, unpack, bitmap);
-      if (bitmap == NULL)
-        return GL_TRUE;        /* even though this is an error, we're done */
-   }
-
-   /* Convert the A1 bitmap to an A8 format suitable for glTexImage */
-   a8_bitmap = _mesa_calloc(width * height);
-   _mesa_expand_bitmap(width, height, unpack, bitmap, a8_bitmap, width, 0xff);
-
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* done with PBO so unmap it now */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
-
-   /* Save GL state before we start setting up our drawing */
-   _mesa_PushAttrib(GL_ENABLE_BIT | GL_CURRENT_BIT | GL_POLYGON_BIT |
-                    GL_TEXTURE_BIT | GL_VIEWPORT_BIT);
-   _mesa_PushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT |
-                         GL_CLIENT_PIXEL_STORE_BIT);
-   old_active_texture = ctx->Texture.CurrentUnit;
-
-   _mesa_Disable(GL_POLYGON_STIPPLE);
-   _mesa_PolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-
-   /* Upload our bitmap data to an alpha texture */
-   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB);
-   _mesa_Enable(GL_TEXTURE_2D);
-   _mesa_GenTextures(1, &texname);
-   _mesa_BindTexture(GL_TEXTURE_2D, texname);
-   _mesa_TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   _mesa_TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-   _mesa_PixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
-   _mesa_PixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
-   _mesa_PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-   _mesa_PixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-   _mesa_PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-   _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   _mesa_TexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0,
-                   GL_ALPHA, GL_UNSIGNED_BYTE, a8_bitmap);
-   _mesa_free(a8_bitmap);
-
-   meta_set_fragment_program(&intel->meta, &intel->meta.bitmap_fp, fp);
-   _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0,
-                                    ctx->Current.RasterColor);
-   meta_set_passthrough_vertex_program(&intel->meta);
-   meta_set_passthrough_transform(&intel->meta);
-
-   /* convert rasterpos Z from [0,1] to NDC coord in [-1,1] */
-   dst_z = -1.0 + 2.0 * ctx->Current.RasterPos[2];
-
-   /* RasterPos[2] already takes into account the DepthRange mapping. */
-   _mesa_DepthRange(0.0, 1.0);
-
-   vertices[0][0] = dst_x;
-   vertices[0][1] = dst_y;
-   vertices[0][2] = dst_z;
-   vertices[0][3] = 1.0;
-   vertices[1][0] = dst_x + width;
-   vertices[1][1] = dst_y;
-   vertices[1][2] = dst_z;
-   vertices[1][3] = 1.0;
-   vertices[2][0] = dst_x + width;
-   vertices[2][1] = dst_y + height;
-   vertices[2][2] = dst_z;
-   vertices[2][3] = 1.0;
-   vertices[3][0] = dst_x;
-   vertices[3][1] = dst_y + height;
-   vertices[3][2] = dst_z;
-   vertices[3][3] = 1.0;
-
-   _mesa_VertexPointer(4, GL_FLOAT, 4 * sizeof(GLfloat), &vertices);
-   _mesa_Enable(GL_VERTEX_ARRAY);
-   meta_set_default_texrect(&intel->meta);
-   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-   meta_restore_texcoords(&intel->meta);
-   meta_restore_transform(&intel->meta);
-   meta_restore_fragment_program(&intel->meta);
-   meta_restore_vertex_program(&intel->meta);
-
-   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + old_active_texture);
-   _mesa_PopClientAttrib();
-   _mesa_PopAttrib();
-
-   _mesa_DeleteTextures(1, &texname);
-
-   return GL_TRUE;
-}
-
 /* There are a large number of possible ways to implement bitmap on
  * this hardware, most of them have some sort of drawback.  Here are a
  * few that spring to mind:
@@ -537,16 +326,15 @@ intelBitmap(GLcontext * ctx,
            const struct gl_pixelstore_attrib *unpack,
            const GLubyte * pixels)
 {
+   struct intel_context *intel = intel_context(ctx);
+
    if (do_blit_bitmap(ctx, x, y, width, height,
                           unpack, pixels))
       return;
 
-   if (intel_texture_bitmap(ctx, x, y, width, height,
-                           unpack, pixels))
-      return;
-
-   if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s: fallback to swrast\n", __FUNCTION__);
+   /* FIXME */
+   if (intel->gen == 6)
+       return _swrast_Bitmap(ctx, x, y, width, height, unpack, pixels);
 
-   _swrast_Bitmap(ctx, x, y, width, height, unpack, pixels);
+   _mesa_meta_Bitmap(ctx, x, y, width, height, unpack, pixels);
 }