projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Doxygen Comment Generation" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager-impl.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
index
8532b93
..
12d39a5
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
@@
-1,4
+1,4
@@
-
/*
+/*
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-61,12
+61,13
@@
void main()
);
const char* FRAGMENT_SHADER_RGBA = MAKE_SHADER(
);
const char* FRAGMENT_SHADER_RGBA = MAKE_SHADER(
+uniform lowp vec4 uColor;
uniform sampler2D sTexture;
varying mediump vec2 vTexCoord;
void main()
{
uniform sampler2D sTexture;
varying mediump vec2 vTexCoord;
void main()
{
- gl_FragColor = texture2D( sTexture, vTexCoord );
+ gl_FragColor = texture2D( sTexture, vTexCoord )
* uColor
;
}
);
}
);