From a86d629799a45ddc8cde94e9304283fc1858c679 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 3 Dec 2012 11:55:12 -0800 Subject: [PATCH] mesa: Disallow R, RG, or RGB integer and unsigned formats in OpenGL ES 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Romanick Reviewed-by: Marek Olšák Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/mesa/main/fbobject.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index ab53bac7539..281cdd05c72 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: -- 2.30.2