From af65215450b2592a03dcecc13547ce4bc922dcbc Mon Sep 17 00:00:00 2001
From: shadowislord <shadowislord@gmail.com>
Date: Sat, 31 Jan 2015 12:46:09 -0500
Subject: [PATCH]  * Delete useless Android22Workaround

---
 .../renderer/android/Android22Workaround.java | 14 -------------
 .../renderer/android/OGLESShaderRenderer.java | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 jme3-android/src/main/java/com/jme3/renderer/android/Android22Workaround.java

diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/Android22Workaround.java b/jme3-android/src/main/java/com/jme3/renderer/android/Android22Workaround.java
deleted file mode 100644
index 9c5bf587a..000000000
--- a/jme3-android/src/main/java/com/jme3/renderer/android/Android22Workaround.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.jme3.renderer.android;
-
-import android.opengl.GLES20;
-
-public class Android22Workaround {
-    public static void glVertexAttribPointer(int location, int components, int format, boolean normalize, int stride, int offset){
-        GLES20.glVertexAttribPointer(location,
-                                     components,
-                                     format,
-                                     normalize,
-                                     stride,
-                                     offset);
-    }
-}
diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
index bcfbf1c29..b611376a6 100644
--- a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
+++ b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
@@ -37,7 +37,6 @@ import com.jme3.asset.AndroidImageInfo;
 import com.jme3.light.LightList;
 import com.jme3.material.RenderState;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
@@ -49,6 +48,7 @@ import com.jme3.renderer.Renderer;
 import com.jme3.renderer.RendererException;
 import com.jme3.renderer.Statistics;
 import com.jme3.renderer.android.TextureUtil.AndroidGLImageFormat;
+import com.jme3.renderer.opengl.GLRenderer;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer;
@@ -81,6 +81,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import jme3tools.shader.ShaderDebug;
 
+/**
+ * @deprecated Should not be used anymore. Use {@link GLRenderer} instead.
+ */
+@Deprecated
 public class OGLESShaderRenderer implements Renderer {
 
     private static final Logger logger = Logger.getLogger(OGLESShaderRenderer.class.getName());
@@ -2103,13 +2107,13 @@ public class OGLESShaderRenderer implements Renderer {
 
                 vb.getData().rewind();
 
-                Android22Workaround.glVertexAttribPointer(loc,
-                                    vb.getNumComponents(),
-                                    convertVertexBufferFormat(vb.getFormat()),
-                                    vb.isNormalized(),
-                                    vb.getStride(),
-                                    0);
-
+                GLES20.glVertexAttribPointer(loc,
+                                     vb.getNumComponents(),
+                                     convertVertexBufferFormat(vb.getFormat()),
+                                     vb.isNormalized(),
+                                     vb.getStride(),
+                                     0);
+                
                 RendererUtil.checkGLError();
 
                 attribs[loc] = vb;