On Thu, Jul 07, 2016 at 07:34:24PM -0700, Anuj Phogat wrote: > Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com> > --- > src/mapi/glapi/registry/gl.xml | 1 + > src/mesa/main/extensions_table.h | 1 + > src/mesa/main/mtypes.h | 1 + > src/mesa/main/teximage.c | 5 +++-- > 4 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml > index 0e12acc..dda9345 100755 > --- a/src/mapi/glapi/registry/gl.xml > +++ b/src/mapi/glapi/registry/gl.xml > @@ -41757,6 +41757,7 @@ typedef unsigned int GLhandleARB; > <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/> > </require> > </extension> > + <extension name="GL_KHR_texture_compression_astc_sliced_3d" > supported="gl|glcore|gles2"/>
According to commit 76ec0b903865c19ab3a2a36aab9211f75480ee9e , this file is intended to be a copy of the upstream Khronos gl.xml. I think it would be better to update the entire file in a seperate commit, than to update the relevent bits and pieces. Since this extension doesn't provide any enums, it should be safe to drop this hunk. Other than the above issue, this patch looks good. Regards, Nanley > <extension name="GL_MESAX_texture_stack" supported="gl"> > <require> > <enum name="GL_TEXTURE_1D_STACK_MESAX"/> > diff --git a/src/mesa/main/extensions_table.h > b/src/mesa/main/extensions_table.h > index ad3bffc..6c47b3b 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 29e47de..d490c25 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 26a6c21..b546888 100644 > --- a/src/mesa/main/teximage.c > +++ b/src/mesa/main/teximage.c > @@ -1407,10 +1407,11 @@ _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. > + * and either of above extensions are not supported. > * See comment in switch case GL_TEXTURE_CUBE_MAP_ARRAY for more > info. > */ > if (!target_can_be_compresed) > -- > 2.5.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
