From 82d756f3afbbaddbf89817b3ab88f684ec223783 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 21 May 2016 20:26:47 -0400 Subject: [PATCH] mesa: allow GL_FRAMEBUFFER_DEFAULT_LAYERS to be queried with ES geometry When we have the geometry extensions, enable querying of the new param. Signed-off-by: Ilia Mirkin Reviewed-by: Anuj Phogat --- 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 de28606580f..44696c0409f 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.30.2