summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-10-18 15:49:23 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-10-18 15:49:23 +0900
commitb70f02a652dafb808627f69cf5ed4a0c9da903c8 (patch)
treeebf4bf52afe32f6abc3aadc5c11ca618fe3552c1 /src
parent7b568a61529e2f96882e0bfe9ba21edf35e40766 (diff)
evas bigendian fix - only fix img shaders as only these src pixels
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/gl_common/shader/evas_gl_shaders_bigendian.x22
-rw-r--r--src/modules/evas/engines/gl_common/shader/fragment.glsl4
-rw-r--r--src/modules/evas/engines/gl_common/shader/shaders.txt198
3 files changed, 112 insertions, 112 deletions
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders_bigendian.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders_bigendian.x
index 2dd95fbafc..4908ac4fdd 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders_bigendian.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders_bigendian.x
@@ -612,7 +612,7 @@ static const char img_frag_glsl[] =
612 "void main()\n" 612 "void main()\n"
613 "{\n" 613 "{\n"
614 " vec4 c;\n" 614 " vec4 c;\n"
615 " c = texture2D(tex, tex_c).gbar;\n" 615 " c = texture2D(tex, tex_c).bgra;\n"
616 " gl_FragColor =\n" 616 " gl_FragColor =\n"
617 " c\n" 617 " c\n"
618 " * col\n" 618 " * col\n"
@@ -6934,7 +6934,7 @@ static const char rgb_a_pair_frag_glsl[] =
6934 "void main()\n" 6934 "void main()\n"
6935 "{\n" 6935 "{\n"
6936 " vec4 c;\n" 6936 " vec4 c;\n"
6937 " c = texture2D(tex, tex_c).gbar;\n" 6937 " c = texture2D(tex, tex_c).bgra;\n"
6938 " gl_FragColor =\n" 6938 " gl_FragColor =\n"
6939 " c\n" 6939 " c\n"
6940 " * col\n" 6940 " * col\n"
@@ -6990,7 +6990,7 @@ static const char rgb_a_pair_mask_frag_glsl[] =
6990 "void main()\n" 6990 "void main()\n"
6991 "{\n" 6991 "{\n"
6992 " vec4 c;\n" 6992 " vec4 c;\n"
6993 " c = texture2D(tex, tex_c).gbar;\n" 6993 " c = texture2D(tex, tex_c).bgra;\n"
6994 " float ma;\n" 6994 " float ma;\n"
6995 " ma = texture2D(texm, tex_m).a;\n" 6995 " ma = texture2D(texm, tex_m).a;\n"
6996 " gl_FragColor =\n" 6996 " gl_FragColor =\n"
@@ -7050,7 +7050,7 @@ static const char rgb_a_pair_nomul_frag_glsl[] =
7050 "void main()\n" 7050 "void main()\n"
7051 "{\n" 7051 "{\n"
7052 " vec4 c;\n" 7052 " vec4 c;\n"
7053 " c = texture2D(tex, tex_c).gbar;\n" 7053 " c = texture2D(tex, tex_c).bgra;\n"
7054 " gl_FragColor =\n" 7054 " gl_FragColor =\n"
7055 " c\n" 7055 " c\n"
7056 " * texture2D(texa, tex_a).r\n" 7056 " * texture2D(texa, tex_a).r\n"
@@ -7101,7 +7101,7 @@ static const char rgb_a_pair_mask_nomul_frag_glsl[] =
7101 "void main()\n" 7101 "void main()\n"
7102 "{\n" 7102 "{\n"
7103 " vec4 c;\n" 7103 " vec4 c;\n"
7104 " c = texture2D(tex, tex_c).gbar;\n" 7104 " c = texture2D(tex, tex_c).bgra;\n"
7105 " float ma;\n" 7105 " float ma;\n"
7106 " ma = texture2D(texm, tex_m).a;\n" 7106 " ma = texture2D(texm, tex_m).a;\n"
7107 " gl_FragColor =\n" 7107 " gl_FragColor =\n"
@@ -7160,7 +7160,7 @@ static const char tex_external_frag_glsl[] =
7160 "void main()\n" 7160 "void main()\n"
7161 "{\n" 7161 "{\n"
7162 " vec4 c;\n" 7162 " vec4 c;\n"
7163 " c = texture2D(tex, tex_c).gbar;\n" 7163 " c = texture2D(tex, tex_c).bgra;\n"
7164 " gl_FragColor =\n" 7164 " gl_FragColor =\n"
7165 " c\n" 7165 " c\n"
7166 " * col\n" 7166 " * col\n"
@@ -7212,7 +7212,7 @@ static const char tex_external_afill_frag_glsl[] =
7212 "void main()\n" 7212 "void main()\n"
7213 "{\n" 7213 "{\n"
7214 " vec4 c;\n" 7214 " vec4 c;\n"
7215 " c = texture2D(tex, tex_c).gbar;\n" 7215 " c = texture2D(tex, tex_c).bgra;\n"
7216 " gl_FragColor =\n" 7216 " gl_FragColor =\n"
7217 " c\n" 7217 " c\n"
7218 " * col\n" 7218 " * col\n"
@@ -7264,7 +7264,7 @@ static const char tex_external_nomul_frag_glsl[] =
7264 "void main()\n" 7264 "void main()\n"
7265 "{\n" 7265 "{\n"
7266 " vec4 c;\n" 7266 " vec4 c;\n"
7267 " c = texture2D(tex, tex_c).gbar;\n" 7267 " c = texture2D(tex, tex_c).bgra;\n"
7268 " gl_FragColor =\n" 7268 " gl_FragColor =\n"
7269 " c\n" 7269 " c\n"
7270 " ;\n" 7270 " ;\n"
@@ -7311,7 +7311,7 @@ static const char tex_external_nomul_afill_frag_glsl[] =
7311 "void main()\n" 7311 "void main()\n"
7312 "{\n" 7312 "{\n"
7313 " vec4 c;\n" 7313 " vec4 c;\n"
7314 " c = texture2D(tex, tex_c).gbar;\n" 7314 " c = texture2D(tex, tex_c).bgra;\n"
7315 " gl_FragColor =\n" 7315 " gl_FragColor =\n"
7316 " c\n" 7316 " c\n"
7317 " ;\n" 7317 " ;\n"
@@ -7362,7 +7362,7 @@ static const char tex_external_mask_frag_glsl[] =
7362 "void main()\n" 7362 "void main()\n"
7363 "{\n" 7363 "{\n"
7364 " vec4 c;\n" 7364 " vec4 c;\n"
7365 " c = texture2D(tex, tex_c).gbar;\n" 7365 " c = texture2D(tex, tex_c).bgra;\n"
7366 " float ma;\n" 7366 " float ma;\n"
7367 " ma = texture2D(texm, tex_m).a;\n" 7367 " ma = texture2D(texm, tex_m).a;\n"
7368 " gl_FragColor =\n" 7368 " gl_FragColor =\n"
@@ -7422,7 +7422,7 @@ static const char tex_external_mask_nomul_frag_glsl[] =
7422 "void main()\n" 7422 "void main()\n"
7423 "{\n" 7423 "{\n"
7424 " vec4 c;\n" 7424 " vec4 c;\n"
7425 " c = texture2D(tex, tex_c).gbar;\n" 7425 " c = texture2D(tex, tex_c).bgra;\n"
7426 " float ma;\n" 7426 " float ma;\n"
7427 " ma = texture2D(texm, tex_m).a;\n" 7427 " ma = texture2D(texm, tex_m).a;\n"
7428 " gl_FragColor =\n" 7428 " gl_FragColor =\n"
diff --git a/src/modules/evas/engines/gl_common/shader/fragment.glsl b/src/modules/evas/engines/gl_common/shader/fragment.glsl
index 3d5b1a4b3c..6d524bdf44 100644
--- a/src/modules/evas/engines/gl_common/shader/fragment.glsl
+++ b/src/modules/evas/engines/gl_common/shader/fragment.glsl
@@ -66,13 +66,13 @@ varying vec2 masktex_s[4];
66# define SWZ aaaa 66# define SWZ aaaa
67#else 67#else
68# ifndef SHD_BGRA 68# ifndef SHD_BGRA
69# ifdef BIGENDIAN 69# if defined(SHD_IMG) && defined(BIGENDIAN)
70# define SWZ gbar 70# define SWZ gbar
71# else 71# else
72# define SWZ bgra 72# define SWZ bgra
73#endif 73#endif
74# else 74# else
75# ifdef BIGENDIAN 75# if defined(SHD_IMG) && defined(BIGENDIAN)
76# define SWZ grab 76# define SWZ grab
77# else 77# else
78# define SWZ rgba 78# define SWZ rgba
diff --git a/src/modules/evas/engines/gl_common/shader/shaders.txt b/src/modules/evas/engines/gl_common/shader/shaders.txt
index 86e292d876..78e6a9920a 100644
--- a/src/modules/evas/engines/gl_common/shader/shaders.txt
+++ b/src/modules/evas/engines/gl_common/shader/shaders.txt
@@ -23,114 +23,114 @@ font_mask22:tex,mask,masksam22,alpha
23 23
24# Images: color version 24# Images: color version
25img:tex 25img:tex
26img_bgra:tex,bgra 26img_bgra:tex,img,bgra
27img_12:tex,sam12 27img_12:tex,img,sam12
28img_21:tex,sam21 28img_21:tex,img,sam21
29img_22:tex,sam22 29img_22:tex,img,sam22
30img_12_bgra:tex,sam12,bgra 30img_12_bgra:tex,img,sam12,bgra
31img_21_bgra:tex,sam21,bgra 31img_21_bgra:tex,img,sam21,bgra
32img_22_bgra:tex,sam22,bgra 32img_22_bgra:tex,img,sam22,bgra
33 33
34img_mask:tex,mask 34img_mask:tex,img,mask
35img_bgra_mask:tex,mask,bgra 35img_bgra_mask:tex,img,mask,bgra
36img_12_mask:tex,mask,sam12 36img_12_mask:tex,img,mask,sam12
37img_21_mask:tex,mask,sam21 37img_21_mask:tex,img,mask,sam21
38img_22_mask:tex,mask,sam22 38img_22_mask:tex,img,mask,sam22
39img_12_bgra_mask:tex,mask,sam12,bgra 39img_12_bgra_mask:tex,img,mask,sam12,bgra
40img_21_bgra_mask:tex,mask,sam21,bgra 40img_21_bgra_mask:tex,img,mask,sam21,bgra
41img_22_bgra_mask:tex,mask,sam22,bgra 41img_22_bgra_mask:tex,img,mask,sam22,bgra
42 42
43 43
44# Images: nomul version (copy above with extra nomul flag) 44# Images: nomul version (copy above with extra nomul flag)
45img_nomul:tex,nomul 45img_nomul:tex,img,nomul
46img_bgra_nomul:tex,nomul,bgra 46img_bgra_nomul:tex,img,nomul,bgra
47img_12_nomul:tex,sam12,nomul 47img_12_nomul:tex,img,sam12,nomul
48img_21_nomul:tex,sam21,nomul 48img_21_nomul:tex,img,sam21,nomul
49img_22_nomul:tex,sam22,nomul 49img_22_nomul:tex,img,sam22,nomul
50img_12_bgra_nomul:tex,sam12,bgra,nomul 50img_12_bgra_nomul:tex,img,sam12,bgra,nomul
51img_21_bgra_nomul:tex,sam21,bgra,nomul 51img_21_bgra_nomul:tex,img,sam21,bgra,nomul
52img_22_bgra_nomul:tex,sam22,bgra,nomul 52img_22_bgra_nomul:tex,img,sam22,bgra,nomul
53 53
54img_mask_nomul:tex,mask,nomul 54img_mask_nomul:tex,img,mask,nomul
55img_bgra_mask_nomul:tex,mask,nomul,bgra 55img_bgra_mask_nomul:tex,img,mask,nomul,bgra
56img_12_mask_nomul:tex,mask,sam12,nomul 56img_12_mask_nomul:tex,img,mask,sam12,nomul
57img_21_mask_nomul:tex,mask,sam21,nomul 57img_21_mask_nomul:tex,img,mask,sam21,nomul
58img_22_mask_nomul:tex,mask,sam22,nomul 58img_22_mask_nomul:tex,img,mask,sam22,nomul
59img_12_bgra_mask_nomul:tex,mask,sam12,bgra,nomul 59img_12_bgra_mask_nomul:tex,img,mask,sam12,bgra,nomul
60img_21_bgra_mask_nomul:tex,mask,sam21,bgra,nomul 60img_21_bgra_mask_nomul:tex,img,mask,sam21,bgra,nomul
61img_22_bgra_mask_nomul:tex,mask,sam22,bgra,nomul 61img_22_bgra_mask_nomul:tex,img,mask,sam22,bgra,nomul
62 62
63 63
64# Now the same as above but with MASKSAM 64# Now the same as above but with MASKSAM
65img_mask12:tex,mask,masksam12 65img_mask12:tex,img,mask,masksam12
66img_bgra_mask12:tex,mask,masksam12,bgra 66img_bgra_mask12:tex,img,mask,masksam12,bgra
67img_12_mask12:tex,mask,masksam12,sam12 67img_12_mask12:tex,img,mask,masksam12,sam12
68img_21_mask12:tex,mask,masksam12,sam21 68img_21_mask12:tex,img,mask,masksam12,sam21
69img_22_mask12:tex,mask,masksam12,sam22 69img_22_mask12:tex,img,mask,masksam12,sam22
70img_12_bgra_mask12:tex,mask,masksam12,sam12,bgra 70img_12_bgra_mask12:tex,img,mask,masksam12,sam12,bgra
71img_21_bgra_mask12:tex,mask,masksam12,sam21,bgra 71img_21_bgra_mask12:tex,img,mask,masksam12,sam21,bgra
72img_22_bgra_mask12:tex,mask,masksam12,sam22,bgra 72img_22_bgra_mask12:tex,img,mask,masksam12,sam22,bgra
73img_mask12_nomul:tex,mask,masksam12,nomul 73img_mask12_nomul:tex,img,mask,masksam12,nomul
74img_bgra_mask12_nomul:tex,mask,masksam12,nomul,bgra 74img_bgra_mask12_nomul:tex,img,mask,masksam12,nomul,bgra
75img_12_mask12_nomul:tex,mask,masksam12,sam12,nomul 75img_12_mask12_nomul:tex,img,mask,masksam12,sam12,nomul
76img_21_mask12_nomul:tex,mask,masksam12,sam21,nomul 76img_21_mask12_nomul:tex,img,mask,masksam12,sam21,nomul
77img_22_mask12_nomul:tex,mask,masksam12,sam22,nomul 77img_22_mask12_nomul:tex,img,mask,masksam12,sam22,nomul
78img_12_bgra_mask12_nomul:tex,mask,masksam12,sam12,bgra,nomul 78img_12_bgra_mask12_nomul:tex,img,mask,masksam12,sam12,bgra,nomul
79img_21_bgra_mask12_nomul:tex,mask,masksam12,sam21,bgra,nomul 79img_21_bgra_mask12_nomul:tex,img,mask,masksam12,sam21,bgra,nomul
80img_22_bgra_mask12_nomul:tex,mask,masksam12,sam22,bgra,nomul 80img_22_bgra_mask12_nomul:tex,img,mask,masksam12,sam22,bgra,nomul
81 81
82img_mask21:tex,mask,masksam21 82img_mask21:tex,img,mask,masksam21
83img_bgra_mask21:tex,mask,masksam21,bgra 83img_bgra_mask21:tex,img,mask,masksam21,bgra
84img_12_mask21:tex,mask,masksam21,sam12 84img_12_mask21:tex,img,mask,masksam21,sam12
85img_21_mask21:tex,mask,masksam21,sam21 85img_21_mask21:tex,img,mask,masksam21,sam21
86img_22_mask21:tex,mask,masksam21,sam22 86img_22_mask21:tex,img,mask,masksam21,sam22
87img_12_bgra_mask21:tex,mask,masksam21,sam12,bgra 87img_12_bgra_mask21:tex,img,mask,masksam21,sam12,bgra
88img_21_bgra_mask21:tex,mask,masksam21,sam21,bgra 88img_21_bgra_mask21:tex,img,mask,masksam21,sam21,bgra
89img_22_bgra_mask21:tex,mask,masksam21,sam22,bgra 89img_22_bgra_mask21:tex,img,mask,masksam21,sam22,bgra
90img_mask21_nomul:tex,mask,masksam21,nomul 90img_mask21_nomul:tex,img,mask,masksam21,nomul
91img_bgra_mask21_nomul:tex,mask,masksam21,nomul,bgra 91img_bgra_mask21_nomul:tex,img,mask,masksam21,nomul,bgra
92img_12_mask21_nomul:tex,mask,masksam21,sam12,nomul 92img_12_mask21_nomul:tex,img,mask,masksam21,sam12,nomul
93img_21_mask21_nomul:tex,mask,masksam21,sam21,nomul 93img_21_mask21_nomul:tex,img,mask,masksam21,sam21,nomul
94img_22_mask21_nomul:tex,mask,masksam21,sam22,nomul 94img_22_mask21_nomul:tex,img,mask,masksam21,sam22,nomul
95img_12_bgra_mask21_nomul:tex,mask,masksam21,sam12,bgra,nomul 95img_12_bgra_mask21_nomul:tex,img,mask,masksam21,sam12,bgra,nomul
96img_21_bgra_mask21_nomul:tex,mask,masksam21,sam21,bgra,nomul 96img_21_bgra_mask21_nomul:tex,img,mask,masksam21,sam21,bgra,nomul
97img_22_bgra_mask21_nomul:tex,mask,masksam21,sam22,bgra,nomul 97img_22_bgra_mask21_nomul:tex,img,mask,masksam21,sam22,bgra,nomul
98 98
99img_mask22:tex,mask,masksam22 99img_mask22:tex,img,mask,masksam22
100img_bgra_mask22:tex,mask,masksam22,bgra 100img_bgra_mask22:tex,img,mask,masksam22,bgra
101img_12_mask22:tex,mask,masksam22,sam12 101img_12_mask22:tex,img,mask,masksam22,sam12
102img_21_mask22:tex,mask,masksam22,sam21 102img_21_mask22:tex,img,mask,masksam22,sam21
103img_22_mask22:tex,mask,masksam22,sam22 103img_22_mask22:tex,img,mask,masksam22,sam22
104img_12_bgra_mask22:tex,mask,masksam22,sam12,bgra 104img_12_bgra_mask22:tex,img,mask,masksam22,sam12,bgra
105img_21_bgra_mask22:tex,mask,masksam22,sam21,bgra 105img_21_bgra_mask22:tex,img,mask,masksam22,sam21,bgra
106img_22_bgra_mask22:tex,mask,masksam22,sam22,bgra 106img_22_bgra_mask22:tex,img,mask,masksam22,sam22,bgra
107img_mask22_nomul:tex,mask,masksam22,nomul 107img_mask22_nomul:tex,img,mask,masksam22,nomul
108img_bgra_mask22_nomul:tex,mask,masksam22,nomul,bgra 108img_bgra_mask22_nomul:tex,img,mask,masksam22,nomul,bgra
109img_12_mask22_nomul:tex,mask,masksam22,sam12,nomul 109img_12_mask22_nomul:tex,img,mask,masksam22,sam12,nomul
110img_21_mask22_nomul:tex,mask,masksam22,sam21,nomul 110img_21_mask22_nomul:tex,img,mask,masksam22,sam21,nomul
111img_22_mask22_nomul:tex,mask,masksam22,sam22,nomul 111img_22_mask22_nomul:tex,img,mask,masksam22,sam22,nomul
112img_12_bgra_mask22_nomul:tex,mask,masksam22,sam12,bgra,nomul 112img_12_bgra_mask22_nomul:tex,img,mask,masksam22,sam12,bgra,nomul
113img_21_bgra_mask22_nomul:tex,mask,masksam22,sam21,bgra,nomul 113img_21_bgra_mask22_nomul:tex,img,mask,masksam22,sam21,bgra,nomul
114img_22_bgra_mask22_nomul:tex,mask,masksam22,sam22,bgra,nomul 114img_22_bgra_mask22_nomul:tex,img,mask,masksam22,sam22,bgra,nomul
115 115
116 116
117# Some AFILL versions 117# Some AFILL versions
118img_afill:tex,afill 118img_afill:tex,img,afill
119img_bgra_afill:tex,afill,bgra 119img_bgra_afill:tex,img,afill,bgra
120img_nomul_afill:tex,nomul,afill 120img_nomul_afill:tex,img,nomul,afill
121img_bgra_nomul_afill:tex,nomul,afill,bgra 121img_bgra_nomul_afill:tex,img,nomul,afill,bgra
122img_12_afill:tex,sam12,afill 122img_12_afill:tex,img,sam12,afill
123img_21_afill:tex,sam21,afill 123img_21_afill:tex,img,sam21,afill
124img_22_afill:tex,sam22,afill 124img_22_afill:tex,img,sam22,afill
125img_12_bgra_afill:tex,sam12,bgra,afill 125img_12_bgra_afill:tex,img,sam12,bgra,afill
126img_21_bgra_afill:tex,sam21,bgra,afill 126img_21_bgra_afill:tex,img,sam21,bgra,afill
127img_22_bgra_afill:tex,sam22,bgra,afill 127img_22_bgra_afill:tex,img,sam22,bgra,afill
128img_12_nomul_afill:tex,sam12,nomul,afill 128img_12_nomul_afill:tex,img,sam12,nomul,afill
129img_21_nomul_afill:tex,sam21,nomul,afill 129img_21_nomul_afill:tex,img,sam21,nomul,afill
130img_22_nomul_afill:tex,sam22,nomul,afill 130img_22_nomul_afill:tex,img,sam22,nomul,afill
131img_12_bgra_nomul_afill:tex,sam12,bgra,nomul,afill 131img_12_bgra_nomul_afill:tex,img,sam12,bgra,nomul,afill
132img_21_bgra_nomul_afill:tex,sam21,bgra,nomul,afill 132img_21_bgra_nomul_afill:tex,img,sam21,bgra,nomul,afill
133img_22_bgra_nomul_afill:tex,sam22,bgra,nomul,afill 133img_22_bgra_nomul_afill:tex,img,sam22,bgra,nomul,afill
134 134
135 135
136 136