Mesa (master): st/mesa: add ARB_texture_rgb10_a2ui support

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 9f9c8592e692f1c682779f39675be0f3857cae9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f9c8592e692f1c682779f39675be0f3857cae9d

Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Nov 27 16:23:56 2011 +0000

st/mesa: add ARB_texture_rgb10_a2ui support

Add support to the state tracker format and extension enablement code.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/state_tracker/st_extensions.c |    6 ++++++
 src/mesa/state_tracker/st_format.c     |   11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 25a6cdc..c741d13 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -664,4 +664,10 @@ void st_init_extensions(struct st_context *st)
                                    PIPE_BIND_SAMPLER_VIEW)) {
       ctx->Extensions.ARB_depth_buffer_float = GL_TRUE;
    }
+
+   if (screen->is_format_supported(screen, PIPE_FORMAT_B10G10R10A2_UINT,
+                                   PIPE_TEXTURE_2D, 0,
+                                   PIPE_BIND_SAMPLER_VIEW))
+       ctx->Extensions.ARB_texture_rgb10_a2ui = GL_TRUE;
+
 }
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index b11245b..bc414f4 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -457,7 +457,8 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
       return PIPE_FORMAT_R9G9B9E5_FLOAT;
    case MESA_FORMAT_R11_G11_B10_FLOAT:
       return PIPE_FORMAT_R11G11B10_FLOAT;
-
+   case MESA_FORMAT_ARGB2101010_UINT:
+      return PIPE_FORMAT_B10G10R10A2_UINT;
    default:
       assert(0);
       return PIPE_FORMAT_NONE;
@@ -782,6 +783,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_R11G11B10_FLOAT:
       return MESA_FORMAT_R11_G11_B10_FLOAT;
 
+   case PIPE_FORMAT_B10G10R10A2_UINT:
+      return MESA_FORMAT_ARGB2101010_UINT;
    default:
       assert(0);
       return MESA_FORMAT_NONE;
@@ -1471,7 +1474,11 @@ static const struct format_mapping format_map[] = {
    {
       { GL_R11F_G11F_B10F, 0 },
       { PIPE_FORMAT_R11G11B10_FLOAT, 0 }
-   }
+   },
+   {
+      { GL_RGB10_A2UI, 0 },
+      { PIPE_FORMAT_B10G10R10A2_UINT, 0 }
+   },
 };