diff --git a/vtm/src/org/oscim/renderer/layers/ExtrusionRenderLayer.java b/vtm/src/org/oscim/renderer/layers/ExtrusionRenderLayer.java index ff743e7a..4d50f841 100644 --- a/vtm/src/org/oscim/renderer/layers/ExtrusionRenderLayer.java +++ b/vtm/src/org/oscim/renderer/layers/ExtrusionRenderLayer.java @@ -390,7 +390,7 @@ public class ExtrusionRenderLayer extends RenderLayer { }; final static String extrusionVertexShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform mat4 u_mvp;" + "uniform vec4 u_color[4];" + "uniform int u_mode;" @@ -431,14 +431,14 @@ public class ExtrusionRenderLayer extends RenderLayer { + "}}}"; final static String extrusionFragmentShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "varying vec4 color;" + "void main() {" + " gl_FragColor = color;" + "}"; final static String extrusionFragmentShaderZ = "" - + "precision mediump float;" + // + "precision mediump float;" + "varying float depth;" + "void main() {" + "float d = depth * 0.2;" diff --git a/vtm/src/org/oscim/renderer/sublayers/LineRenderer.java b/vtm/src/org/oscim/renderer/sublayers/LineRenderer.java index 2e89bdf1..f1e2c804 100644 --- a/vtm/src/org/oscim/renderer/sublayers/LineRenderer.java +++ b/vtm/src/org/oscim/renderer/sublayers/LineRenderer.java @@ -249,7 +249,7 @@ public final class LineRenderer { } private final static String lineVertexShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform mat4 u_mvp;" // factor to increase line width relative to scale + "uniform float u_width;" @@ -268,7 +268,7 @@ public final class LineRenderer { + "}"; private final static String lineSimpleFragmentShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform sampler2D tex;" + "uniform float u_wscale;" + "uniform float u_mode;" @@ -294,7 +294,7 @@ public final class LineRenderer { private final static String lineFragmentShader = "" + "#extension GL_OES_standard_derivatives : enable\n" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform sampler2D tex;" + "uniform float u_mode;" + "uniform vec4 u_color;" diff --git a/vtm/src/org/oscim/renderer/sublayers/LineTexRenderer.java b/vtm/src/org/oscim/renderer/sublayers/LineTexRenderer.java index 94ddbbfb..d893e59b 100644 --- a/vtm/src/org/oscim/renderer/sublayers/LineTexRenderer.java +++ b/vtm/src/org/oscim/renderer/sublayers/LineTexRenderer.java @@ -230,7 +230,7 @@ public class LineTexRenderer { } final static String vertexShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform mat4 u_mvp;" + "uniform vec4 u_color;" + "uniform float u_pscale;" @@ -258,7 +258,7 @@ public class LineTexRenderer { //* final static String fragmentShader = "" + "#extension GL_OES_standard_derivatives : enable\n" - + " precision mediump float;" + //+ " precision mediump float;" + " uniform vec4 u_color;" + " uniform vec4 u_bgcolor;" + " uniform float u_pwidth;" diff --git a/vtm/src/org/oscim/renderer/sublayers/PolygonRenderer.java b/vtm/src/org/oscim/renderer/sublayers/PolygonRenderer.java index 4f4c1136..460dacd5 100644 --- a/vtm/src/org/oscim/renderer/sublayers/PolygonRenderer.java +++ b/vtm/src/org/oscim/renderer/sublayers/PolygonRenderer.java @@ -427,7 +427,7 @@ public final class PolygonRenderer { } private final static String polygonVertexShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform mat4 u_mvp;" + "attribute vec4 a_pos;" + "void main() {" @@ -435,14 +435,14 @@ public final class PolygonRenderer { + "}"; private final static String polygonFragmentShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform vec4 u_color;" + "void main() {" + " gl_FragColor = u_color;" + "}"; private final static String polygonVertexShaderZ = "" - + "precision highp float;" + //+ "precision highp float;" + "uniform mat4 u_mvp;" + "attribute vec4 a_pos;" + "varying float z;" @@ -451,7 +451,7 @@ public final class PolygonRenderer { + " z = gl_Position.z;" + "}"; private final static String polygonFragmentShaderZ = "" - + "precision highp float;" + //+ "precision highp float;" + "uniform vec4 u_color;" + "varying float z;" + "void main() {" @@ -466,7 +466,7 @@ public final class PolygonRenderer { + "}"; private final static String textureVertexShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform mat4 u_mvp;" + "uniform vec2 u_scale;" + "attribute vec4 a_pos;" @@ -479,7 +479,7 @@ public final class PolygonRenderer { + "}"; private final static String textureFragmentShader = "" - + "precision mediump float;" + //+ "precision mediump float;" + "uniform vec4 u_color;" + "uniform sampler2D tex;" + "uniform vec2 u_scale;" diff --git a/vtm/src/org/oscim/renderer/sublayers/TextureRenderer.java b/vtm/src/org/oscim/renderer/sublayers/TextureRenderer.java index 6b7ceeb9..a5be0c42 100644 --- a/vtm/src/org/oscim/renderer/sublayers/TextureRenderer.java +++ b/vtm/src/org/oscim/renderer/sublayers/TextureRenderer.java @@ -82,7 +82,7 @@ public final class TextureRenderer { for (TextureItem ti = tl.textures; ti != null; ti = ti.next) { GL.glBindTexture(GL20.GL_TEXTURE_2D, ti.id); - + int maxVertices = GLRenderer.maxQuads * INDICES_PER_SPRITE; GL.glUniform2f(hTextureSize, @@ -119,7 +119,7 @@ public final class TextureRenderer { private final static double COORD_DIV = 1.0 / GLRenderer.COORD_SCALE; private final static String textVertexShader = "" - + "precision mediump float; " + // + "precision mediump float; " + "attribute vec4 vertex;" + "attribute vec2 tex_coord;" + "uniform mat4 u_mv;" @@ -143,7 +143,7 @@ public final class TextureRenderer { + "}"; private final static String textFragmentShader = "" - + "precision mediump float;" + // + "precision mediump float;" + "uniform sampler2D tex;" + "varying vec2 tex_c;" + "void main() {"