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

Fix a few compiler warnings (#2854)

Browse Source 
* Fix compiler warnings in gpwrap.cpp

* Fix compiler warning in skybox.cpp
This commit is contained in:
QwertyChouskie 2017-06-11 12:59:12 -07:00 committed by auriamg
parent e11641cd43
commit be00283b2e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/glwrap.cpp
View File

@ -245,8 +245,7 @@ FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, size_t w, size_t h,
for (unsigned i = 0; i < RTTs.size(); i++) for (unsigned i = 0; i < RTTs.size(); i++)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, RTTs[i], 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, RTTs[i], 0);
} }
GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER); assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE_EXT);
assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
} }
FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, GLuint DS, size_t w, FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, GLuint DS, size_t w,
@ -270,8 +269,7 @@ 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_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, RTTs[i], 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, DS, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, DS, 0);
} }
GLenum result = glCheckFramebufferStatus(GL_FRAMEBUFFER); assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE_EXT);
assert(result == GL_FRAMEBUFFER_COMPLETE_EXT);
if (layered) if (layered)
glGenFramebuffers(1, &fbolayer); glGenFramebuffers(1, &fbolayer);
} }

3
src/graphics/skybox.cpp
View File

@ -279,8 +279,7 @@ void Skybox::generateSpecularCubemap()
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
m_specular_probe, level); m_specular_probe, level);
GLuint status = glCheckFramebufferStatus(GL_FRAMEBUFFER); assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
assert(status == GL_FRAMEBUFFER_COMPLETE);
SpecularIBLGenerator::getInstance() SpecularIBLGenerator::getInstance()
->setTextureUnits(m_cube_map, sample_texture); ->setTextureUnits(m_cube_map, sample_texture);