Preparation for OpenGL ES

shaders/debayer.frag

@@ -1,5 +1,3 @@
-#version 330
-
 uniform sampler2D qt_Texture0;
 uniform ivec2 firstRed;
 in vec2 qt_TexCoord0;

shaders/debayer.vert

@@ -1,5 +1,3 @@
-#version 330
-
 uniform sampler2D qt_Texture0;
 in vec2 qt_Vertex;
 in vec2 qt_MultiTexCoord0;

shaders/image.frag

@@ -1,5 +1,3 @@
-#version 330
-
 uniform sampler2D qt_Texture0;
 uniform vec3 mtf_param[3];
 uniform vec2 unit_scale;
@@ -22,7 +20,7 @@ vec4 MTF(vec4 x, vec4 low, vec4 mid, vec4 high)
 {
     x = (x - low) / (high - low);
     x = clamp(x, vec4(0.0), vec4(1.0));
-    return ((mid - 1) * x) / ((2 * mid - 1) * x - mid);
+    return ((mid - 1.0) * x) / ((2.0 * mid - 1.0) * x - mid);
 }
 
 vec3 falsecolor(float color)
@@ -59,7 +57,7 @@ vec4 cubic(float v)
 
 vec4 textureBicubic(sampler2D sampler, vec2 texCoords)
 {
-    vec2 texSize = textureSize(sampler, 0);
+    vec2 texSize = vec2(textureSize(sampler, 0));
     vec2 invTexSize = 1.0 / texSize;
 
     texCoords = texCoords * texSize - 0.5;
@@ -133,7 +131,7 @@ void main(void)
     switch(filtering)
     {
     case 0://nearest
-        color = texelFetch(qt_Texture0, ivec2(qt_TexCoord0 * textureSize(qt_Texture0, 0)), 0);
+        color = texelFetch(qt_Texture0, ivec2(qt_TexCoord0 * vec2(textureSize(qt_Texture0, 0))), 0);
         break;
     default:
     case 1://bilinear

shaders/image.vert

@@ -1,5 +1,3 @@
-#version 330
-
 uniform sampler2D qt_Texture0;
 in vec2 qt_Vertex;
 in vec2 qt_MultiTexCoord0;

shaders/thumb.frag

@@ -1,5 +1,3 @@
-#version 330
-
 uniform sampler2DArray qt_Texture0;
 uniform vec3 mtf_param[3];
 uniform bool invert;
@@ -10,7 +8,7 @@ vec4 MTF(vec4 x, vec4 low, vec4 mid, vec4 high)
 {
     x = (x - low) / (high - low);
     x = clamp(x, vec4(0.0), vec4(1.0));
-    return ((mid - 1) * x) / ((2 * mid - 1) * x - mid);
+    return ((mid - 1.0) * x) / ((2.0 * mid - 1.0) * x - mid);
 }
 
 void main(void)

shaders/thumb.vert

@@ -1,5 +1,3 @@
-#version 330
-
 in vec2 qt_Vertex;
 in vec2 qt_MultiTexCoord0;
 in ivec3 imageSize_num;
@@ -13,9 +11,9 @@ void main(void)
 {
     vec2 pos = qt_Vertex * 0.5;
     pos.y *= -1.0;
-    pos = pos * imageSize_num.xy + thumb_size.x;
+    pos = pos * vec2(imageSize_num.xy) + float(thumb_size.x);
     ivec2 off = ivec2(imageSize_num.z % viewport_row.z, imageSize_num.z / viewport_row.z) * thumb_size.yz;
 
-    gl_Position = mvp * vec4(pos - offset + off, 0.0, 1.0);
-    qt_TexCoord0 = vec3(qt_MultiTexCoord0, imageSize_num.z + 0.1);
+    gl_Position = mvp * vec4(pos - offset + vec2(off), 0.0, 1.0);
+    qt_TexCoord0 = vec3(qt_MultiTexCoord0, float(imageSize_num.z) + 0.1);
 }