projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making DALi public API typesafe using guaranteed types; uint8_t, uint32_t
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
rendering
/
texture-set.cpp
diff --git
a/dali/public-api/rendering/texture-set.cpp
b/dali/public-api/rendering/texture-set.cpp
index
261e597
..
cc48b11
100644
(file)
--- a/
dali/public-api/rendering/texture-set.cpp
+++ b/
dali/public-api/rendering/texture-set.cpp
@@
-61,17
+61,17
@@
void TextureSet::SetTexture( size_t index, Texture texture )
if( texture )
{
Internal::TexturePtr texturePtr( &GetImplementation( texture ) );
if( texture )
{
Internal::TexturePtr texturePtr( &GetImplementation( texture ) );
- GetImplementation(*this).SetTexture(
index, texturePtr );
+ GetImplementation(*this).SetTexture(
static_cast<uint32_t>( index ), texturePtr ); // only support 4,294,967,295 textures
}
else
{
}
else
{
- GetImplementation(*this).SetTexture(
index, NULL );
+ GetImplementation(*this).SetTexture(
static_cast<uint32_t>( index ), NULL ); // only support 4,294,967,295 textures
}
}
Texture TextureSet::GetTexture( size_t index ) const
{
}
}
Texture TextureSet::GetTexture( size_t index ) const
{
- Internal::Texture* texturePtr = GetImplementation(*this).GetTexture(
index );
+ Internal::Texture* texturePtr = GetImplementation(*this).GetTexture(
static_cast<uint32_t>( index ) ); // only support 4,294,967,295 textures
return Dali::Texture( texturePtr );
}
return Dali::Texture( texturePtr );
}
@@
-80,17
+80,17
@@
void TextureSet::SetSampler( size_t index, Sampler sampler )
if( sampler )
{
Internal::SamplerPtr samplerPtr( &GetImplementation( sampler ) );
if( sampler )
{
Internal::SamplerPtr samplerPtr( &GetImplementation( sampler ) );
- GetImplementation(*this).SetSampler(
index, samplerPtr );
+ GetImplementation(*this).SetSampler(
static_cast<uint32_t>( index ), samplerPtr ); // only support 4,294,967,295 samplers
}
else
{
}
else
{
- GetImplementation(*this).SetSampler(
index, NULL );
+ GetImplementation(*this).SetSampler(
static_cast<uint32_t>( index ), NULL ); // only support 4,294,967,295 samplers
}
}
Sampler TextureSet::GetSampler( size_t index ) const
{
}
}
Sampler TextureSet::GetSampler( size_t index ) const
{
- Internal::Sampler* samplerPtr = GetImplementation(*this).GetSampler(
index );
+ Internal::Sampler* samplerPtr = GetImplementation(*this).GetSampler(
static_cast<uint32_t>( index ) ); // only support 4,294,967,295 samplers
return Dali::Sampler( samplerPtr );
}
return Dali::Sampler( samplerPtr );
}