st/mesa: Add support for ARB_vertex_type_10f_11f_11f_rev

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Fredrik Höglund
2013-11-07 21:48:34 +01:00
parent fe9284a7bf
commit bfc28e4aff
2 changed files with 12 additions and 1 deletions

View File

@@ -214,7 +214,8 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
assert((type >= GL_BYTE && type <= GL_DOUBLE) || assert((type >= GL_BYTE && type <= GL_DOUBLE) ||
type == GL_FIXED || type == GL_HALF_FLOAT || type == GL_FIXED || type == GL_HALF_FLOAT ||
type == GL_INT_2_10_10_10_REV || 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 >= 1);
assert(size <= 4); assert(size <= 4);
assert(format == GL_RGBA || format == GL_BGRA); 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) { if (format == GL_BGRA) {
/* this is an odd-ball case */ /* this is an odd-ball case */
assert(type == GL_UNSIGNED_BYTE); assert(type == GL_UNSIGNED_BYTE);

View File

@@ -507,6 +507,8 @@ void st_init_extensions(struct st_context *st)
PIPE_FORMAT_B10G10R10A2_USCALED, PIPE_FORMAT_B10G10R10A2_USCALED,
PIPE_FORMAT_R10G10B10A2_SSCALED, PIPE_FORMAT_R10G10B10A2_SSCALED,
PIPE_FORMAT_B10G10R10A2_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[] = { static const struct st_extension_format_mapping tbo_rgb32[] = {