Mesa (master): st/mesa: Add support for ARB_vertex_type_10f_11f_11f_rev

[Fredrik Höglund]

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

Author: Fredrik Höglund <fredrik at kde.org>
Date:   Thu Nov  7 21:48:34 2013 +0100

st/mesa: Add support for ARB_vertex_type_10f_11f_11f_rev

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/mesa/state_tracker/st_atom_array.c |   11 ++++++++++-
 src/mesa/state_tracker/st_extensions.c |    2 ++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 87a0a17..76a94bc 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -214,7 +214,8 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
    assert((type >= GL_BYTE && type <= GL_DOUBLE) ||
           type == GL_FIXED || type == GL_HALF_FLOAT ||
           type == GL_INT_2_10_10_10_REV ||
-          type == GL_UNSIGNED_INT_2_10_10_10_REV);
+          type == GL_UNSIGNED_INT_2_10_10_10_REV ||
+          type == GL_UNSIGNED_INT_10F_11F_11F_REV);
    assert(size >= 1);
    assert(size <= 4);
    assert(format == GL_RGBA || format == GL_BGRA);
@@ -251,6 +252,14 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
       }
    }
 
+   if (type == GL_UNSIGNED_INT_10F_11F_11F_REV) {
+      assert(size == 3);
+      assert(!integer);
+      assert(format == GL_RGBA);
+
+      return PIPE_FORMAT_R11G11B10_FLOAT;
+   }
+
    if (format == GL_BGRA) {
       /* this is an odd-ball case */
       assert(type == GL_UNSIGNED_BYTE);
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 97c5d55..e8d0902 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -507,6 +507,8 @@ void st_init_extensions(struct st_context *st)
           PIPE_FORMAT_B10G10R10A2_USCALED,
           PIPE_FORMAT_R10G10B10A2_SSCALED,
           PIPE_FORMAT_B10G10R10A2_SSCALED } },
+      { { o(ARB_vertex_type_10f_11f_11f_rev) },
+        { PIPE_FORMAT_R11G11B10_FLOAT } },
    };
 
    static const struct st_extension_format_mapping tbo_rgb32[] = {