[EGIT] [core/efl] master 04/05: [Evas: Evas_3D] Refactor shader system: refactored color pick shade mode.

[Dmytro Dadyka]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=02da66541f1f35c777297470fc49182227eac501

commit 02da66541f1f35c777297470fc49182227eac501
Author: Dmytro Dadyka <d.dad...@samsung.com>
Date:   Tue Mar 24 10:50:36 2015 -0700

    [Evas: Evas_3D] Refactor shader system: refactored  color pick shade mode.
    
    Reviewers: cedric, jpeg
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D2230
---
 .../engines/gl_common/shader_3d/color_pick_vert.shd | 21 ++-------------------
 .../gl_common/shader_3d/evas_gl_3d_shaders.x        |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd 
b/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
index 472866f..62de54f 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
@@ -1,27 +1,10 @@
 uniform mat4  uMatrixMvp;
 
-#ifdef VERTEX_POSITION
-attribute   vec4  aPosition0;
-#endif //VERTEX_POSITION
-
-#ifdef VERTEX_POSITION_BLEND
-attribute   vec4  aPosition1;
-uniform     float uPositionWeight;
-#endif //VERTEX_POSITION_BLEND
+VERTEX_SHADER_USE_POSITION
 
 void main()
 {
-#ifdef VERTEX_POSITION_BLEND
-   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
+   VERTEX_SHADER_POSITION
 
    gl_Position = uMatrixMvp * position;
 }
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x 
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index 40c7749..ed9780b 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -1214,7 +1214,7 @@ static const char const color_pick_vert_glsl[] =
    "#endif //VERTEX_POSITION_BLEND\n"
    "void main()\n"
    "{\n"
-   "#ifdef VERTEX_POSITION_BLEND\n"
+   "   #ifdef VERTEX_POSITION_BLEND\n"
    "   vec4 position = aPosition0 * uPositionWeight +\n"
    "   aPosition1 * (1.0 - uPositionWeight);\n"
    "   position = vec4(position.xyz, 1.0);\n"

--