<div dir="ltr"><div class="gmail_quote"><div dir="ltr"><br></div><div dir="ltr"><br></div><div dir="ltr">On Fri, Nov 23, 2018 at 5:54 AM Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com">erik.faye-lund@collabora.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">S3_s3tc is the extension that enables this functionality on desktop, so<br>
let's check for that one. The _mesa_has_S3_s3tc() helper already<br>
verifies the API according to the extension-table.<br>
<br>
Signed-off-by: Erik Faye-Lund <<a href="mailto:erik.faye-lund@collabora.com" target="_blank">erik.faye-lund@collabora.com</a>><br>
---<br>
src/mesa/main/glformats.c | 8 +++-----<br>
1 file changed, 3 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c<br>
index 9a507d11b96..b2c18aa6d94 100644<br>
--- a/src/mesa/main/glformats.c<br>
+++ b/src/mesa/main/glformats.c<br>
@@ -1352,8 +1352,7 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format)<br>
case GL_RGB4_S3TC:<br>
case GL_RGBA_S3TC:<br>
case GL_RGBA4_S3TC:<br>
- return _mesa_is_desktop_gl(ctx) &&<br>
- ctx->Extensions.ANGLE_texture_compression_dxt;<br>
+ return _mesa_has_S3_s3tc(ctx);<br>
case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:<br>
return ctx->API == API_OPENGL_COMPAT<br>
&& ctx->Extensions.ATI_texture_compression_3dc;<br>
@@ -1378,9 +1377,8 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format)<br>
*/<br>
return ctx->Extensions.ANGLE_texture_compression_dxt;<br>
} else {<br>
- return _mesa_is_desktop_gl(ctx)<br>
- && ctx->Extensions.EXT_texture_sRGB<br>
- && ctx->Extensions.EXT_texture_compression_s3tc;<br>
+ return _mesa_has_EXT_texture_sRGB(ctx) &&<br>
+ _mesa_has_S3_s3tc(ctx);<br></blockquote><div><br></div><div>This looks like it should be _mesa_has_EXT_texture_compression_s3tc.</div><div><br></div><div>Marek</div><br></div></div>