Cleaned up Canvas::checkCreateStencil a bit.

This commit is contained in:
Alex Szpakowski
2016-02-24 18:36:34 -04:00
parent 62b642f28a
commit 4ca6106d7a
+7 -8
View File
@@ -552,18 +552,18 @@ bool Canvas::checkCreateStencil()
gl.bindFramebuffer(GL_FRAMEBUFFER, fbo); gl.bindFramebuffer(GL_FRAMEBUFFER, fbo);
GLenum format = GL_STENCIL_INDEX8; GLenum format = GL_STENCIL_INDEX8;
GLenum attachment = GL_STENCIL_ATTACHMENT; std::vector<GLenum> attachments = {GL_STENCIL_ATTACHMENT};
// Prefer a combined depth/stencil buffer. // Prefer a combined depth/stencil buffer.
if (GLAD_ES_VERSION_3_0 || GLAD_VERSION_3_0 || GLAD_ARB_framebuffer_object) if (GLAD_ES_VERSION_3_0 || GLAD_VERSION_3_0 || GLAD_ARB_framebuffer_object)
{ {
format = GL_DEPTH24_STENCIL8; format = GL_DEPTH24_STENCIL8;
attachment = GL_DEPTH_STENCIL_ATTACHMENT; attachments = {GL_DEPTH_STENCIL_ATTACHMENT};
} }
else if (GLAD_EXT_packed_depth_stencil || GLAD_OES_packed_depth_stencil) else if (GLAD_EXT_packed_depth_stencil || GLAD_OES_packed_depth_stencil)
{ {
format = GL_DEPTH24_STENCIL8_OES; format = GL_DEPTH24_STENCIL8;
attachment = GL_DEPTH_ATTACHMENT; attachments = {GL_DEPTH_ATTACHMENT, GL_STENCIL_ATTACHMENT};
} }
glGenRenderbuffers(1, &depth_stencil); glGenRenderbuffers(1, &depth_stencil);
@@ -574,10 +574,9 @@ bool Canvas::checkCreateStencil()
else else
glRenderbufferStorage(GL_RENDERBUFFER, format, width, height); glRenderbufferStorage(GL_RENDERBUFFER, format, width, height);
// Attach the stencil buffer to the framebuffer object. // Attach the buffer to the framebuffer object.
glFramebufferRenderbuffer(GL_FRAMEBUFFER, attachment, GL_RENDERBUFFER, depth_stencil); for (GLenum attachment : attachments)
if (format == GL_DEPTH24_STENCIL8_OES) glFramebufferRenderbuffer(GL_FRAMEBUFFER, attachment, GL_RENDERBUFFER, depth_stencil);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, depth_stencil);
glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0);