From 255aa109c1bca211ab6bbb5431fb462466f15ee5 Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Fri, 17 Jun 2016 09:27:42 +0100 Subject: [PATCH] Revert bug fix in renderer Change-Id: Ie4154b9522943df483bd68226e71ddf2b80163b4 --- dali/internal/render/renderers/render-renderer.cpp | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dali/internal/render/renderers/render-renderer.cpp b/dali/internal/render/renderers/render-renderer.cpp index 9e83849..5400c12 100644 --- a/dali/internal/render/renderers/render-renderer.cpp +++ b/dali/internal/render/renderers/render-renderer.cpp @@ -369,23 +369,29 @@ bool Renderer::BindTextures( Context& context, SceneGraph::TextureCache& texture Internal::Texture* texture = textureCache.GetTexture( textureId ); if( texture ) { - result = program.GetSamplerUniformLocation( i, uniformLocation ) && - textureCache.BindTexture( texture, textureId, GL_TEXTURE_2D, (TextureUnit)textureUnit ); + result = textureCache.BindTexture( texture, textureId, GL_TEXTURE_2D, (TextureUnit)textureUnit ); - if( result && Program::UNIFORM_UNKNOWN != uniformLocation ) + if( result ) { - program.SetUniform1i( uniformLocation, textureUnit ); + GLint uniformLocation; - unsigned int samplerBitfield(ImageSampler::DEFAULT_BITFIELD); - const Render::Sampler* sampler( samplers[i] ); - if( sampler ) + //TODO : This is a bug, result variable is being shadowed. Fix it! + bool result = program.GetSamplerUniformLocation( i, uniformLocation ); + if( result && Program::UNIFORM_UNKNOWN != uniformLocation ) { - samplerBitfield = sampler->mBitfield; - } + program.SetUniform1i( uniformLocation, textureUnit ); - texture->ApplySampler( (TextureUnit)textureUnit, samplerBitfield ); + unsigned int samplerBitfield(ImageSampler::DEFAULT_BITFIELD); + const Render::Sampler* sampler( samplers[i] ); + if( sampler ) + { + samplerBitfield = sampler->mBitfield; + } - ++textureUnit; + texture->ApplySampler( (TextureUnit)textureUnit, samplerBitfield ); + + ++textureUnit; + } } } } -- 2.7.4