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
Add Default Uniform : uActorColor
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
shaders
/
program.cpp
diff --git
a/dali/internal/render/shaders/program.cpp
b/dali/internal/render/shaders/program.cpp
index
56ba362
..
fca4972
100644
(file)
--- a/
dali/internal/render/shaders/program.cpp
+++ b/
dali/internal/render/shaders/program.cpp
@@
-56,7
+56,8
@@
size_t DEFAULT_UNIFORM_HASHTABLE[NUMBER_OF_DEFAULT_UNIFORMS] =
CalculateHash(std::string("uNormalMatrix")),
CalculateHash(std::string("uProjection")),
CalculateHash(std::string("uSize")),
CalculateHash(std::string("uNormalMatrix")),
CalculateHash(std::string("uProjection")),
CalculateHash(std::string("uSize")),
- CalculateHash(std::string("uColor"))};
+ CalculateHash(std::string("uColor")),
+ CalculateHash(std::string("uActorColor"))};
/**
* Helper function to calculate the correct alignment of data for uniform buffers
/**
* Helper function to calculate the correct alignment of data for uniform buffers