From 7fac90bf9b3a54dbe08353cb1566b95c3c6495c5 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Thu, 29 Mar 2012 05:12:56 +0000
Subject: [PATCH] Added precision preprocessor ifdefs to the source code of the
 fragment shaders

---
 .../opengl/FillShaderFragNoTex.glsl           |  5 +++++
 .../processing/opengl/FillShaderFragTex.glsl  |  5 +++++
 .../src/processing/opengl/LineShaderFrag.glsl |  5 +++++
 .../opengl/src/processing/opengl/PGL.java     |  2 +-
 .../processing/opengl/PGraphicsOpenGL.java    | 21 -------------------
 .../processing/opengl/PointShaderFrag.glsl    |  5 +++++
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/java/libraries/opengl/src/processing/opengl/FillShaderFragNoTex.glsl b/java/libraries/opengl/src/processing/opengl/FillShaderFragNoTex.glsl
index 29e18414e..8c22a6ac5 100644
--- a/java/libraries/opengl/src/processing/opengl/FillShaderFragNoTex.glsl
+++ b/java/libraries/opengl/src/processing/opengl/FillShaderFragNoTex.glsl
@@ -19,6 +19,11 @@
   Boston, MA  02111-1307  USA
 */
 
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
 varying vec4 vertColor;
 
 void main() {
diff --git a/java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl b/java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl
index 650e90355..d20d96d2a 100644
--- a/java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl
+++ b/java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl
@@ -19,6 +19,11 @@
   Boston, MA  02111-1307  USA
 */
 
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
 uniform sampler2D textureSampler;
 
 uniform vec2 texcoordOffset;
diff --git a/java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl b/java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl
index 29e18414e..8c22a6ac5 100644
--- a/java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl
+++ b/java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl
@@ -19,6 +19,11 @@
   Boston, MA  02111-1307  USA
 */
 
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
 varying vec4 vertColor;
 
 void main() {
diff --git a/java/libraries/opengl/src/processing/opengl/PGL.java b/java/libraries/opengl/src/processing/opengl/PGL.java
index 8fdf6dd92..2d79cf63a 100644
--- a/java/libraries/opengl/src/processing/opengl/PGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGL.java
@@ -129,7 +129,7 @@ public class PGL {
   protected static final String SHADER_PREPROCESSOR_DIRECTIVE = "#ifdef GL_ES\n" +
                                                                 "precision mediump float;\n" +
                                                                 "precision mediump int;\n" +
-                                                                "#endif;\n";
+                                                                "#endif\n";
   
   ///////////////////////////////////////////////////////////////////////////////////
   
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index cf25994a2..0eeffaafc 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -4626,18 +4626,6 @@ public class PGraphicsOpenGL extends PGraphics {
   public int get(int x, int y) {
     flush();
     loadPixels();    
-
-//    beginScreenOp();
-//    int color = pgl.getColorValue(x, y);
-//    endScreenOp();
-//    
-//    if (PGL.BIG_ENDIAN) {
-//      return 0xff000000 | ((color >> 8) & 0x00ffffff);
-//    } else {
-//      return 0xff000000 | ((color << 16) & 0xff0000) | 
-//                          (color & 0xff00) | 
-//                          ((color >> 16) & 0xff);
-//    }   
     
     int i = y * width + x;
     if (0 <= i && i < pixels.length) {
@@ -4679,15 +4667,6 @@ public class PGraphicsOpenGL extends PGraphics {
     flush();
     loadPixels();
     settingPixels = true;
-     
-//    float a = ((argb >> 24) & 0xFF) / 255.0f;
-//    float r = ((argb >> 16) & 0xFF) / 255.0f;
-//    float g = ((argb >>  8) & 0xFF) / 255.0f;
-//    float b = ((argb >>  0) & 0xFF) / 255.0f;
-//    
-//    beginScreenOp();
-//    pgl.drawRectangle(r, g, b, a, x, height - y - 1, x + 1, height - y);
-//    endScreenOp();
     
     int i = y * width + x;
     if (0 <= i && i < pixels.length) {
diff --git a/java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl b/java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl
index 29e18414e..8c22a6ac5 100644
--- a/java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl
+++ b/java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl
@@ -19,6 +19,11 @@
   Boston, MA  02111-1307  USA
 */
 
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
 varying vec4 vertColor;
 
 void main() {