AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-06-22 14:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

GL depth clear fix

Browse Source
This commit is contained in:
Jack Andersen 2016-04-01 17:55:07 -10:00
parent 229b0b28a8
commit 59371f5fed
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/graphicsdev/GL.cpp
View File

@ -886,9 +886,9 @@ struct GLCommandQueue : IGraphicsCommandQueue
static void ConfigureFBO(GLTextureR* tex) static void ConfigureFBO(GLTextureR* tex)
{ {
glGenFramebuffers(1, &tex->m_fbo); glGenFramebuffers(1, &tex->m_fbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, tex->m_fbo); glBindFramebuffer(GL_FRAMEBUFFER, tex->m_fbo);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex->m_texs[0], 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex->m_texs[0], 0);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, tex->m_texs[1], 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, tex->m_texs[1], 0);
} }
static void RenderingWorker(GLCommandQueue* self) static void RenderingWorker(GLCommandQueue* self)
@ -953,6 +953,7 @@ struct GLCommandQueue : IGraphicsCommandQueue
} }
std::vector<Command>& cmds = self->m_cmdBufs[self->m_drawBuf]; std::vector<Command>& cmds = self->m_cmdBufs[self->m_drawBuf];
GLenum currentPrim = GL_TRIANGLES; GLenum currentPrim = GL_TRIANGLES;
const GLTextureR* currentTarget = nullptr;
for (const Command& cmd : cmds) for (const Command& cmd : cmds)
{ {
switch (cmd.m_op) switch (cmd.m_op)
@ -968,9 +969,10 @@ struct GLCommandQueue : IGraphicsCommandQueue
{ {
const GLTextureR* tex = static_cast<const GLTextureR*>(cmd.target); const GLTextureR* tex = static_cast<const GLTextureR*>(cmd.target);
if (!tex) if (!tex)
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
else else
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, tex->m_fbo); glBindFramebuffer(GL_FRAMEBUFFER, tex->m_fbo);
currentTarget = tex;
break; break;
} }
case Command::Op::SetViewport: case Command::Op::SetViewport:
@ -991,8 +993,25 @@ struct GLCommandQueue : IGraphicsCommandQueue
glClearColor(cmd.rgba[0], cmd.rgba[1], cmd.rgba[2], cmd.rgba[3]); glClearColor(cmd.rgba[0], cmd.rgba[1], cmd.rgba[2], cmd.rgba[3]);
break; break;
case Command::Op::ClearTarget: case Command::Op::ClearTarget:
glClear(cmd.flags); {
if (!currentTarget)
break;
GLbitfield glFlags = cmd.flags & ~GL_DEPTH_BUFFER_BIT;
if (glFlags)
glClear(glFlags);
if (cmd.flags & GL_DEPTH_BUFFER_BIT)
{
size_t texels = currentTarget->m_width * currentTarget->m_height;
if (DepthInitializer.size() < texels)
DepthInitializer.resize(texels, ~0);
glBindTexture(GL_TEXTURE_2D, currentTarget->m_texs[1]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24,
currentTarget->m_width, currentTarget->m_height,
0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,
DepthInitializer.data());
}
break; break;
}
case Command::Op::Draw: case Command::Op::Draw:
glDrawArrays(currentPrim, cmd.start, cmd.count); glDrawArrays(currentPrim, cmd.start, cmd.count);
break; break;