From 7cf2d75d4f5397629a058b9ea9b20df688b79e5c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 24 Dec 2011 08:54:26 -0700 Subject: [PATCH] swast: replace renderbuffer->GetPointer() with _swrast_pixel_address() Reviewed-by: Eric Anholt --- src/mesa/swrast/s_linetemp.h | 2 +- src/mesa/swrast/s_triangle.c | 4 ++-- src/mesa/swrast/s_tritemp.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index f9f2d293412..1668f7db914 100644 --- 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 b4f8e747929..10d077fe77f 100644 --- 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 4d6309b82ac..061759d26d2 100644 --- 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 } -- 2.30.2