From 42e9936ce6bcac9f863b2f85978489e4f804e927 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 24 Jan 2012 15:52:52 -0800 Subject: intel: Fix accum buffer mapping since the swrast rework. A pure swrast-allocated buffer gets an irb of NULL, so we segfaulted in the clear-accum test. Just look at the swrast renderbuffer pointer for handling swrast rbs. --- src/mesa/drivers/dri/intel/intel_fbo.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 3a35a01abca..27b0bfcd4ed 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -128,15 +128,16 @@ intel_map_renderbuffer(struct gl_context *ctx, GLint *out_stride) { struct intel_context *intel = intel_context(ctx); + struct swrast_renderbuffer *srb = (struct swrast_renderbuffer *)rb; struct intel_renderbuffer *irb = intel_renderbuffer(rb); void *map; int stride; - if (!irb && irb->Base.Buffer) { - /* this is a malloc'd renderbuffer (accum buffer) */ + if (srb->Buffer) { + /* this is a malloc'd renderbuffer (accum buffer), not an irb */ GLint bpp = _mesa_get_format_bytes(rb->Format); - GLint rowStride = irb->Base.RowStride; - *out_map = (GLubyte *) irb->Base.Buffer + y * rowStride + x * bpp; + GLint rowStride = srb->RowStride; + *out_map = (GLubyte *) srb->Buffer + y * rowStride + x * bpp; *out_stride = rowStride; return; } @@ -180,12 +181,13 @@ intel_unmap_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb) { struct intel_context *intel = intel_context(ctx); + struct swrast_renderbuffer *srb = (struct swrast_renderbuffer *)rb; struct intel_renderbuffer *irb = intel_renderbuffer(rb); DBG("%s: rb %d (%s)\n", __FUNCTION__, rb->Name, _mesa_get_format_name(rb->Format)); - if (!irb && irb->Base.Buffer) { + if (srb->Buffer) { /* this is a malloc'd renderbuffer (accum buffer) */ /* nothing to do */ return; -- cgit v1.2.3