From 6b3a2fb975edf8ae93c44c6601350625a61b832b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 26 Mar 2018 08:47:30 +0200 Subject: [PATCH] Fix Framebuffer::checkStatus() on WebGL 1. --- doc/changelog.dox | 2 ++ src/Magnum/Implementation/FramebufferState.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 2439d8979..a250f97db 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -82,6 +82,8 @@ See also: strings. See the @cpp "emscripten-pthreads-broken-unicode-shader-sources" @ce workaround description for details. - @ref Attribute::DataType::HalfFloat was not available on WebGL 2 by mistake +- A wrong code path for @ref Framebuffer::checkStatus() was selected on WebGL + 1 by mistake @subsection changelog-latest-deprecated Deprecated APIs diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp index 00ea18394..c40ec8849 100644 --- a/src/Magnum/Implementation/FramebufferState.cpp +++ b/src/Magnum/Implementation/FramebufferState.cpp @@ -185,10 +185,8 @@ FramebufferState::FramebufferState(Context& context, std::vector& e #ifndef MAGNUM_TARGET_WEBGL bindImplementation = &Framebuffer::bindImplementationDefault; bindInternalImplementation = &Framebuffer::bindImplementationDefault; - #endif checkStatusImplementation = &Framebuffer::checkStatusImplementationDefault; - #ifndef MAGNUM_TARGET_WEBGL if(context.isExtensionSupported()) { extensions.push_back(Extensions::GL::ANGLE::framebuffer_blit::string()); @@ -211,6 +209,8 @@ FramebufferState::FramebufferState(Context& context, std::vector& e bindInternalImplementation = &Framebuffer::bindImplementationSingle; checkStatusImplementation = &Framebuffer::checkStatusImplementationSingle; } + #else + checkStatusImplementation = &Framebuffer::checkStatusImplementationSingle; #endif #ifndef MAGNUM_TARGET_WEBGL