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

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 54de0c0d..13816a13 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,16 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "arb_vertex_program.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
 #include "buffer.h"
-#include "extension.h"
+#include "error.h"
 #include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -74,15 +66,15 @@ 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
 {
 	if(format.empty())
-		throw InvalidState("Trying to apply a vertex array with no data");
+		throw invalid_operation("VertexArray::apply");
 
 	if(vbuf)
 	{
@@ -138,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;
 		}
@@ -162,9 +154,10 @@ void VertexArray::apply() const
 				if(i>3 || active_tex)
 					glClientActiveTexture(GL_TEXTURE0+(i-3));
 				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+				active_tex = i-3;
 			}
 			else
-				glDisableVertexAttribArrayARB(i-11);
+				glDisableVertexAttribArray(i-11);
 		}
 
 	enabled_arrays = found;
@@ -228,6 +221,10 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("texcoord2", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
 	add("texcoord3", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
 	add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+	add("multitexcoord1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+	add("multitexcoord2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
 	add("color3",    static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
 	add("color4",    static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
 	add("attrib1",   static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
@@ -236,27 +233,5 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
 }
 
-
-void array_element(int i)
-{
-	glArrayElement(i);
-}
-
-void draw_arrays(PrimitiveType mode, int first, unsigned count)
-{
-	glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
-{
-	glDrawElements(mode, count, type, indices);
-}
-
-void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
-{
-	static RequireVersion _ver(1, 2);
-	glDrawRangeElements(mode, low, high, count, type, indices);
-}
-
 } // namespace GL
 } // namespace Msp