diff options
| author | Kevin Strasser <[email protected]> | 2016-10-10 14:29:58 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-11-09 14:35:20 -0800 |
| commit | 1d6fe13c138efb836a28052b16260a258d113827 (patch) | |
| tree | 2552b90dafa1cce30e3746926c2960b004a49e91 /src/mesa/main | |
| parent | aeaf21ab3e6cb3e628ff0219461cbd06f3a99d34 (diff) | |
mesa/extensions: expose OES_vertex_half_float for ES2
Half float support already exists for desktop GL. Reuse the
ARB_half_float_vertex enable bit and account for the different enum to
enable the extension for ES2.
Signed-off-by: Kevin Strasser <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions_table.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/glformats.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 2dbd7da6c90..036e62b23e5 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -392,6 +392,7 @@ EXT(OES_texture_npot , ARB_texture_non_power_of_two EXT(OES_texture_stencil8 , ARB_texture_stencil8 , x , x , x , 30, 2014) EXT(OES_texture_storage_multisample_2d_array, ARB_texture_multisample , x , x , x , 31, 2014) EXT(OES_vertex_array_object , dummy_true , x , x , ES1, ES2, 2010) +EXT(OES_vertex_half_float , ARB_half_float_vertex , x , x , x , ES2, 2005) EXT(OES_viewport_array , OES_viewport_array , x , x , x , 31, 2010) EXT(S3_s3tc , ANGLE_texture_compression_dxt , GLL, GLC, x , x , 1999) diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 85d00af487f..a95909c9bc9 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -546,6 +546,7 @@ _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type) case GL_FLOAT: return comps * sizeof(GLfloat); case GL_HALF_FLOAT_ARB: + case GL_HALF_FLOAT_OES: return comps * sizeof(GLhalfARB); case GL_DOUBLE: return comps * sizeof(GLdouble); diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 656cb3479c7..c4283551882 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -102,6 +102,7 @@ type_to_bit(const struct gl_context *ctx, GLenum type) case GL_UNSIGNED_INT: return UNSIGNED_INT_BIT; case GL_HALF_FLOAT: + case GL_HALF_FLOAT_OES: if (ctx->Extensions.ARB_half_float_vertex) return HALF_BIT; else @@ -236,8 +237,10 @@ get_legal_types_mask(const struct gl_context *ctx) legalTypesMask &= ~(UNSIGNED_INT_BIT | INT_BIT | UNSIGNED_INT_2_10_10_10_REV_BIT | - INT_2_10_10_10_REV_BIT | - HALF_BIT); + INT_2_10_10_10_REV_BIT); + + if (!_mesa_has_OES_vertex_half_float(ctx)) + legalTypesMask &= ~HALF_BIT; } } else { |