projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Consolidate texObj->Pos/Neg/X/Y/Z and texObj->Image into a single
[mesa.git] / src / mesa / swrast / s_drawpix.c
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index a69f3cc3c95bd9e155fb11c626a5db91d0dc61ad..5d4093f32c003fb93b93119e5e444720d4778f70 100644 (file)
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,5 +1,3 @@
-/* $Id: s_drawpix.c,v 1.44 2003/01/16 18:57:44 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  5.1
@@ -31,7 +29,6 @@
 #include "image.h"
 #include "macros.h"
 #include "imports.h"
-#include "mmath.h"
 #include "pixel.h"
 
 #include "s_context.h"
@@ -51,7 +48,7 @@
  *          GL_FALSE if image was completely clipped away (draw nothing)
  */
 GLboolean
-_mesa_clip_pixelrect(const GLcontext *ctx,
+_swrast_clip_pixelrect(const GLcontext *ctx,
                      GLint *destX, GLint *destY,
                      GLsizei *width, GLsizei *height,
                      GLint *skipPixels, GLint *skipRows)
@@ -109,14 +106,14 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
    }
 
    if (ctx->Depth.Test)
-      _mesa_span_default_z(ctx, &span);
+      _swrast_span_default_z(ctx, &span);
    if (ctx->Fog.Enabled)
-      _mesa_span_default_fog(ctx, &span);
-   if (ctx->Texture._EnabledUnits)
-      _mesa_span_default_texcoords(ctx, &span);
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
 
    if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
-       && ctx->Texture._EnabledUnits == 0
+       && ctx->Texture._EnabledCoordUnits == 0
        && unpack->Alignment == 1
        && !unpack->SwapBytes
        && !unpack->LsbFirst) {
@@ -128,7 +125,6 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
       GLint skipPixels = unpack->SkipPixels;
       GLint skipRows = unpack->SkipRows;
       GLint rowLength;
-      GLdepth zSpan[MAX_WIDTH];  /* only used when zooming */
       GLint zoomY0 = 0;
 
       if (unpack->RowLength > 0)
@@ -137,7 +133,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
          rowLength = width;
 
       /* If we're not using pixel zoom then do all clipping calculations
-       * now.  Otherwise, we'll let the _mesa_write_zoomed_*_span() functions
+       * now.  Otherwise, we'll let the _swrast_write_zoomed_*_span() functions
        * handle the clipping.
        */
       if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
@@ -188,13 +184,8 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
             return GL_TRUE;
       }
       else {
-         /* setup array of fragment Z value to pass to zoom function */
-         GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->DepthMaxF);
-         GLint i;
          if (drawWidth > MAX_WIDTH)
             return GL_FALSE; /* fall back to general case path */
-         for (i=0; i<drawWidth; i++)
-            zSpan[i] = z;
 
          /* save Y value of first row */
          zoomY0 = IROUND(ctx->Current.RasterPos[1]);
@@ -241,7 +232,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
                   span.x = destX;
                   span.y = destY;
                   span.end = drawWidth;
-                  _mesa_write_zoomed_rgba_span(ctx, &span,
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
                                         (CONST GLchan (*)[4]) src, zoomY0, 0);
                   src += rowLength * 4;
                   destY++;
@@ -281,7 +272,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
                   span.x = destX;
                   span.y = destY;
                   span.end = drawWidth;
