mesa: Disallow R, RG, or RGB integer and unsigned formats in OpenGL ES 3.0

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ab53bac75399caa99756e5d2bb7f2769529d36da..281cdd05c7228c735d740cb5ecb646da7d590ce0 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1261,10 +1261,8 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
    case GL_RGB8I_EXT:
    case GL_RGB16I_EXT:
    case GL_RGB32I_EXT:
-      return ctx->Version >= 30
-         || (_mesa_is_desktop_gl(ctx) &&
-             ctx->Extensions.EXT_texture_integer) ? GL_RGB : 0;
-
+      return _mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_integer
+         ? GL_RGB : 0;
    case GL_R8UI:
    case GL_R8I:
    case GL_R16UI: