gallium: do a proper implementation of GL_OES_read_format

Examine the currently bound color buffer's format to see if there's a good
format/type match.

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 2c74dc7dd07a62c916aa13b5b6deab40a0b1d6e1..af8dfcb4930c5eb67123e4b690ccd00ec403adcd 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -153,6 +153,7 @@ if env['platform'] != 'winddk':
                'state_tracker/st_cb_flush.c',
                'state_tracker/st_cb_drawpixels.c',
                'state_tracker/st_cb_fbo.c',
+               'state_tracker/st_cb_get.c',
                'state_tracker/st_cb_feedback.c',
                'state_tracker/st_cb_program.c',
                'state_tracker/st_cb_queryobj.c',

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 0e0e10979b69937b21922ffea01dbf8b0e5b4f78..14fd8597a8fc52b1d095932578d556acf506ca50 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -187,6 +187,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_bufferobjects.c \
        state_tracker/st_cb_clear.c \
        state_tracker/st_cb_flush.c \
+       state_tracker/st_cb_get.c \
        state_tracker/st_cb_drawpixels.c \
        state_tracker/st_cb_fbo.c \
        state_tracker/st_cb_feedback.c \

diff --git a/src/mesa/state_tracker/st_cb_get.c b/src/mesa/state_tracker/st_cb_get.c
new file mode 100644 (file)
index 0000000..e7d7f03
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_get.c
@@ -0,0 +1,97 @@
+/**************************************************************************
+ * 
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * glGet functions
+ *
+ * \author Brian Paul
+ */
+
+#include "main/imports.h"
+#include "main/context.h"
+
+#include "pipe/p_defines.h"
+
+#include "st_cb_fbo.h"
+#include "st_cb_get.h"
+
+
+
+/**
+ * Examine the current color read buffer format to determine
+ * which GL pixel format/type combo is the best match.
+ */
+static void
+get_preferred_read_format_type(GLcontext *ctx, GLint *format, GLint *type)
+{
+   struct gl_framebuffer *fb = ctx->ReadBuffer;
+   struct st_renderbuffer *strb = st_renderbuffer(fb->_ColorReadBuffer);
+
+   /* defaults */
+   *format = ctx->Const.ColorReadFormat;
+   *type = ctx->Const.ColorReadType;
+
+   if (strb) {
+      /* XXX could add more cases here... */
+      if (strb->format == PIPE_FORMAT_A8R8G8B8_UNORM) {
+         *format = GL_BGRA;
+         if (_mesa_little_endian())
+            *type = GL_UNSIGNED_INT_8_8_8_8_REV;
+         else
+            *type = GL_UNSIGNED_INT_8_8_8_8;
+      }
+   }
+}
+
+
+/**
+ * We only intercept the OES preferred ReadPixels format/type.
+ * Everything else goes to the default _mesa_GetIntegerv.
+ */
+static GLboolean 
+st_GetIntegerv(GLcontext *ctx, GLenum pname, GLint *params)
+{
+   GLint dummy;
+
+   switch (pname) {
+   case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
+      get_preferred_read_format_type(ctx, &dummy, params);
+      return GL_TRUE;
+   case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
+      get_preferred_read_format_type(ctx, params, &dummy);
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+void st_init_get_functions(struct dd_function_table *functions)
+{
+   functions->GetIntegerv = st_GetIntegerv;
+}

diff --git a/src/mesa/state_tracker/st_cb_get.h b/src/mesa/state_tracker/st_cb_get.h
new file mode 100644 (file)
index 0000000..8e9f3e9
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_get.h
@@ -0,0 +1,37 @@
+/**************************************************************************
+ * 
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef ST_CB_GET_H
+#define ST_CB_GET_H
+
+
+extern void
+st_init_get_functions(struct dd_function_table *functions);
+
+
+#endif

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 3b126e6c8f6e9a5624a8754e7bb3730378200b11..83b0be06daa8360ba05611449507e5e7f4decefb 100644 (file)
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -49,6 +49,7 @@
 #include "st_cb_drawtex.h"
 #endif
 #include "st_cb_fbo.h"
+#include "st_cb_get.h"
 #if FEATURE_feedback
 #include "st_cb_feedback.h"
 #endif
@@ -293,6 +294,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_rasterpos_functions(functions);
 #endif
    st_init_fbo_functions(functions);
+   st_init_get_functions(functions);
 #if FEATURE_feedback
    st_init_feedback_functions(functions);
 #endif