[Piglit] [PATCH] khr_texture_compression_astc: Allow TEXTURE_3D target if sliced_3d is supported

[Nanley Chery]

On Thu, Jul 14, 2016 at 02:28:31PM -0700, Anuj Phogat wrote:
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---

This patch is,

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

>  .../khr_texture_compression_astc/khr_compressed_astc-basic.c  | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-basic.c b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-basic.c
> index 0269e3a..dda8229 100644
> --- a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-basic.c
> +++ b/tests/spec/khr_texture_compression_astc/khr_compressed_astc-basic.c
> @@ -154,7 +154,8 @@ have_gen_mipmap_support()
>   *	the TEXTURE_CUBE_MAP_ARRAY target.
>   *
>   */
> -void test_compressed_teximg_3d(int fi, bool have_cube_map_ext, bool have_hdr)
> +void test_compressed_teximg_3d(int fi, bool have_cube_map_ext,
> +			       bool have_hdr_or_sliced_3d)
>  {
>  	int j;
>  	GLuint tex3D;
> @@ -175,7 +176,7 @@ void test_compressed_teximg_3d(int fi, bool have_cube_map_ext, bool have_hdr)
>  
>  		/* Test expected GL errors */
>  		if (good_compressed_tex_3d_targets[j] == GL_TEXTURE_3D
> -		    && !have_hdr) {
> +		    && !have_hdr_or_sliced_3d) {
>  			REQUIRE_ERROR(GL_INVALID_OPERATION);
>  		} else {
>  			REQUIRE_ERROR(GL_NO_ERROR);
> @@ -371,13 +372,17 @@ piglit_display(void)
>  	bool have_gen_mipmap   = have_gen_mipmap_support();
>  	bool have_hdr = piglit_is_extension_supported(
>  			"GL_KHR_texture_compression_astc_hdr");
> +	bool have_hdr_or_sliced_3d = have_hdr ||
> +			piglit_is_extension_supported(
> +			"GL_KHR_texture_compression_astc_sliced_3d");
>  
>  	for (i = 0; i < ARRAY_SIZE(formats); i++) {
>  		if (have_cube_map_ext)
>  			test_non_square_img(i, have_hdr);
>  		if (have_tex_stor_ext)
>  			test_sub_img(i);
> -		test_compressed_teximg_3d(i, have_cube_map_ext, have_hdr);
> +		test_compressed_teximg_3d(i, have_cube_map_ext,
> +					  have_hdr_or_sliced_3d);
>  		test_tex_img(i, have_gen_mipmap);
>  	}
>  
> -- 
> 2.5.5
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit