From 505b7711a4adf5f9a71c14f5898fb69c8314d9d9 Mon Sep 17 00:00:00 2001 From: Nicolas Capens Date: Tue, 14 Jun 2016 01:08:12 -0400 Subject: [PATCH] Fix GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT query for OpenGL ES 2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It is part of GL_EXT_color_buffer_half_float. Change-Id: Icaba1efed8b4e5ad97e583ebdad7b777cf4c7ad8 Reviewed-on: https://swiftshader-review.googlesource.com/5596 Reviewed-by: Alexis Hétu Reviewed-by: Nicolas Capens Tested-by: Nicolas Capens --- src/OpenGL/libGLESv2/libGLESv2.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp index 2a14613dd..775223844 100644 --- a/src/OpenGL/libGLESv2/libGLESv2.cpp +++ b/src/OpenGL/libGLESv2/libGLESv2.cpp @@ -2987,16 +2987,13 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu else return error(GL_INVALID_ENUM); break; case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE: - if(clientVersion >= 3) + // case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT: // GL_EXT_color_buffer_half_float + if(attachment == GL_DEPTH_STENCIL_ATTACHMENT) { - if(attachment == GL_DEPTH_STENCIL_ATTACHMENT) - { - return error(GL_INVALID_OPERATION); - } - - *params = sw2es::GetComponentType(renderbuffer->getInternalFormat(), attachment); + return error(GL_INVALID_OPERATION); } - else return error(GL_INVALID_ENUM); + + *params = sw2es::GetComponentType(renderbuffer->getInternalFormat(), attachment); break; case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING: if(clientVersion >= 3) -- 2.11.0