<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Sep 14, 2015 at 11:17 AM, Nanley Chery <span dir="ltr"><<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>><br>
<br>
According to the extensions table and our glext headers,<br>
OES_compressed_ETC1_RGB8_texture is only supported in<br>
GLES1 and GLES2. Since we may give users a GLES3 context<br>
when a GLES2 context is requested, we also allow this<br>
extension for GLES3 as well.<br>
<br>
Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>><br>
---<br>
<br>
I've updated the commit's subject and comment to be clearer. I assume<br>
the R-b on the first patch still applies?<br></blockquote><div>Yes, it still applies. Thanks for updating the commit message.</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
src/mesa/main/teximage.c | 3 ++-<br>
1 file changed, 2 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c<br>
index ff844cd..2a4d29d 100644<br>
--- a/src/mesa/main/teximage.c<br>
+++ b/src/mesa/main/teximage.c<br>
@@ -558,7 +558,8 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )<br>
}<br>
}<br>
<br>
- if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {<br>
+ if (_mesa_is_gles(ctx) &&<br>
+ ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {<br>
switch (internalFormat) {<br>
case GL_ETC1_RGB8_OES:<br>
return GL_RGB;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.5.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>