ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore checking for framebuffer completion

Browse Source
This commit is contained in:
Deve 2016-07-05 00:28:25 +02:00
parent 4132177132
commit 0f318ab1ba
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/glwrap.cpp
View File

@ -279,8 +279,8 @@ FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, size_t w, size_t h,
for (unsigned i = 0; i < RTTs.size(); i++)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, RTTs[i], 0);
}
//~ GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER);
//~ assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER);
assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
}
FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, GLuint DS, size_t w,
@ -304,8 +304,8 @@ FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, GLuint DS, size_t w,
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, RTTs[i], 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, DS, 0);
}
//~ GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER);
//~ assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER);
assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
if (layered)
glGenFramebuffers(1, &fbolayer);
}

4
src/graphics/skybox.cpp
View File

@ -283,8 +283,8 @@ void Skybox::generateSpecularCubemap()
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
m_specular_probe, level);
//~ GLuint status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
//~ assert(status == GL_FRAMEBUFFER_COMPLETE);
GLuint status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
assert(status == GL_FRAMEBUFFER_COMPLETE);
SpecularIBLGenerator::getInstance()->setTextureUnits(m_cube_map);
SpecularIBLGenerator::getInstance()->setUniforms(M[face],