summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_context.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-01-16 10:55:25 -0700
committerBrian Paul <[email protected]>2012-01-24 14:12:14 -0700
commit7d1ddec92168e9b6ead0da80b18364a75f9a85e6 (patch)
treeb6ea2d9bad4e6401f9dda0b205484a4759bdabb4 /src/mesa/swrast/s_context.h
parent14da67d9b9b9e30740ef1687c3952a0b5e8b0a54 (diff)
mesa: use gl_renderbuffer::Map for all depth/stencil accesses
Instead of using the obsolete gl_renderbuffer::Data field. Color buffer are still accessed through GetRow/PutRow().
Diffstat (limited to 'src/mesa/swrast/s_context.h')
-rw-r--r--src/mesa/swrast/s_context.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 36ab86a5e84..7f1e4c78ee4 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -429,7 +429,7 @@ static inline GLubyte *
_swrast_pixel_address(struct gl_renderbuffer *rb, GLint x, GLint y)
{
const GLint bpp = _mesa_get_format_bytes(rb->Format);
- const GLint rowStride = rb->RowStride * bpp;
+ const GLint rowStride = rb->RowStrideBytes;
assert(x >= 0);
assert(y >= 0);
/* NOTE: using <= only because of s_tritemp.h which gets a pixel
@@ -437,8 +437,8 @@ _swrast_pixel_address(struct gl_renderbuffer *rb, GLint x, GLint y)
*/
assert(x <= (GLint) rb->Width);
assert(y <= (GLint) rb->Height);
- assert(rb->Data);
- return (GLubyte *) rb->Data + y * rowStride + x * bpp;
+ assert(rb->Map);
+ return (GLubyte *) rb->Map + y * rowStride + x * bpp;
}