Switches to JOGL 2.1.2

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10874 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/jogl/com/jme3/renderer/jogl/JoglGL1Renderer.java

@@ -1069,13 +1069,13 @@ public class JoglGL1Renderer implements GL1Renderer {
         GL gl = GLContext.getCurrentGL();
         switch (format) {
             case GL.GL_UNSIGNED_BYTE:
-                gl.glDrawElements(mode, data.limit(), format, (ByteBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (ByteBuffer) data);
                 break;
             case GL.GL_UNSIGNED_SHORT:
-                gl.glDrawElements(mode, data.limit(), format, (ShortBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (ShortBuffer) data);
                 break;
             case GL.GL_UNSIGNED_INT:
-                gl.glDrawElements(mode, data.limit(), format, (IntBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (IntBuffer) data);
                 break;
             default:
                 throw new UnsupportedOperationException();

engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java

@@ -2340,11 +2340,11 @@ public class JoglRenderer implements Renderer {
                 int elementLength = elementLengths[i];
 
                 if (useInstancing) {
-                    if (gl.isGL2GL3()) {
+                    if (gl.isGL2()) {
                         indexBuf.getData().position(curOffset);
                         indexBuf.getData().limit(curOffset + elementLength);
 
-                        gl.getGL2GL3().glDrawElementsInstanced(elMode,
+                        gl.getGL2().glDrawElementsInstanced(elMode,
                                 elementLength,
                                 fmt,
                                 indexBuf.getData(),
@@ -2363,7 +2363,7 @@ public class JoglRenderer implements Renderer {
                                 curOffset);
                     } else {
                         indexBuf.getData().position(curOffset);
-                        gl.glDrawElements(elMode, elementLength, fmt,
+                        gl.getGL2().glDrawElements(elMode, elementLength, fmt,
                                 indexBuf.getData());
                     }
                 }
@@ -2373,8 +2373,8 @@ public class JoglRenderer implements Renderer {
             }
         } else {
             if (useInstancing) {
-                if (gl.isGL2GL3()) {
-                    gl.getGL2GL3().glDrawElementsInstanced(convertElementMode(mesh.getMode()),
+                if (gl.isGL2()) {
+                    gl.getGL2().glDrawElementsInstanced(convertElementMode(mesh.getMode()),
                             indexBuf.getData().limit(),
                             convertFormat(indexBuf.getFormat()),
                             indexBuf.getData(),