Mesa (9.1): mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.
Matt Turner
mattst88 at kemper.freedesktop.org
Sat Mar 9 05:25:21 UTC 2013
Module: Mesa
Branch: 9.1
Commit: e3f1b34fbe360111f90d6b7f11b11c4f4b17485b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3f1b34fbe360111f90d6b7f11b11c4f4b17485b
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Mar 4 11:32:32 2013 -0800
mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.
Fixes piglit's oes_compressed_etc2_texture-miptree tests on Desktop GL.
Reported-by: Marek Olšák <maraeo at gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/mesa/main/glformats.c | 2 +-
src/mesa/main/teximage.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 8728540..c1e1658 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -917,7 +917,7 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
- return _mesa_is_gles3(ctx);
+ return _mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility;
case GL_PALETTE4_RGB8_OES:
case GL_PALETTE4_RGBA8_OES:
case GL_PALETTE4_R5_G6_B5_OES:
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 6251173..1b9525b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -520,7 +520,7 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
}
}
- if (_mesa_is_gles3(ctx)) {
+ if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility) {
switch (internalFormat) {
case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_SRGB8_ETC2:
More information about the mesa-commit
mailing list