summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-05-21 17:13:25 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-05-21 17:13:25 +0900
commitb2c9899d8ae6d7cf6cf290ece56ce1d237901b6b (patch)
tree5fc13cd6412bd5a849d8d3530724acc532537da2
parentce7a6e710643069c895aed1d2dd9a1417389a742 (diff)
evas shader generation - add comments to indicate to commit the files
so you know the files should change when you "make" and shf files are updated, add notes to the .x files generated to indicate they should be committed back to the repo so it is clear
-rw-r--r--src/modules/evas/engines/gl_common/shader/evas_gl_enum.x1
-rw-r--r--src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x1
-rwxr-xr-xsrc/modules/evas/engines/gl_common/shader/gen_shaders.sh4
-rw-r--r--src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x1
-rwxr-xr-xsrc/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh4
5 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x b/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
index e30184eb42..fef7a70f6f 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
@@ -1,4 +1,5 @@
1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */ 1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
2/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
2 3
3typedef enum { 4typedef enum {
4 SHADER_RECT, 5 SHADER_RECT,
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index d1a3cc646b..f78119b355 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -1,4 +1,5 @@
1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */ 1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
2/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
2 3
3#include "../evas_gl_private.h" 4#include "../evas_gl_private.h"
4 5
diff --git a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
index 7b0f74173d..1e606e3687 100755
--- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
+++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
@@ -58,7 +58,8 @@ IFS=$'\n' SHADERS=(`cat ${DIR}/shaders.txt`)
58IFS=$OIFS 58IFS=$OIFS
59 59
60# Write header 60# Write header
61printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n\n" > ${OUTPUT} 61printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n" > ${OUTPUT}
62printf "/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */\n\n" >> ${OUTPUT}
62 63
63# Including private for hilights and stuff :) 64# Including private for hilights and stuff :)
64printf "#include \"../evas_gl_private.h\"\n\n" >> ${OUTPUT} 65printf "#include \"../evas_gl_private.h\"\n\n" >> ${OUTPUT}
@@ -173,6 +174,7 @@ static const struct {
173printf "${shaders_source}};\n\n" >> ${OUTPUT} 174printf "${shaders_source}};\n\n" >> ${OUTPUT}
174 175
175printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */ 176printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
177/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
176 178
177typedef enum { 179typedef enum {
178${shaders_enum} SHADER_LAST 180${shaders_enum} SHADER_LAST
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 4185c44eb7..d4bd7ebb4f 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
@@ -1,4 +1,5 @@
1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */ 1/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
2/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
2 3
3static const char vertex_color_vert_glsl[] = 4static const char vertex_color_vert_glsl[] =
4 "#ifdef GL_ES\n" 5 "#ifdef GL_ES\n"
diff --git a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
index 6637dd9638..ee94b260e4 100755
--- a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
+++ b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
@@ -22,7 +22,9 @@ vert_shaders_source=""
22frag_shaders_source="" 22frag_shaders_source=""
23 23
24# Write header 24# Write header
25printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n\n" 25printf "/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n"
26printf "/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */\n\n"
27
26for shd in ${SHADERS} ; do 28for shd in ${SHADERS} ; do
27 lname=`basename ${shd} .shd` 29 lname=`basename ${shd} .shd`
28 30