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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 6e54f681..efbf8ce2 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -18,8 +18,7 @@ namespace GL {
 class Buffer;
 
 /**
-Stores vertex data.  Both legacy and generic attributes are supported.  Mixing
-the two is possible but discouraged, as driver-specific issues may arise.
+Stores vertex data.
 
 The array's contents can be modified with the append and modify methods.  To
 obtain the location of an individual component within the vertex, use
@@ -50,9 +49,6 @@ private:
 	std::vector<float> data;
 	unsigned stride;
 	std::vector<Array> arrays;
-	bool legacy;
-
-	static bool legacy_used;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
@@ -88,17 +84,14 @@ public:
 	const std::vector<float> &get_data() const { return data; }
 	const float *operator[](unsigned i) const { return &data[0]+i*stride; }
 
-	/** Equivalent to apply(true).  For compatibility with the Bindable
-	interface. */
+	/// Equivalent to apply().  For compatibility with the Bindable interface.
 	void bind() const { apply(); }
 
-	/** Applies component arrays to the GL.  If legacy is true, they are applied
-	as is.  If legacy is false, any legacy attributes are converted to generic
-	attributes. */
-	void apply(bool legacy = true) const;
+	/// Applies component arrays to the GL.
+	void apply() const;
 
 private:
-	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned, bool);
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
 public:
 	static void unbind();
 };