X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=9947ac1108a59ef5b5a9a72d9caaa7987ba11782;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=a4dffbb7bae4876af7c9535a1f965e8431b64f7b;hpb=2fa1bb084e54af7134b44d3ee7512056e28de67e;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index a4dffbb7..9947ac11 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,6 +1,5 @@
 #include <msp/gl/extensions/arb_multitexture.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
-#include <msp/gl/extensions/msp_legacy_features.h>
 #include "buffer.h"
 #include "error.h"
 #include "gl.h"
@@ -12,8 +11,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-bool VertexArray::legacy_used = false;
-
 VertexArray::VertexArray(const VertexFormat &f)
 {
 	reset(f);
@@ -32,7 +29,6 @@ void VertexArray::reset(const VertexFormat &f)
 	clear();
 	format = f;
 	stride = get_stride(format);
-	legacy = false;
 
 	arrays.clear();
 
@@ -47,9 +43,6 @@ void VertexArray::reset(const VertexFormat &f)
 		arr.component = *c;
 		arr.offset = offs;
 
-		if(*c<ATTRIB1)
-			legacy = true;
-
 		offs += get_component_size(*c);
 	}
 }
@@ -108,7 +101,7 @@ unsigned VertexArray::get_data_size() const
 	return data.size()*sizeof(float);
 }
 
-void VertexArray::apply(bool use_legacy) const
+void VertexArray::apply() const
 {
 	if(format.empty())
 		throw invalid_operation("VertexArray::apply");
@@ -116,16 +109,7 @@ void VertexArray::apply(bool use_legacy) const
 	if(Mesh::current())
 		throw invalid_operation("VertexArray::apply");
 
-	/* Unbind first if the legacy flag changes.  The logic for supporting it
-	directly in apply_arrays would get too complicated, and this also allows
-	rebinding the same array with different legacy setting. */
-	if(legacy_used!=use_legacy)
-		unbind();
-
-	if(!use_legacy)
-		static Require _req(ARB_vertex_shader);
-	else if(legacy)
-		static Require _req(MSP_legacy_features);
+	static Require _req(ARB_vertex_shader);
 
 	const VertexArray *old = current();
 	/* If the array has been modified, apply it even if it was the last one to
@@ -142,12 +126,11 @@ void VertexArray::apply(bool use_legacy) const
 
 	const float *base = (vbuf ? reinterpret_cast<float *>(get_offset()) : &data[0]);
 	unsigned stride_bytes = stride*sizeof(float);
-	apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes, use_legacy);
+	apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes);
 }
 
-void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes, bool use_legacy)
+void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes)
 {
-	unsigned active_tex = 0;
 	unsigned n_arrays = arrays ? arrays->size() : 0;
 	if(old_arrays)
 		n_arrays = max<unsigned>(n_arrays, old_arrays->size());
@@ -161,56 +144,6 @@ void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array>
 		unsigned char comp = (arr ? arr->component : old_arr->component);
 		unsigned sz = get_component_size(comp);
 		unsigned t = get_component_type(comp);
-		if(use_legacy)
-		{
-			GLenum array_type = 0;
-			if(t==get_component_type(VERTEX3))
-			{
-				if(arr)
-					glVertexPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
-				array_type = GL_VERTEX_ARRAY;
-			}
-			else if(t==get_component_type(NORMAL3))
-			{
-				if(arr)
-					glNormalPointer(GL_FLOAT, stride_bytes, base+arr->offset);
-				array_type = GL_NORMAL_ARRAY;
-			}
-			else if(t==get_component_type(COLOR4_FLOAT))
-			{
-				if(arr)
-				{
-					if(sz==1)
-						glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+arr->offset);
-					else
-						glColorPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
-				}
-				array_type = GL_COLOR_ARRAY;
-			}
-			else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
-			{
-				t -= get_component_type(TEXCOORD1);
-				if(t>0 || active_tex)
-				{
-					glClientActiveTexture(GL_TEXTURE0+t);
-					active_tex = t;
-				}
-				if(arr)
-					glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
-				array_type = GL_TEXTURE_COORD_ARRAY;
-			}
-
-			if(array_type)
-			{
-				// Only change enable state if needed
-				if(arr && !old_arr)
-					glEnableClientState(array_type);
-				else if(old_arr && !arr)
-					glDisableClientState(array_type);
-
-				continue;
-			}
-		}
 
 		if(t>=get_component_type(ATTRIB1))
 			t -= get_component_type(ATTRIB1);
@@ -228,18 +161,13 @@ void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array>
 		else if(old_arr && !arr)
 			glDisableVertexAttribArray(t);
 	}
-
-	if(active_tex)
-		glClientActiveTexture(GL_TEXTURE0);
-
-	legacy_used = use_legacy;
 }
 
 void VertexArray::unbind()
 {
 	const VertexArray *old = current();
 	if(set_current(0))
-		apply_arrays(0, &old->arrays, 0, 0, legacy_used);
+		apply_arrays(0, &old->arrays, 0, 0);
 }