X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fpipelinestate_backend.cpp;h=78ba7978042dd84587480c7128a10d1df6fd1378;hp=9616b18be326d99cbccdfa0c30ad0f195732a60f;hb=58c5647c775e38dd08a64ad435dfe0673a62fcd1;hpb=02cc42fc113bcc17a28ff9d93a9e4b3f26fbb91f diff --git a/source/backends/opengl/pipelinestate_backend.cpp b/source/backends/opengl/pipelinestate_backend.cpp index 9616b18b..78ba7978 100644 --- a/source/backends/opengl/pipelinestate_backend.cpp +++ b/source/backends/opengl/pipelinestate_backend.cpp @@ -108,7 +108,7 @@ void OpenGLPipelineState::apply() const for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) if(u.changed || mask==~0U) { - if(u.block) + if(u.used) { if(u.binding>=0) { @@ -132,7 +132,7 @@ void OpenGLPipelineState::apply() const for(const PipelineState::BoundTexture &t: self.textures) if(t.changed || mask==~0U) { - if(t.texture && t.sampler) + if(t.used) { if(ARB_direct_state_access) glBindTextureUnit(t.binding, t.texture->id);