[Mesa-dev] [PATCH 2/2] mesa: allow GL_FRAMEBUFFER_DEFAULT_LAYERS to be queried with ES geometry
Ilia Mirkin
imirkin at alum.mit.edu
Mon May 23 17:02:05 UTC 2016
When we have the geometry extensions, enable querying of the new param.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/mesa/main/fbobject.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index b751bf0..a3809f2 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1397,7 +1397,7 @@ framebuffer_parameteri(struct gl_context *ctx, struct gl_framebuffer *fb,
* According to the OpenGL ES 3.1 specification section 9.2.1, the
* GL_FRAMEBUFFER_DEFAULT_LAYERS parameter name is not supported.
*/
- if (_mesa_is_gles31(ctx)) {
+ if (_mesa_is_gles31(ctx) && !ctx->Extensions.OES_geometry_shader) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=0x%x)", func, pname);
break;
}
@@ -1470,7 +1470,7 @@ get_framebuffer_parameteriv(struct gl_context *ctx, struct gl_framebuffer *fb,
* According to the OpenGL ES 3.1 specification section 9.2.3, the
* GL_FRAMEBUFFER_LAYERS parameter name is not supported.
*/
- if (_mesa_is_gles31(ctx)) {
+ if (_mesa_is_gles31(ctx) && !ctx->Extensions.OES_geometry_shader) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=0x%x)", func, pname);
break;
}
--
2.7.3
More information about the mesa-dev
mailing list