diff options
| author | Eric Anholt <[email protected]> | 2017-05-01 09:51:01 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-10-10 09:31:29 -0700 |
| commit | cee5585da7e8a164952347c8dbf72844cad85d9d (patch) | |
| tree | 1b9e11ebc0732343a58bcec916ff0a8781fe1d7b | |
| parent | cbb532429b68ce0e401413bdcc75a2f122786302 (diff) | |
mesa: Only expose GLES's EXT_texture_type_2_10_10_10_REV if supported in HW.
Previously, we were downconverting to 8888 automatically if the hardware
didn't suport it. However, with the advent of
GL_OES_required_internalformat, we have to actually store the
internalformats we advertise support for. And, it seems rather
disingenuous to advertise the extension if we don't actually support it.
v2: Throw an error when using the format on ES2 without the extension present.
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/glformats.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 5 |
5 files changed, 10 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 9487b4ae70f..519d0a56cbf 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -113,6 +113,7 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.EXT_texture_sRGB = true; ctx->Extensions.EXT_texture_sRGB_decode = true; ctx->Extensions.EXT_texture_swizzle = true; + ctx->Extensions.EXT_texture_type_2_10_10_10_REV = true; ctx->Extensions.EXT_vertex_array_bgra = true; ctx->Extensions.KHR_robustness = true; ctx->Extensions.AMD_seamless_cubemap_per_texture = true; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 9475c1b69d9..7254cac89c6 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -284,7 +284,7 @@ EXT(EXT_texture_sRGB_decode , EXT_texture_sRGB_decode EXT(EXT_texture_shared_exponent , EXT_texture_shared_exponent , GLL, GLC, x , x , 2004) EXT(EXT_texture_snorm , EXT_texture_snorm , GLL, GLC, x , x , 2009) EXT(EXT_texture_swizzle , EXT_texture_swizzle , GLL, GLC, x , x , 2008) -EXT(EXT_texture_type_2_10_10_10_REV , dummy_true , x , x , x , ES2, 2008) +EXT(EXT_texture_type_2_10_10_10_REV , EXT_texture_type_2_10_10_10_REV , x , x , x , ES2, 2008) EXT(EXT_timer_query , EXT_timer_query , GLL, GLC, x , x , 2006) EXT(EXT_transform_feedback , EXT_transform_feedback , GLL, GLC, x , x , 2011) EXT(EXT_unpack_subimage , dummy_true , x , x , x , ES2, 2011) diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 4f240206ff4..aec41f07993 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -2234,7 +2234,8 @@ _mesa_es_error_check_format_and_type(const struct gl_context *ctx, || type == GL_UNSIGNED_SHORT_5_5_5_1 || type == GL_FLOAT || type == GL_HALF_FLOAT_OES - || type == GL_UNSIGNED_INT_2_10_10_10_REV); + || (ctx->Extensions.EXT_texture_type_2_10_10_10_REV && + type == GL_UNSIGNED_INT_2_10_10_10_REV)); break; case GL_DEPTH_COMPONENT: diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index abda1a36e46..455e7514ab9 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4151,6 +4151,7 @@ struct gl_extensions GLboolean EXT_texture_sRGB; GLboolean EXT_texture_sRGB_decode; GLboolean EXT_texture_swizzle; + GLboolean EXT_texture_type_2_10_10_10_REV; GLboolean EXT_transform_feedback; GLboolean EXT_timer_query; GLboolean EXT_vertex_array_bgra; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index c3c7d6f9f8b..1fbae9234e5 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -774,6 +774,11 @@ void st_init_extensions(struct pipe_screen *screen, PIPE_FORMAT_B8G8R8A8_SRGB }, GL_TRUE }, /* at least one format must be supported */ + { { o(EXT_texture_type_2_10_10_10_REV) }, + { PIPE_FORMAT_R10G10B10A2_UNORM, + PIPE_FORMAT_B10G10R10A2_UNORM }, + GL_TRUE }, /* at least one format must be supported */ + { { o(ATI_texture_compression_3dc) }, { PIPE_FORMAT_LATC2_UNORM } }, |