From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Thu, 15 Nov 2018 17:08:33 +0000 (+0100)
Subject: mesa/main: do not allow MESA_ycbcr_texture enums on gles
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b112e62ba4819e3b230b63f778bb93c056dc059d;p=mesa.git

mesa/main: do not allow MESA_ycbcr_texture enums on gles

This extension requies OpenGL, and shouldn't be available on OpenGL ES.
So let's not allow the enums from it either.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 319422c27ad..adb244fb84c 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2037,7 +2037,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          }
 
       case GL_YCBCR_MESA:
-         if (!ctx->Extensions.MESA_ycbcr_texture)
+         if (!_mesa_has_MESA_ycbcr_texture(ctx))
             return GL_INVALID_ENUM;
          if (type == GL_UNSIGNED_SHORT_8_8_MESA ||
              type == GL_UNSIGNED_SHORT_8_8_REV_MESA)
@@ -2381,7 +2381,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
         is_astc_3d_format(internalFormat)))
         return GL_RGBA;
 
-   if (ctx->Extensions.MESA_ycbcr_texture) {
+   if (!_mesa_has_MESA_ycbcr_texture(ctx)) {
       if (internalFormat == GL_YCBCR_MESA)
          return GL_YCBCR_MESA;
    }