From b3efaf5ca35a1962e7cbe972daadf5227d8cbd9a Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Wed, 16 Nov 2016 12:07:31 +0000 Subject: [PATCH] Fixed bug in TextureSet::GetTextureCount() GetTextureCount() returned the number of images so it would always return 0 if using NewTextures. Change-Id: Ie7e1971df6d58954ad651200f04f34a076b9156e --- automated-tests/src/dali/utc-Dali-TextureSet.cpp | 22 +++++++++++++++++++++- dali/internal/event/rendering/texture-set-impl.cpp | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-TextureSet.cpp b/automated-tests/src/dali/utc-Dali-TextureSet.cpp index 334a2bf..cc20a6c 100644 --- a/automated-tests/src/dali/utc-Dali-TextureSet.cpp +++ b/automated-tests/src/dali/utc-Dali-TextureSet.cpp @@ -313,7 +313,7 @@ int UtcDaliTextureSetGetSampler(void) END_TEST; } -int UtcDaliTextureSetGetTextureCount(void) +int UtcDaliTextureGetTextureCount0(void) { TestApplication application; @@ -332,3 +332,23 @@ int UtcDaliTextureSetGetTextureCount(void) END_TEST; } + +int UtcDaliTextureGetTextureCount1(void) +{ + TestApplication application; + + TextureSet textureSet = CreateTextureSet(); + DALI_TEST_EQUALS( textureSet.GetTextureCount(), 0u, TEST_LOCATION ); + + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 64, 64 ); + textureSet.SetTexture( 0u, texture ); + DALI_TEST_EQUALS( textureSet.GetTextureCount(), 1u, TEST_LOCATION ); + + textureSet.SetTexture( 1u, texture ); + DALI_TEST_EQUALS( textureSet.GetTextureCount(), 2u, TEST_LOCATION ); + + textureSet.SetSampler( 2u, Sampler::New() ); + DALI_TEST_EQUALS( textureSet.GetTextureCount(), 3u, TEST_LOCATION ); + + END_TEST; +} diff --git a/dali/internal/event/rendering/texture-set-impl.cpp b/dali/internal/event/rendering/texture-set-impl.cpp index 110eece..428ab9e 100644 --- a/dali/internal/event/rendering/texture-set-impl.cpp +++ b/dali/internal/event/rendering/texture-set-impl.cpp @@ -184,7 +184,7 @@ Sampler* TextureSet::GetSampler( size_t index ) const size_t TextureSet::GetTextureCount() const { - return mImages.size(); + return mSamplers.size(); } const SceneGraph::TextureSet* TextureSet::GetTextureSetSceneObject() const -- 2.7.4