From 1adc4f9219eeb57fa8a4a4c9bcfff1aa7bd46f70 Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Wed, 15 Feb 2012 13:37:30 -0800 Subject: j3dcore: the vertex attribute functions have moved to the GL2 profile Signed-off-by: Julien Gouesse Signed-off-by: Harvey Harrison --- src/classes/jogl/javax/media/j3d/JoglContext.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/classes/jogl/javax/media/j3d/JoglContext.java b/src/classes/jogl/javax/media/j3d/JoglContext.java index 7c3e8cf..a1f33c5 100644 --- a/src/classes/jogl/javax/media/j3d/JoglContext.java +++ b/src/classes/jogl/javax/media/j3d/JoglContext.java @@ -69,32 +69,32 @@ class JoglContext implements Context { class GLSLVertexAttributeImpl implements VertexAttributeImpl { public void vertexAttrPointer(GL gl, int index, int size, int type, int stride, Buffer pointer) { - gl.glVertexAttribPointerARB(index + glslVertexAttrOffset, + gl.getGL2().glVertexAttribPointerARB(index + glslVertexAttrOffset, size, type, false, stride, pointer); } public void enableVertexAttrArray(GL gl, int index) { - gl.glEnableVertexAttribArrayARB(index + glslVertexAttrOffset); + gl.getGL2().glEnableVertexAttribArrayARB(index + glslVertexAttrOffset); } public void disableVertexAttrArray(GL gl, int index) { - gl.glDisableVertexAttribArrayARB(index + glslVertexAttrOffset); + gl.getGL2().glDisableVertexAttribArrayARB(index + glslVertexAttrOffset); } public void vertexAttr1fv(GL gl, int index, FloatBuffer buf) { - gl.glVertexAttrib1fvARB(index + glslVertexAttrOffset, buf); + gl.getGL2().glVertexAttrib1fvARB(index + glslVertexAttrOffset, buf); } public void vertexAttr2fv(GL gl, int index, FloatBuffer buf) { - gl.glVertexAttrib2fvARB(index + glslVertexAttrOffset, buf); + gl.getGL2().glVertexAttrib2fvARB(index + glslVertexAttrOffset, buf); } public void vertexAttr3fv(GL gl, int index, FloatBuffer buf) { - gl.glVertexAttrib3fvARB(index + glslVertexAttrOffset, buf); + gl.getGL2().glVertexAttrib3fvARB(index + glslVertexAttrOffset, buf); } public void vertexAttr4fv(GL gl, int index, FloatBuffer buf) { - gl.glVertexAttrib4fvARB(index + glslVertexAttrOffset, buf); + gl.getGL2().glVertexAttrib4fvARB(index + glslVertexAttrOffset, buf); } } -- cgit v1.2.3