X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.cpp;h=15bd750cf0b299bd7ea8440ed6d0be5adc3788d1;hb=f73e671dcb36c097647cddbf5b1eaaad2ffc9299;hp=4afbc53403d4f283cd57277a5436a64775b1bc3e;hpb=fbd0c3ae115021221e4c7222fd2070748d3d0878;p=libs%2Fgl.git

diff --git a/source/core/module.cpp b/source/core/module.cpp
index 4afbc534..15bd750c 100644
--- a/source/core/module.cpp
+++ b/source/core/module.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/algorithm.h>
 #include <msp/io/print.h>
+#include "device.h"
 #include "module.h"
 #include "resources.h"
 
@@ -49,14 +50,14 @@ namespace GL {
 
 void Module::set_source(const string &src)
 {
-	SL::Compiler compiler;
+	SL::Compiler compiler(create_features());
 	compiler.set_source(src);
 	compile(compiler);
 }
 
 void Module::load_source(IO::Base &io, Resources *res, const string &name)
 {
-	SL::Compiler compiler;
+	SL::Compiler compiler(create_features());
 	compiler.load_source(io, res, name);
 	compile(compiler);
 }
@@ -66,6 +67,20 @@ void Module::load_source(IO::Base &io, const string &name)
 	load_source(io, 0, name);
 }
 
+SL::Features Module::create_features() const
+{
+	const DeviceInfo &dev_info = Device::get_current().get_info();
+	const SL::Features &device_features = dev_info.glsl_features;
+	SL::Features latest_features = SL::Features::latest(dev_info.api);
+	SL::Features features;
+	features.target_api = latest_features.target_api;
+	features.glsl_version = latest_features.glsl_version;
+	features.constant_id_range = device_features.constant_id_range;
+	features.uniform_binding_range = device_features.uniform_binding_range;
+	features.texture_binding_range = device_features.texture_binding_range;
+	return features;
+}
+
 
 void GlslModule::compile(SL::Compiler &compiler)
 {
@@ -174,18 +189,11 @@ void SpirVModule::reflect()
 	for(Structure &s: structs)
 	{
 		for(StructMember &m: s.members)
-		{
 			if(m.struct_type)
 			{
 				auto i = struct_indices.find(m.struct_type);
 				m.struct_type = (i!=struct_indices.end() ? &structs[i->second] : 0);
 			}
-			if(m.array_size_spec)
-			{
-				auto i = spec_indices.find(m.array_size_spec);
-				m.array_size_spec = (i!=spec_indices.end() ? &spec_constants[i->second] : 0);
-			}
-		}
 
 		const StructMember *last_member = &s.members.back();
 		unsigned last_offset = last_member->offset;
@@ -194,13 +202,14 @@ void SpirVModule::reflect()
 			const StructMember *lm = &last_member->struct_type->members.back();
 			if(last_member->array_size)
 				last_offset += last_member->array_stride*(last_member->array_size-1);
-			else if(last_member->array_size_spec)
-				last_offset += last_member->array_stride*(last_member->array_size_spec->i_value-1);
 			last_offset += lm->offset;
 			last_member = lm;
 		}
 		
-		s.size = last_offset+get_type_size(last_member->type);
+		unsigned last_size = get_type_size(last_member->type); 
+		if(last_member->array_size)
+			last_size += last_member->array_stride*(last_member->array_size-1);
+		s.size = last_offset+last_size;
 		s.size = (s.size+15)&~15;
 	}
 
@@ -219,18 +228,11 @@ void SpirVModule::reflect()
 	}
 
 	for(Variable &v: variables)
-	{
 		if(v.struct_type)
 		{
 			auto i = struct_indices.find(v.struct_type);
 			v.struct_type = (i!=struct_indices.end() ? &structs[i->second] : 0);
 		}
-		if(v.array_size_spec)
-		{
-			auto i = spec_indices.find(v.array_size_spec);
-			v.array_size_spec = (i!=spec_indices.end() ? &spec_constants[i->second] : 0);
-		}
-	}
 
 	entry_points.reserve(reflection.entry_points.size());
 	for(const auto &kvp: reflection.entry_points)
@@ -427,9 +429,7 @@ void SpirVModule::Reflection::reflect_array_type(CodeIterator op)
 	type.struct_type = elem.struct_type;
 
 	const Constant &size = constants[*(op+3)];
-	if(size.constant_id>=0)
-		type.array_size_spec = &size;
-	else if(size.type==INT || size.type==UNSIGNED_INT)
+	if(size.type==INT || size.type==UNSIGNED_INT)
 		type.array_size = size.i_value;
 }
 
@@ -450,7 +450,6 @@ void SpirVModule::Reflection::reflect_struct_type(CodeIterator op)
 		mem->type = type.type;
 		mem->struct_type = type.struct_type;
 		mem->array_size = type.array_size;
-		mem->array_size_spec = type.array_size_spec;
 		mem->array_stride = type.array_stride;
 	}
 }
@@ -488,7 +487,6 @@ void SpirVModule::Reflection::reflect_variable(CodeIterator op)
 	var.type = type.type;
 	var.struct_type = type.struct_type;
 	var.array_size = type.array_size;
-	var.array_size_spec = type.array_size_spec;
 }
 
 void SpirVModule::Reflection::reflect_decorate(CodeIterator op)