From: Nanley Chery <nanley.g.chery@intel.com>
Date: Thu, 27 Aug 2015 23:05:22 +0000 (-0700)
Subject: mesa/teximage: restrict GL_ETC1_RGB8_OES support to GLES
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82007936491d5fb99cdc5ea18c076e8a896a4a1e;p=mesa.git

mesa/teximage: restrict GL_ETC1_RGB8_OES support to GLES

According to the extensions table and our glext headers,
OES_compressed_ETC1_RGB8_texture is only supported in
GLES1 and GLES2. Since we may give users a GLES3 context
when a GLES2 context is requested, we also allow this
extension for GLES3 as well.

Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ff844cd24eb..2a4d29daf2f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -558,7 +558,8 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
       }
    }
 
-   if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
+   if (_mesa_is_gles(ctx) &&
+      ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
       switch (internalFormat) {
       case GL_ETC1_RGB8_OES:
          return GL_RGB;