-                  _mesa_write_zoomed_rgb_span(ctx, &span, 
+                  _swrast_write_zoomed_rgb_span(ctx, &span, 
                                          (CONST GLchan (*)[3]) src, zoomY0, 0);
                   src += rowLength * 3;
                   destY++;
@@ -343,7 +334,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
                   span.x = destX;
                   span.y = destY;
                   span.end = drawWidth;
-                  _mesa_write_zoomed_rgb_span(ctx, &span,
+                  _swrast_write_zoomed_rgb_span(ctx, &span,
                              (CONST GLchan (*)[3]) span.array->rgb, zoomY0, 0);
                   src += rowLength;
                   destY++;
@@ -411,7 +402,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
                   span.x = destX;
                   span.y = destY;
                   span.end = drawWidth;
-                  _mesa_write_zoomed_rgba_span(ctx, &span,
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
                             (CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
                   src += rowLength*2;
                   destY++;
@@ -459,7 +450,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
                   span.x = destX;
                   span.y = destY;
                   span.end = drawWidth;
-                  _mesa_write_zoomed_rgba_span(ctx, &span,
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
                             (CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
                   src += rowLength;
                   destY++;
@@ -513,9 +504,9 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
    INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
 
    if (ctx->Depth.Test)
-      _mesa_span_default_z(ctx, &span);
+      _swrast_span_default_z(ctx, &span);
    if (ctx->Fog.Enabled)
-      _mesa_span_default_fog(ctx, &span);
+      _swrast_span_default_fog(ctx, &span);
 
    /*
     * General solution
@@ -542,9 +533,9 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
          span.end = spanEnd;
          
          if (zoom)
-            _mesa_write_zoomed_index_span(ctx, &span, y, skipPixels);
+            _swrast_write_zoomed_index_span(ctx, &span, y, skipPixels);
          else
-            _mesa_write_index_span(ctx, &span);
+            _swrast_write_index_span(ctx, &span);
       }
       skipPixels += spanEnd;
    }
@@ -608,11 +599,11 @@ draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y,
          }
 
          if (zoom) {
-            _mesa_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
+            _swrast_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
                                             spanX, spanY, values, desty, 0);
          }
          else {
-            _mesa_write_stencil_span(ctx, (GLuint) spanWidth,
+            _swrast_write_stencil_span(ctx, (GLuint) spanWidth,
                                      spanX, spanY, values);
          }
       }
@@ -630,7 +621,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
                    GLenum type, const GLvoid *pixels )
 {
    const GLboolean bias_or_scale = ctx->Pixel.DepthBias!=0.0 || ctx->Pixel.DepthScale!=1.0;
-   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
    const GLint desty = y;
    struct sw_span span;
 
@@ -647,12 +638,12 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
       return;
    }
 
-   _mesa_span_default_color(ctx, &span);
+   _swrast_span_default_color(ctx, &span);
 
    if (ctx->Fog.Enabled)
-      _mesa_span_default_fog(ctx, &span);
-   if (ctx->Texture._EnabledUnits)
-      _mesa_span_default_texcoords(ctx, &span);
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
 
    if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
        && !bias_or_scale && !zoom && ctx->Visual.rgbMode
@@ -669,7 +660,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
          GLint i;
          for (i = 0; i < width; i++)
             span.array->z[i] = zptr[i];
-         _mesa_write_rgba_span(ctx, &span);
+         _swrast_write_rgba_span(ctx, &span);
       }
    }
    else if (type == GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
@@ -685,7 +676,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
             _mesa_image_address(&ctx->Unpack, pixels, width, height,
                                 GL_DEPTH_COMPONENT, type, 0, row, 0);
          MEMCPY(span.array->z, zptr, width * sizeof(GLdepth));
-         _mesa_write_rgba_span(ctx, &span);
+         _swrast_write_rgba_span(ctx, &span);
       }
    }
    else {
@@ -706,7 +697,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
                                                     GL_DEPTH_COMPONENT, type,
                                                     0, row, skipPixels);
 
-            /* Set these for each row since the _mesa_write_* function may
+            /* Set these for each row since the _swrast_write_* function may
              * change them while clipping.
              */
             span.x = spanX;
@@ -718,25 +709,19 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
             /* clamp depth values to [0,1] and convert from floats to ints */
             {
                const GLfloat zs = ctx->DepthMaxF;
-               GLint i;
+               GLuint i;
                for (i = 0; i < span.end; i++) {
                   span.array->z[i] = (GLdepth) (floatSpan[i] * zs + 0.5F);
                }
             }
-            if (ctx->Visual.rgbMode) {
-               if (zoom) {
-                  _mesa_write_zoomed_rgba_span(ctx, &span,
-                                     (const GLchan (*)[4]) span.array->rgba,
-                                     desty, skipPixels);
-               }
-               else
-                  _mesa_write_rgba_span(ctx, &span);
+            if (zoom) {
+               _swrast_write_zoomed_depth_span(ctx, &span, desty, skipPixels);
+            }
+            else if (ctx->Visual.rgbMode) {
+               _swrast_write_rgba_span(ctx, &span);
             }
             else {
-               if (zoom)
-                  _mesa_write_zoomed_index_span(ctx, &span, desty, 0);
-               else
-                  _mesa_write_index_span(ctx, &span);
+               _swrast_write_index_span(ctx, &span);
             }
          }
          skipPixels += spanEnd;
@@ -775,11 +760,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
       return;
 
    if (ctx->Depth.Test)
-      _mesa_span_default_z(ctx, &span);
+      _swrast_span_default_z(ctx, &span);
    if (ctx->Fog.Enabled)
-      _mesa_span_default_fog(ctx, &span);
-   if (ctx->Texture._EnabledUnits)
-      _mesa_span_default_texcoords(ctx, &span);
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
 
    if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0
        && x + width <= (GLint) ctx->DrawBuffer->Width
@@ -862,7 +847,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
             const GLvoid *source = _mesa_image_address(unpack,
                      pixels, width, height, format, type, 0, row, skipPixels);
 
-            /* Set these for each row since the _mesa_write_* function may
+            /* Set these for each row since the _swrast_write_* function may
              * change them while clipping.
              */
             span.x = spanX;
@@ -890,11 +875,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
                                  (CONST GLchan (*)[4]) span.array->rgba, NULL);
             }
             else if (zoom) {
-               _mesa_write_zoomed_rgba_span(ctx, &span,
+               _swrast_write_zoomed_rgba_span(ctx, &span,
                     (CONST GLchan (*)[4]) span.array->rgba, desty, skipPixels);
             }
             else {
-               _mesa_write_rgba_span(ctx, &span);
+               _swrast_write_rgba_span(ctx, &span);
             }
          }