summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2016-04-07 19:52:02 -0400
committerGravatar bunnei2016-04-07 19:52:02 -0400
commit6e750ae12dd0d48d8e5e86e9452cefcd4a828d1d (patch)
tree658d45ce914dcae4be287cf4b392055f31cb0974 /src
parentMerge pull request #1577 from JamePeng/update-apta-func (diff)
parentOpenGL: Fix a double framebuffer completeness checks. (diff)
downloadyuzu-6e750ae12dd0d48d8e5e86e9452cefcd4a828d1d.tar.gz
yuzu-6e750ae12dd0d48d8e5e86e9452cefcd4a828d1d.tar.xz
yuzu-6e750ae12dd0d48d8e5e86e9452cefcd4a828d1d.zip
Merge pull request #1639 from linkmauve/fix-double-framebuffer-check
OpenGL: Fix a double framebuffer completeness checks.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index cc6b3aeab..4fdf93a3e 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -139,8 +139,9 @@ void RasterizerOpenGL::InitObjects() {
139 } 139 }
140 state.Apply(); 140 state.Apply();
141 141
142 ASSERT_MSG(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, 142 GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
143 "OpenGL rasterizer framebuffer setup failed, status %X", glCheckFramebufferStatus(GL_FRAMEBUFFER)); 143 ASSERT_MSG(status == GL_FRAMEBUFFER_COMPLETE,
144 "OpenGL rasterizer framebuffer setup failed, status %X", status);
144} 145}
145 146
146void RasterizerOpenGL::Reset() { 147void RasterizerOpenGL::Reset() {
@@ -808,8 +809,9 @@ void RasterizerOpenGL::SyncFramebuffer() {
808 ReloadDepthBuffer(); 809 ReloadDepthBuffer();
809 } 810 }
810 811
811 ASSERT_MSG(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, 812 GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
812 "OpenGL rasterizer framebuffer setup failed, status %X", glCheckFramebufferStatus(GL_FRAMEBUFFER)); 813 ASSERT_MSG(status == GL_FRAMEBUFFER_COMPLETE,
814 "OpenGL rasterizer framebuffer setup failed, status %X", status);
813} 815}
814 816
815void RasterizerOpenGL::SyncCullMode() { 817void RasterizerOpenGL::SyncCullMode() {