Merge pull request #328 from pcwalton/precision-highp

Only define `precision highp sampler2D` in OpenGL ES.

resources/shaders/gl3/blit.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uSrc;
 

resources/shaders/gl3/blit.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in ivec2 aPosition;
 

resources/shaders/gl3/clear.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uColor;
 

resources/shaders/gl3/clear.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uRect;
 uniform vec2 uFramebufferSize;

resources/shaders/gl3/debug_solid.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uColor;
 

resources/shaders/gl3/debug_solid.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 

resources/shaders/gl3/debug_texture.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uTexture;
 uniform vec4 uColor;

resources/shaders/gl3/debug_texture.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTextureSize;

resources/shaders/gl3/demo_ground.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uGroundColor;
 uniform vec4 uGridlineColor;

resources/shaders/gl3/demo_ground.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform int uGridlineCount;

resources/shaders/gl3/fill.fs.glsl

@@ -15,7 +15,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 
 

resources/shaders/gl3/fill.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTileSize;

resources/shaders/gl3/reproject.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uOldTransform;
 uniform sampler2D uTexture;

resources/shaders/gl3/reproject.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uNewTransform;
 

resources/shaders/gl3/stencil.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 out vec4 oFragColor;
 

resources/shaders/gl3/stencil.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in vec3 aPosition;
 

resources/shaders/gl3/tile.fs.glsl

@@ -36,7 +36,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 
 

resources/shaders/gl3/tile.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;

resources/shaders/gl3/tile_clip.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uSrc;
 

resources/shaders/gl3/tile_clip.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in ivec2 aTileOffset;
 in ivec2 aDestTileOrigin;

resources/shaders/gl3/tile_copy.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform sampler2D uSrc;

resources/shaders/gl3/tile_copy.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;

resources/shaders/gl4/blit.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uSrc;
 

resources/shaders/gl4/blit.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in ivec2 aPosition;
 

resources/shaders/gl4/clear.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uColor;
 

resources/shaders/gl4/clear.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uRect;
 uniform vec2 uFramebufferSize;

resources/shaders/gl4/debug_solid.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uColor;
 

resources/shaders/gl4/debug_solid.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 

resources/shaders/gl4/debug_texture.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uTexture;
 uniform vec4 uColor;

resources/shaders/gl4/debug_texture.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTextureSize;

resources/shaders/gl4/demo_ground.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec4 uGroundColor;
 uniform vec4 uGridlineColor;

resources/shaders/gl4/demo_ground.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform int uGridlineCount;

resources/shaders/gl4/fill.cs.glsl

@@ -15,7 +15,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 
 

resources/shaders/gl4/fill.fs.glsl

@@ -15,7 +15,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 
 

resources/shaders/gl4/fill.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTileSize;

resources/shaders/gl4/reproject.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uOldTransform;
 uniform sampler2D uTexture;

resources/shaders/gl4/reproject.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uNewTransform;
 

resources/shaders/gl4/stencil.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 out vec4 oFragColor;
 

resources/shaders/gl4/stencil.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in vec3 aPosition;
 

resources/shaders/gl4/tile.fs.glsl

@@ -36,7 +36,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 
 

resources/shaders/gl4/tile.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;

resources/shaders/gl4/tile_clip.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform sampler2D uSrc;
 

resources/shaders/gl4/tile_clip.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 in ivec2 aTileOffset;
 in ivec2 aDestTileOrigin;

resources/shaders/gl4/tile_copy.fs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform vec2 uFramebufferSize;
 uniform sampler2D uSrc;

resources/shaders/gl4/tile_copy.vs.glsl

@@ -13,7 +13,10 @@
 
 
 precision highp float;
-precision highp sampler2D;
+
+
+
+
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;

shaders/blit.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform sampler2D uSrc;
 

shaders/blit.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 in ivec2 aPosition;
 

shaders/clear.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec4 uColor;
 

shaders/clear.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec4 uRect;
 uniform vec2 uFramebufferSize;

shaders/debug_solid.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec4 uColor;
 

shaders/debug_solid.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec2 uFramebufferSize;
 

shaders/debug_texture.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform sampler2D uTexture;
 uniform vec4 uColor;

shaders/debug_texture.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTextureSize;

shaders/demo_ground.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec4 uGroundColor;
 uniform vec4 uGridlineColor;

shaders/demo_ground.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform mat4 uTransform;
 uniform int uGridlineCount;

shaders/fill.cs.glsl

@@ -13,7 +13,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 #include "fill.inc.glsl"
 

shaders/fill.fs.glsl

@@ -13,7 +13,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 #include "fill.inc.glsl"
 

shaders/fill.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec2 uFramebufferSize;
 uniform vec2 uTileSize;

shaders/reproject.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform mat4 uOldTransform;
 uniform sampler2D uTexture;

shaders/reproject.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform mat4 uNewTransform;
 

shaders/stencil.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 out vec4 oFragColor;
 

shaders/stencil.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 in vec3 aPosition;
 

shaders/tile.fs.glsl

@@ -34,7 +34,10 @@
 #extension GL_GOOGLE_include_directive : enable
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 #define EPSILON     0.00001
 

shaders/tile.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;

shaders/tile_clip.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform sampler2D uSrc;
 

shaders/tile_clip.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 in ivec2 aTileOffset;
 in ivec2 aDestTileOrigin;

shaders/tile_copy.fs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform vec2 uFramebufferSize;
 uniform sampler2D uSrc;

shaders/tile_copy.vs.glsl

@@ -11,7 +11,10 @@
 // except according to those terms.
 
 precision highp float;
+
+#ifdef GL_ES
 precision highp sampler2D;
+#endif
 
 uniform mat4 uTransform;
 uniform vec2 uTileSize;