diff options
| author | Anuj Phogat <[email protected]> | 2016-07-07 17:03:19 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2016-07-18 14:39:54 -0700 |
| commit | 15dea5ca82f45f9b1113e69fe2048b6f05ed426b (patch) | |
| tree | 829df395c7d9dc02db52ef396b7becc236c10df6 /src/mesa/main | |
| parent | 3e1ad846f9c2f3516861d03ba99c4cb22f5f1b6e (diff) | |
mesa: Add the infrastructure for KHR_texture_compression_astc_sliced_3d
V2: Drop the changes to gl.xml.
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Nanley Chery <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions_table.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index ad3bffc068a..6c47b3b1e79 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -285,6 +285,7 @@ EXT(KHR_robust_buffer_access_behavior , ARB_robust_buffer_access_behavior EXT(KHR_robustness , KHR_robustness , GLL, GLC, x , ES2, 2012) EXT(KHR_texture_compression_astc_hdr , KHR_texture_compression_astc_hdr , GLL, GLC, x , ES2, 2012) EXT(KHR_texture_compression_astc_ldr , KHR_texture_compression_astc_ldr , GLL, GLC, x , ES2, 2012) +EXT(KHR_texture_compression_astc_sliced_3d , KHR_texture_compression_astc_sliced_3d , GLL, GLC, x , ES2, 2015) EXT(MESA_pack_invert , MESA_pack_invert , GLL, GLC, x , x , 2002) EXT(MESA_texture_signed_rgba , EXT_texture_snorm , GLL, GLC, x , x , 2009) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 3dae16895a2..ecc5b49073d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3946,6 +3946,7 @@ struct gl_extensions GLboolean KHR_robustness; GLboolean KHR_texture_compression_astc_hdr; GLboolean KHR_texture_compression_astc_ldr; + GLboolean KHR_texture_compression_astc_sliced_3d; GLboolean MESA_pack_invert; GLboolean MESA_ycbcr_texture; GLboolean NV_conditional_render; diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d74a45fb815..8869b3db389 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1447,11 +1447,12 @@ _mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum target, break; case MESA_FORMAT_LAYOUT_ASTC: target_can_be_compresed = - ctx->Extensions.KHR_texture_compression_astc_hdr; + ctx->Extensions.KHR_texture_compression_astc_hdr || + ctx->Extensions.KHR_texture_compression_astc_sliced_3d; /* Throw an INVALID_OPERATION error if the target is TEXTURE_3D and - * and the hdr extension is not supported. - * See comment in switch case GL_TEXTURE_CUBE_MAP_ARRAY for more info. + * neither of the above extensions are supported. See comment in + * switch case GL_TEXTURE_CUBE_MAP_ARRAY for more info. */ if (!target_can_be_compresed) return write_error(error, GL_INVALID_OPERATION); |