timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Evas: Evas_3D] Refactor shader system: refactored color pick shade mode. 

Reviewers: cedric, jpeg

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2230
This commit is contained in:
Dmytro Dadyka 2015-03-24 10:50:36 -07:00 committed by Jean-Philippe ANDRE
parent f95136f139
commit 02da66541f
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
View File

@ -1,27 +1,10 @@
uniform mat4 uMatrixMvp; uniform mat4 uMatrixMvp;
#ifdef VERTEX_POSITION VERTEX_SHADER_USE_POSITION
attribute vec4 aPosition0;
#endif //VERTEX_POSITION
#ifdef VERTEX_POSITION_BLEND
attribute vec4 aPosition1;
uniform float uPositionWeight;
#endif //VERTEX_POSITION_BLEND
void main() void main()
{ {
#ifdef VERTEX_POSITION_BLEND VERTEX_SHADER_POSITION
vec4 position = aPosition0 * uPositionWeight +
aPosition1 * (1.0 - uPositionWeight);
position = vec4(position.xyz, 1.0);
#else
#ifdef VERTEX_POSITION
vec4 position = vec4(aPosition0.xyz, 1.0);
#endif // VERTEX_POSITION
#endif //VERTEX_POSITION_BLEND
gl_Position = uMatrixMvp * position; gl_Position = uMatrixMvp * position;
} }

2
src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
View File

@ -1214,7 +1214,7 @@ static const char const color_pick_vert_glsl[] =
"#endif //VERTEX_POSITION_BLEND\n" "#endif //VERTEX_POSITION_BLEND\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
"#ifdef VERTEX_POSITION_BLEND\n" " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n" " vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n" " aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n" " position = vec4(position.xyz, 1.0);\n"