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

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 86c9f0f2..55424d6c 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,16 +1,14 @@
-#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>
 #include <msp/gl/extensions/arb_vertex_attrib_binding.h>
 #include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/gl/extensions/khr_debug.h>
 #include "buffer.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "gl.h"
-#include "misc.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
 
@@ -45,6 +43,8 @@ void VertexSetup::set_format(const VertexFormat &vfmt)
 	if(!vertex_format.empty())
 		throw invalid_operation("VertexSetup::set_format");
 
+	require_format(vfmt);
+
 	vertex_format = vfmt;
 }
 
@@ -55,6 +55,9 @@ void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFor
 	if(!vertex_format.empty())
 		throw invalid_operation("VertexSetup::set_format");
 
+	require_format(vfmt);
+	require_format(ifmt);
+
 	vertex_format = vfmt;
 	inst_format = ifmt;
 }
@@ -99,15 +102,25 @@ 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 unsigned char *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;
 }
 
+void VertexSetup::require_format(const VertexFormat &fmt)
+{
+	bool has_int = false;
+	for(VertexAttribute a: fmt)
+		has_int = has_int | is_integer_attribute(a);
+
+	if(has_int)
+		static Require _req(EXT_gpu_shader4);
+}
+
 void VertexSetup::update() const
 {
 	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
@@ -121,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;
@@ -132,41 +145,46 @@ void VertexSetup::update() const
 void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const
 {
 	if(!direct)
-		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id());
+	{
+		Buffer::unbind_scratch();
+		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->id);
+	}
 
 	const VertexFormat &fmt = array.get_format();
-	unsigned stride = fmt.stride()*sizeof(float);
+	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 unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
+	for(VertexAttribute a: fmt)
 	{
-		unsigned sem = get_attribute_semantic(*a);
-		unsigned sz = get_attribute_size(*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(*a==COLOR4_UBYTE)
-				glVertexArrayAttribFormat(id, sem, 4, GL_UNSIGNED_BYTE, true, offset);
+			if(integer)
+				glVertexArrayAttribIFormat(id, sem, cc, type, offset);
 			else
-				glVertexArrayAttribFormat(id, sem, sz, GL_FLOAT, false, offset);
+				glVertexArrayAttribFormat(id, sem, cc, type, true, offset);
 			glVertexArrayAttribBinding(id, sem, binding);
 			glEnableVertexArrayAttrib(id, sem);
 		}
 		else
 		{
-			if(*a==COLOR4_UBYTE)
-				glVertexAttribPointer(sem, 4, GL_UNSIGNED_BYTE, true, stride, reinterpret_cast<unsigned char *>(offset));
+			if(integer)
+				glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast<void *>(offset));
 			else
-				glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast<float *>(offset));
+				glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast<void *>(offset));
 			if(ARB_instanced_arrays)
 				glVertexAttribDivisor(sem, divisor);
 			glEnableVertexAttribArray(sem);
 		}
-		offset += sz*sizeof(float);
+		offset += get_attribute_size(a);
 	}
 
 	if(!direct)
@@ -186,15 +204,15 @@ void VertexSetup::unload()
 		glBindVertexArray(id);
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-		for(const unsigned char *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 unsigned char *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);
 		}