X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=55424d6caf41eb9979f2de294547cf7f13fd210a;hb=009918e76dda88b0cb68fdaa20c63d6e952af260;hp=7a24da7350b5f332a1e2aaaaa5c80a29fc7646e8;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 7a24da73..55424d6c 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_instanced_arrays.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
@@ -10,8 +9,6 @@
 #include "buffer.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "gl.h"
-#include "misc.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
 
@@ -105,10 +102,10 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
 	if(fmt.empty())
 		return false;
 
-	unsigned max_attribs = Limits::get_global().max_vertex_attributes;
+	unsigned max_attribs = DeviceInfo::get_global().limits.max_vertex_attributes;
 
-	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
-		if(get_attribute_semantic(*a)>=max_attribs)
+	for(VertexAttribute a: fmt)
+		if(get_attribute_semantic(a)>=max_attribs)
 			return false;
 
 	return true;
@@ -117,8 +114,8 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
 void VertexSetup::require_format(const VertexFormat &fmt)
 {
 	bool has_int = false;
-	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
-		has_int = has_int | is_integer_attribute(*a);
+	for(VertexAttribute a: fmt)
+		has_int = has_int | is_integer_attribute(a);
 
 	if(has_int)
 		static Require _req(EXT_gpu_shader4);
@@ -137,9 +134,9 @@ void VertexSetup::update() const
 	if(dirty&INDEX_BUFFER)
 	{
 		if(direct)
-			glVertexArrayElementBuffer(id, index_buffer->get_id());
+			glVertexArrayElementBuffer(id, index_buffer->id);
 		else
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->id);
 	}
 
 	dirty = 0;
@@ -150,24 +147,24 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
 	if(!direct)
 	{
 		Buffer::unbind_scratch();
-		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id());
+		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->id);
 	}
 
 	const VertexFormat &fmt = array.get_format();
 	unsigned stride = fmt.stride();
 	if(direct)
 	{
-		glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride);
+		glVertexArrayVertexBuffer(id, binding, array.get_buffer()->id, 0, stride);
 		glVertexArrayBindingDivisor(id, binding, divisor);
 	}
 
 	unsigned offset = 0;
-	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
+	for(VertexAttribute a: fmt)
 	{
-		unsigned sem = get_attribute_semantic(*a);
-		bool integer = is_integer_attribute(*a);
-		GLenum type = get_gl_type(get_attribute_source_type(*a));
-		unsigned cc = get_attribute_component_count(*a);
+		unsigned sem = get_attribute_semantic(a);
+		bool integer = is_integer_attribute(a);
+		GLenum type = get_gl_type(get_attribute_source_type(a));
+		unsigned cc = get_attribute_component_count(a);
 		if(direct)
 		{
 			if(integer)
@@ -187,7 +184,7 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
 				glVertexAttribDivisor(sem, divisor);
 			glEnableVertexAttribArray(sem);
 		}
-		offset += get_attribute_size(*a);
+		offset += get_attribute_size(a);
 	}
 
 	if(!direct)
@@ -207,15 +204,15 @@ void VertexSetup::unload()
 		glBindVertexArray(id);
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-		for(const UInt16 *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
+		for(VertexAttribute a: vertex_format)
 		{
-			unsigned sem = get_attribute_semantic(*a);
+			unsigned sem = get_attribute_semantic(a);
 			glDisableVertexAttribArray(sem);
 			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
 		}
-		for(const UInt16 *a=inst_format.begin(); a!=inst_format.end(); ++a)
+		for(VertexAttribute a: inst_format)
 		{
-			unsigned sem = get_attribute_semantic(*a);
+			unsigned sem = get_attribute_semantic(a);
 			glDisableVertexAttribArray(sem);
 			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
 		}