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

[Ian Romanick]

Module: Mesa
Branch: master
Commit: a86d629799a45ddc8cde94e9304283fc1858c679
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a86d629799a45ddc8cde94e9304283fc1858c679

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Dec  3 11:55:12 2012 -0800

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

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

---

 src/mesa/main/fbobject.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index ab53bac..281cdd0 100644
--- 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: