swast: replace renderbuffer->GetPointer() with _swrast_pixel_address()

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h
index f9f2d2934122e748f8f6f0fbc4bcd13592bbcc0b..1668f7db9148a67f8769c0dc1788f037e08a27c7 100644 (file)
--- a/src/mesa/swrast/s_linetemp.h
+++ b/src/mesa/swrast/s_linetemp.h
@@ -166,7 +166,7 @@ NAME( struct gl_context *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    */
 
 #ifdef DEPTH_TYPE
-   zPtr = (DEPTH_TYPE *) zrb->GetPointer(ctx, zrb, x0, y0);
+   zPtr = (DEPTH_TYPE *) _swrast_pixel_address(zrb, x0, y0);
 #endif
 #ifdef PIXEL_ADDRESS
    pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index b4f8e7479290f6519194916f44e9d2c2af922f37..10d077fe77f2b14a1e03010e33abed5c300f4ac5 100644 (file)
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -887,7 +887,7 @@ fast_persp_span(struct gl_context *ctx, SWspan *span,
    if (rb->Format == MESA_FORMAT_Z16) {                                        \
       GLuint i;                                                                \
       const GLushort *zRow = (const GLushort *)                                \
-         rb->GetPointer(ctx, rb, span.x, span.y);                      \
+         _swrast_pixel_address(rb, span.x, span.y);                     \
       for (i = 0; i < span.end; i++) {                                 \
          GLuint z = FixedToDepth(span.z);                              \
          if (z < zRow[i]) {                                            \
@@ -899,7 +899,7 @@ fast_persp_span(struct gl_context *ctx, SWspan *span,
    else {                                                              \
       GLuint i;                                                                \
       const GLuint *zRow = (const GLuint *)                            \
-         rb->GetPointer(ctx, rb, span.x, span.y);                      \
+         _swrast_pixel_address(rb, span.x, span.y);                    \
       for (i = 0; i < span.end; i++) {                                 \
          if ((GLuint)span.z < zRow[i]) {                               \
             q->Result++;                                               \

diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index 4d6309b82ac23572683fda617348f086a0233985..061759d26d2dc96e87a35732bd8966c2efb3cab8 100644 (file)
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -631,7 +631,7 @@ static void NAME(struct gl_context *ctx, const SWvertex *v0,
                   }
 #  ifdef DEPTH_TYPE
                   zRow = (DEPTH_TYPE *)
-                    zrb->GetPointer(ctx, zrb, FixedToInt(fxLeftEdge), span.y);
+                    _swrast_pixel_address(zrb, FixedToInt(fxLeftEdge), span.y);
                   dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
 #  endif
                }