X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=13816a13fc04caf572559d592cd91ad2fe3ccdd0;hp=e5e8120432bb856ce7170eb6168e190b206d67ec;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hpb=485315ca65cb40f33253008a79b0933997bd74f5

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index e5e81204..13816a13 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,10 +1,8 @@
-#include "arb_vertex_program.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
 #include "buffer.h"
 #include "error.h"
-#include "extension.h"
 #include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -68,9 +66,9 @@ void VertexArray::reset(const VertexFormat &f)
 			has_gen_attrs = true;
 	}
 	if(has_multitex)
-		static RequireVersion _ver(1, 3);
+		static Require _req(ARB_multitexture);
 	if(has_gen_attrs)
-		static RequireExtension _ext("GL_ARB_vertex_program");
+		static Require _req(ARB_vertex_shader);
 }
 
 void VertexArray::apply() const
@@ -132,9 +130,9 @@ void VertexArray::apply() const
 			}
 			else
 			{
-				glVertexAttribPointerARB(t-11, sz, GL_FLOAT, false, bpv, base+offset);
+				glVertexAttribPointer(t-11, sz, GL_FLOAT, false, bpv, base+offset);
 				if(!en)
-					glEnableVertexAttribArrayARB(t-11);
+					glEnableVertexAttribArray(t-11);
 			}
 			break;
 		}
@@ -159,7 +157,7 @@ void VertexArray::apply() const
 				active_tex = i-3;
 			}
 			else
-				glDisableVertexAttribArrayARB(i-11);
+				glDisableVertexAttribArray(i-11);
 		}
 
 	enabled_arrays = found;