Attachment 55519 Details for Bug 44723 – add renderbuffer mapping/unmapping functions to osmesa

[patch] add renderbuffer mapping/unmapping functions to osmesa

0001-osmesa-fix-glReadPixels-etc.patch (text/plain), 3.46 KB, created by Brian Paul on 2012-01-12 10:55:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2012-01-12 10:55:18 UTC

Size: 3.46 KB

patch

obsolete

>From a7ca9accd579ba5ecb4e6bd00edec6856bbbd3bd Mon Sep 17 00:00:00 2001
>From: Brian Paul <brianp@vmware.com>
>Date: Thu, 12 Jan 2012 11:52:22 -0700
>Subject: [PATCH] osmesa: fix glReadPixels, etc
>
>Needed to implement the Map/UnmapRenderbuffer() driver hooks.
>This fixes glRead/Draw/CopyPixels, etc.
>
>See https://bugs.freedesktop.org/show_bug.cgi?id=44723
>
>Note: This is a candidate for the 8.0 branch.
>---
> src/mesa/drivers/osmesa/osmesa.c |   56 +++++++++++++++++++++++++++++++++++++-
> 1 files changed, 55 insertions(+), 1 deletions(-)
>
>diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
>index acfe629..931e164 100644
>--- a/src/mesa/drivers/osmesa/osmesa.c
>+++ b/src/mesa/drivers/osmesa/osmesa.c
>@@ -56,6 +56,8 @@
> #include "vbo/vbo.h"
> 
> 
>+#define OSMESA_RENDERBUFFER_CLASS 0x053
>+
> 
> /**
>  * OSMesa rendering context, derived from core Mesa struct gl_context.
>@@ -932,11 +934,12 @@ new_osmesa_renderbuffer(struct gl_context *ctx, GLenum format, GLenum type)
>       rb->RefCount = 1;
>       rb->Delete = osmesa_delete_renderbuffer;
>       rb->AllocStorage = osmesa_renderbuffer_storage;
>+      rb->ClassID = OSMESA_RENDERBUFFER_CLASS;
> 
>       rb->InternalFormat = GL_RGBA;
>       switch (type) {
>       case GL_UNSIGNED_BYTE:
>-         rb->Format = MESA_FORMAT_RGBA8888;
>+         rb->Format = MESA_FORMAT_RGBA8888_REV;
>          break;
>       case GL_UNSIGNED_SHORT:
>          rb->Format = MESA_FORMAT_RGBA_16;
>@@ -959,6 +962,54 @@ new_osmesa_renderbuffer(struct gl_context *ctx, GLenum format, GLenum type)
> }
> 
> 
>+
>+static void
>+osmesa_MapRenderbuffer(struct gl_context *ctx,
>+                       struct gl_renderbuffer *rb,
>+                       GLuint x, GLuint y, GLuint w, GLuint h,
>+                       GLbitfield mode,
>+                       GLubyte **mapOut, GLint *rowStrideOut)
>+{
>+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
>+
>+   if (rb->ClassID == OSMESA_RENDERBUFFER_CLASS) {
>+      /* this is an OSMesa renderbuffer which wraps user memory */
>+      const GLuint bpp = _mesa_get_format_bytes(rb->Format);
>+      GLint rowLength; /* in pixels */
>+
>+      if (osmesa->userRowLength)
>+         rowLength = osmesa->userRowLength;
>+      else
>+         rowLength = rb->Width;
>+
>+      *rowStrideOut = rowLength * bpp;
>+
>+      if (!osmesa->yup) {
>+         /* Y=0 is top line of window */
>+         y = rb->Height - y - 1;
>+      }
>+
>+      *mapOut = (GLubyte *) rb->Data + y * *rowStrideOut + x * bpp;
>+   }
>+   else {
>+      _swrast_map_soft_renderbuffer(ctx, rb, x, y, w, h, mode,
>+                                    mapOut, rowStrideOut);
>+   }
>+}
>+
>+
>+static void
>+osmesa_UnmapRenderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb)
>+{
>+   if (rb->ClassID == OSMESA_RENDERBUFFER_CLASS) {
>+      /* no-op */
>+   }
>+   else {
>+      _swrast_unmap_soft_renderbuffer(ctx, rb);
>+   }
>+}
>+
>+
> /**********************************************************************/
> /*****                    Public Functions                        *****/
> /**********************************************************************/
>@@ -1157,6 +1208,9 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
>          tnl = TNL_CONTEXT(ctx);
>          tnl->Driver.RunPipeline = _tnl_run_pipeline;
> 
>+         ctx->Driver.MapRenderbuffer = osmesa_MapRenderbuffer;
>+         ctx->Driver.UnmapRenderbuffer = osmesa_UnmapRenderbuffer;
>+
>          /* Extend the software rasterizer with our optimized line and triangle
>           * drawing functions.
>           */
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 44723: 55519

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.