mesa: Allow HALF_FLOAT in glVertexAttribPointer for GLES3

Fixes es3conform's half_float_max_vertex_dimensions and
half_float_textures tests.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Matt Turner 2012-11-28 21:45:19 -08:00 committed by Ian Romanick
parent cbef5371f6
commit c8901133a4

View file

@ -151,21 +151,21 @@ update_array(struct gl_context *ctx,
}
if (_mesa_is_gles(ctx)) {
/* Once Mesa gets support for GL_OES_vertex_half_float this mask will
* change. Adding support for this extension isn't quite as trivial as
* we'd like because ES uses a different enum value for GL_HALF_FLOAT.
*/
legalTypesMask &= ~(FIXED_GL_BIT | HALF_BIT | DOUBLE_BIT);
legalTypesMask &= ~(FIXED_GL_BIT | DOUBLE_BIT);
/* GL_INT and GL_UNSIGNED_INT data is not allowed in OpenGL ES until
* 3.0. The 2_10_10_10 types are added in OpenGL ES 3.0 or
* GL_OES_vertex_type_10_10_10_2.
* GL_OES_vertex_type_10_10_10_2. GL_HALF_FLOAT data is not allowed
* until 3.0 or with the GL_OES_vertex_half float extension, which isn't
* quite as trivial as we'd like because it uses a different enum value
* for GL_HALF_FLOAT_OES.
*/
if (ctx->Version < 30) {
legalTypesMask &= ~(UNSIGNED_INT_BIT
| INT_BIT
| UNSIGNED_INT_2_10_10_10_REV_BIT
| INT_2_10_10_10_REV_BIT);
| INT_2_10_10_10_REV_BIT
| HALF_BIT);
}
/* BGRA ordering is not supported in ES contexts.