Mesa (master): mesa: Enables GL_RGB and GL_RGBA unsized internal formats for OpenGL ES 3.0
Iago Toral Quiroga
itoral at kemper.freedesktop.org
Tue Dec 9 10:46:06 UTC 2014
Module: Mesa
Branch: master
Commit: 78942787170615c9333810cf3a4819a13c9eb8e8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=78942787170615c9333810cf3a4819a13c9eb8e8
Author: Eduardo Lima Mitev <elima at igalia.com>
Date: Thu Nov 20 14:02:46 2014 +0100
mesa: Enables GL_RGB and GL_RGBA unsized internal formats for OpenGL ES 3.0
GL_RGB and GL_RGBA are valid internal formats on a GLES3 profile. See
"Table 1. Unsized Internal Formats" at
https://www.khronos.org/opengles/sdk/docs/man3/html/glTexImage2D.xhtml.
Fixes 2 dEQP tests:
- dEQP-GLES3.functional.state_query.internal_format.rgb_samples
- dEQP-GLES3.functional.state_query.internal_format.rgba_samples
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/main/fbobject.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index f5c11c4..4c3c157 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1430,6 +1430,9 @@ _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:
@@ -1444,6 +1447,9 @@ _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:
More information about the mesa-commit
mailing list