[Mesa-dev] [PATCH V2 1/3] mesa: Add the infrastructure for KHR_texture_compression_astc_sliced_3d

[Nanley Chery]

On Thu, Jul 14, 2016 at 11:12:45AM -0700, Anuj Phogat wrote:
> V2: Drop the changes to gl.xml.
> 
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/main/extensions_table.h | 1 +
>  src/mesa/main/mtypes.h           | 1 +
>  src/mesa/main/teximage.c         | 5 +++--
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> 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.

Currently, the line above states that an error will be thrown if one the
extensions above is not supported, meaning, 

         target_can_be_compresed =
            ctx->Extensions.KHR_texture_compression_astc_hdr &&
            ctx->Extensions.KHR_texture_compression_astc_sliced_3d;

This is contrary to the code. I think the line above should instead say:
" * and neither of the above extensions are supported."

Sorry for missing this in my previous review. With that change, this
patch is:

Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>

>            * 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 at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev