summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/fbobject.c
diff options
context:
space:
mode:
authorMike Mason <[email protected]>2015-01-12 14:37:28 -0800
committerChad Versace <[email protected]>2015-01-13 11:23:46 -0800
commit90d2a8519307effd4081baadf16067073f2aae49 (patch)
tree86fcdf396aef2b1595692e9d8386846bf87a4c56 /src/mesa/main/fbobject.c
parent876550ff97b9c97df02f9bf0e29198be963d8e89 (diff)
mesa: Enable GL_RGB/GL_RGBA in GLES3 glGetInternalformativ
Removes commit 7894278 changes and moves fix to _mesa_GetInternalformativ(). The original commit enabled the GL_RGB and GL_RGBA unsized internal formats as valid for render buffers in GLES3, but this is incorrect. They should have only been enabled for GetInternalformativ() Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88079 Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/main/fbobject.c')
-rw-r--r--src/mesa/main/fbobject.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index f4b0d6dc0b7..80dc35394dd 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1455,9 +1455,6 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
case GL_RGB8:
return GL_RGB;
case GL_RGB:
- if (_mesa_is_gles3(ctx))
- return GL_RGB;
- /* fallthrough */
case GL_R3_G3_B2:
case GL_RGB4:
case GL_RGB5:
@@ -1472,9 +1469,6 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
case GL_RGBA8:
return GL_RGBA;
case GL_RGBA:
- if (_mesa_is_gles3(ctx))
- return GL_RGBA;
- /* fallthrough */
case GL_RGBA2:
case GL_RGBA12:
case GL_RGBA16: