Tweak handling flags in PipelineState::set_framebuffer

Viewports work slightly differently on Vulkan, so set only the
framebuffer flag here and instead check both when applying the state.

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 262dd26b596b95fb600aea40d5995d0fe08fd56e..78db195d4b28d891a484b3d42268577973e065be 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -69,7 +69,7 @@ void PipelineState::set(T &target, T value, unsigned flag)
 
 void PipelineState::set_framebuffer(const Framebuffer *f)
 {
-       set(framebuffer, f, FRAMEBUFFER|VIEWPORT);
+       set(framebuffer, f, FRAMEBUFFER);
 }
 
 void PipelineState::set_viewport(const Rect *v)
@@ -172,7 +172,7 @@ void PipelineState::apply(unsigned mask) const
                }
        }
 
-       if(mask&VIEWPORT)
+       if(mask&(VIEWPORT|FRAMEBUFFER))
        {
                if(viewport)
                        glViewport(viewport->left, viewport->bottom, viewport->width, viewport->height);