X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.cpp;h=b8abd9b2e1c9fff4ab14b09c50b96b681133e880;hp=6f3231d2131bddc721e657ea1bd9a8d24e9c5bce;hb=bdeb351ea382b8cd49404cf197a1945c24289f79;hpb=d8a4571d975ae061fe32f1d098d07ccc94604729 diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 6f3231d..b8abd9b 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -518,10 +518,10 @@ void ImageVisual::CreateRenderer( TextureSet& textureSet ) { TextureManager& textureManager = mFactoryCache.GetTextureManager(); - uint32_t opaqueElementsCount {0u}; - uint32_t transparentElementsCount {0u}; - geometry = textureManager.GetRenderGeometry(mTextureId, opaqueElementsCount, transparentElementsCount); - if(!opaqueElementsCount && !transparentElementsCount) + uint32_t firstElementCount {0u}; + uint32_t secondElementCount {0u}; + geometry = textureManager.GetRenderGeometry(mTextureId, firstElementCount, secondElementCount); + if(!firstElementCount && !secondElementCount) { geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); } @@ -863,28 +863,28 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur // use geometry if needed if( loadingSuccess ) { - uint32_t opaqueElements{0u}; - uint32_t transparentElements{0u}; - auto geometry = mFactoryCache.GetTextureManager().GetRenderGeometry(mTextureId, opaqueElements, transparentElements); + uint32_t firstElementCount{0u}; + uint32_t secondElementCount{0u}; + auto geometry = mFactoryCache.GetTextureManager().GetRenderGeometry(mTextureId, firstElementCount, secondElementCount); if (mImpl->mRenderer && geometry) { mImpl->mRenderer.SetGeometry(geometry); Dali::DevelRenderer::DrawCommand drawCommand{}; drawCommand.drawType = DevelRenderer::DrawType::INDEXED; - if (opaqueElements) + if (firstElementCount) { drawCommand.firstIndex = 0; - drawCommand.elementCount = opaqueElements; - drawCommand.queue = 0; + drawCommand.elementCount = firstElementCount; + drawCommand.queue = DevelRenderer::RENDER_QUEUE_OPAQUE; DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand); } - if (transparentElements) + if (secondElementCount) { - drawCommand.firstIndex = opaqueElements; - drawCommand.elementCount = transparentElements; - drawCommand.queue = 1; + drawCommand.firstIndex = firstElementCount; + drawCommand.elementCount = secondElementCount; + drawCommand.queue = DevelRenderer::RENDER_QUEUE_TRANSPARENT; DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand); } }