Skip to content

S
swiftshader
Commit dcbabfa7 by Alexis Hetu Committed by Alexis Hétu
Options

Fixed Framebuffer attachment checks

Some checks in Framebuffer related functions were still ES2 only. Made some modification to fix the checks for ES3. Change-Id: Iaef6133179ea830dd599a5d66bc9698032085569 Reviewed-on: https://swiftshader-review.googlesource.com/3690Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 0f6c0300
Showing with 4 additions and 20 deletions
src/OpenGL/libGLESv2/libGLESv2.cpp
...@@ -2250,16 +2250,6 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL ...@@ -2250,16 +2250,6 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
} }
switch(attachment)
{
case GL_COLOR_ATTACHMENT0:
case GL_DEPTH_ATTACHMENT:
case GL_STENCIL_ATTACHMENT:
break;
default:
return error(GL_INVALID_ENUM);
}
es2::Context *context = es2::getContext(); es2::Context *context = es2::getContext();
if(context) if(context)
...@@ -2367,6 +2357,8 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL ...@@ -2367,6 +2357,8 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
break; break;
case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture, level); break; case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture, level); break;
case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture, level); break; case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture, level); break;
default:
return error(GL_INVALID_ENUM);
} }
} }
} }
...@@ -7311,16 +7303,6 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, ...@@ -7311,16 +7303,6 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
} }
switch(attachment)
{
case GL_COLOR_ATTACHMENT0:
case GL_DEPTH_ATTACHMENT:
case GL_STENCIL_ATTACHMENT:
break;
default:
return error(GL_INVALID_ENUM);
}
es2::Context *context = es2::getContext(); es2::Context *context = es2::getContext();
if(context) if(context)
...@@ -7412,6 +7394,8 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget, ...@@ -7412,6 +7394,8 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
break; break;
case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture); break; case GL_DEPTH_ATTACHMENT: framebuffer->setDepthbuffer(textarget, texture); break;
case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture); break; case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture); break;
default:
return error(GL_INVALID_ENUM);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment