X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fpipelinestate_backend.cpp;h=3117a271c405308b8b0a628a9f722e4dd8fcd02f;hb=2f2048a186c6a10f04999d8a01a3bcf63adc7c75;hp=9616b18be326d99cbccdfa0c30ad0f195732a60f;hpb=a6d84d93ce8c0adde41679a6c6852335e19ada17;p=libs%2Fgl.git diff --git a/source/backends/opengl/pipelinestate_backend.cpp b/source/backends/opengl/pipelinestate_backend.cpp index 9616b18b..3117a271 100644 --- a/source/backends/opengl/pipelinestate_backend.cpp +++ b/source/backends/opengl/pipelinestate_backend.cpp @@ -36,12 +36,11 @@ void OpenGLPipelineState::apply() const { const PipelineState &self = *static_cast(this); Device &device = Device::get_current(); - unsigned mask = changes; if(applied_to && applied_to!=&device) { applied_to->get_state().last_pipeline = 0; - mask = ~0U; + changes = ~0U; } OpenGLDeviceState &dev_state = device.get_state(); @@ -52,10 +51,10 @@ void OpenGLPipelineState::apply() const { if(dev_state.last_pipeline) dev_state.last_pipeline->applied_to = 0; - mask = ~0U; + changes = ~0U; } - if(mask&PipelineState::FRAMEBUFFER) + if(changes&PipelineState::FRAMEBUFFER) { const Framebuffer *framebuffer = self.framebuffer; glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->id : 0); @@ -66,26 +65,29 @@ void OpenGLPipelineState::apply() const } } - if(mask&(PipelineState::VIEWPORT|PipelineState::FRAMEBUFFER)) - { - if(const Rect *viewport = self.viewport) - glViewport(viewport->left, viewport->bottom, viewport->width, viewport->height); - else if(const Framebuffer *framebuffer = self.framebuffer) - glViewport(0, 0, framebuffer->get_width(), framebuffer->get_height()); - } - - if(mask&PipelineState::SCISSOR) - { - if(const Rect *scissor = self.scissor) + if(changes&(PipelineState::VIEWPORT|PipelineState::SCISSOR|PipelineState::FRAMEBUFFER)) + if(const Framebuffer *framebuffer = self.framebuffer) { - glEnable(GL_SCISSOR_TEST); - glScissor(scissor->left, scissor->bottom, scissor->width, scissor->height); + Rect fb_rect = framebuffer->get_rect(); + if(changes&(PipelineState::VIEWPORT|PipelineState::FRAMEBUFFER)) + { + Rect viewport = fb_rect.intersect(self.viewport); + glViewport(viewport.left, viewport.bottom, viewport.width, viewport.height); + } + if(changes&(PipelineState::SCISSOR|PipelineState::FRAMEBUFFER)) + { + Rect scissor = fb_rect.intersect(self.scissor); + if(scissor!=fb_rect) + { + glEnable(GL_SCISSOR_TEST); + glScissor(scissor.left, scissor.bottom, scissor.width, scissor.height); + } + else + glDisable(GL_SCISSOR_TEST); + } } - else - glDisable(GL_SCISSOR_TEST); - } - if(mask&PipelineState::SHPROG) + if(changes&PipelineState::SHPROG) { glUseProgram(self.shprog ? self.shprog->id : 0); @@ -103,16 +105,16 @@ void OpenGLPipelineState::apply() const } } - if(mask&PipelineState::UNIFORMS) + if(changes&PipelineState::UNIFORMS) { for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) - if(u.changed || mask==~0U) + if(u.changed || changes==~0U) { - if(u.block) + if(u.used) { if(u.binding>=0) { - glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size()); + glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.buffer->id, u.block->get_offset(), u.block->get_data_size()); dev_state.bound_uniform_blocks[u.binding] = 1; } else if(u.binding==ReflectData::DEFAULT_BLOCK && self.shprog) @@ -127,12 +129,12 @@ void OpenGLPipelineState::apply() const } } - if(mask&PipelineState::TEXTURES) + if(changes&PipelineState::TEXTURES) { for(const PipelineState::BoundTexture &t: self.textures) - if(t.changed || mask==~0U) + if(t.changed || changes==~0U) { - if(t.texture && t.sampler) + if(t.used) { if(ARB_direct_state_access) glBindTextureUnit(t.binding, t.texture->id); @@ -154,7 +156,7 @@ void OpenGLPipelineState::apply() const } } - if(mask&PipelineState::VERTEX_SETUP) + if(changes&PipelineState::VERTEX_SETUP) { const VertexSetup *vertex_setup = self.vertex_setup; glBindVertexArray(vertex_setup ? vertex_setup->id : 0); @@ -174,7 +176,7 @@ void OpenGLPipelineState::apply() const } } - if(mask&PipelineState::FACE_CULL) + if(changes&PipelineState::FACE_CULL) { glFrontFace(self.front_face==CLOCKWISE ? GL_CW : GL_CCW); @@ -187,43 +189,43 @@ void OpenGLPipelineState::apply() const glDisable(GL_CULL_FACE); } - if(mask&PipelineState::DEPTH_TEST) + if(changes&PipelineState::DEPTH_TEST) { - const DepthTest *depth_test = self.depth_test; - if(depth_test && depth_test->enabled) + const DepthTest &depth_test = self.depth_test; + if(depth_test.enabled) { glEnable(GL_DEPTH_TEST); - glDepthFunc(get_gl_predicate(depth_test->compare)); + glDepthFunc(get_gl_predicate(depth_test.compare)); } else glDisable(GL_DEPTH_TEST); - glDepthMask(!depth_test || depth_test->write); + glDepthMask(depth_test.write); } - if(mask&PipelineState::STENCIL_TEST) + if(changes&PipelineState::STENCIL_TEST) { - const StencilTest *stencil_test = self.stencil_test; - if(stencil_test && stencil_test->enabled) + const StencilTest &stencil_test = self.stencil_test; + if(stencil_test.enabled) { glEnable(GL_STENCIL_TEST); - glStencilFunc(get_gl_predicate(stencil_test->compare), stencil_test->reference, 0xFFFFFFFF); - glStencilOp(get_gl_stencil_op(stencil_test->stencil_fail_op), get_gl_stencil_op(stencil_test->depth_fail_op), get_gl_stencil_op(stencil_test->depth_pass_op)); + glStencilFunc(get_gl_predicate(stencil_test.compare), stencil_test.reference, 0xFFFFFFFF); + glStencilOp(get_gl_stencil_op(stencil_test.stencil_fail_op), get_gl_stencil_op(stencil_test.depth_fail_op), get_gl_stencil_op(stencil_test.depth_pass_op)); } else glDisable(GL_STENCIL_TEST); } - if(mask&PipelineState::BLEND) + if(changes&PipelineState::BLEND) { - const Blend *blend = self.blend; - if(blend && blend->enabled) + const Blend &blend = self.blend; + if(blend.enabled) { glEnable(GL_BLEND); - glBlendEquation(get_gl_blend_equation(blend->equation)); - glBlendFunc(get_gl_blend_factor(blend->src_factor), get_gl_blend_factor(blend->dst_factor)); - glBlendColor(blend->constant.r, blend->constant.g, blend->constant.b, blend->constant.a); - ColorWriteMask cw = blend->write_mask; + glBlendEquation(get_gl_blend_equation(blend.equation)); + glBlendFunc(get_gl_blend_factor(blend.src_factor), get_gl_blend_factor(blend.dst_factor)); + glBlendColor(blend.constant.r, blend.constant.g, blend.constant.b, blend.constant.a); + ColorWriteMask cw = blend.write_mask; glColorMask((cw&WRITE_RED)!=0, (cw&WRITE_GREEN)!=0, (cw&WRITE_BLUE)!=0, (cw&WRITE_ALPHA)!=0); } else