Please, ignore this patch (wrong subject; sent a new one with the right
subject).
J.A.
On Wed, 2017-11-08 at 16:38 +0100, Juan A. Suarez Romero wrote:
> From section 8.7, page 179 of OpenGL ES 3.2 spec:
>
> An INVALID_OPERATION error is generated by CompressedTexImage3D
> if internalformat is one of the the formats in table 8.17 and target
> is not TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY or TEXTURE_3D.
>
> So far it was only considering TEXTURE_2D_ARRAY as valid target. Now it
> must consider also TEXTURE_CUBE_MAP_ARRAY and TEXTURE_3D.
>
> This fixes KHR-GLES32.core.texture_cube_map_array.etc2_texture
> ---
> src/mesa/main/teximage.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 4ec6148bf42..2799669d28a 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -1403,26 +1403,21 @@ _mesa_target_can_be_compressed(const struct
> gl_context *ctx, GLenum target,
> * have already been handled by normal ETC2/EAC behavior.
> */
>
> - /* From section 3.8.6, page 146 of OpenGL ES 3.0 spec:
> + /* From section 8.7, page 179 of OpenGL ES 3.2 spec:
> *
> - * "The ETC2/EAC texture compression algorithm supports only
> - * two-dimensional images. If internalformat is an ETC2/EAC format,
> - * glCompressedTexImage3D will generate an INVALID_OPERATION error
> if
> - * target is not TEXTURE_2D_ARRAY."
> + * "An INVALID_OPERATION error is generated by CompressedTexImage3D
> + * if internalformat is one of the the formats in table 8.17 and
> target is
> + * not TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY or TEXTURE_3D."
> *
> - * This should also be applicable for glTexStorage3D(). Other available
> - * targets for these functions are: TEXTURE_3D and
> TEXTURE_CUBE_MAP_ARRAY.
> + * This should also be applicable for glTexStorage3D().
> */
> - if (layout == MESA_FORMAT_LAYOUT_ETC2 && _mesa_is_gles3(ctx))
> - return write_error(error, GL_INVALID_OPERATION);
> target_can_be_compresed = _mesa_has_texture_cube_map_array(ctx);
> break;
> case GL_TEXTURE_3D:
> switch (layout) {
> case MESA_FORMAT_LAYOUT_ETC2:
> /* See ETC2/EAC comment in case GL_TEXTURE_CUBE_MAP_ARRAY. */
> - if (_mesa_is_gles3(ctx))
> - return write_error(error, GL_INVALID_OPERATION);
> + target_can_be_compresed = GL_TRUE;
> break;
> case MESA_FORMAT_LAYOUT_BPTC:
> target_can_be_compresed =
> ctx->Extensions.ARB_texture_compression_bptc;
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
