X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.cpp;h=6d0122c055583d0bafa40f70d6bae08128322514;hb=6cee6c490ded0981c4da3f9f4ec74a41555e1a4e;hp=eaed8a45c7b7ed04003e996d28bcd7c85b99e68c;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/core/module.cpp b/source/core/module.cpp
index eaed8a45..6d0122c0 100644
--- a/source/core/module.cpp
+++ b/source/core/module.cpp
@@ -37,6 +37,7 @@ enum SpirVConstants
 	DECO_SPEC_ID = 1,
 	DECO_ARRAY_STRIDE = 6,
 	DECO_MATRIX_STRIDE = 7,
+	DECO_BUILTIN = 11,
 	DECO_LOCATION = 30,
 	DECO_BINDING = 33,
 	DECO_DESCRIPTOR_SET = 34,
@@ -173,18 +174,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;
@@ -193,13 +187,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;
 	}
 
@@ -218,18 +213,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)
@@ -307,7 +295,7 @@ void SpirVModule::Reflection::reflect_code(const vector<uint32_t> &code)
 		case OP_TYPE_INT: reflect_int_type(op); break;
 		case OP_TYPE_FLOAT: reflect_float_type(op); break;
 		case OP_TYPE_VECTOR: reflect_vector_type(op); break;
-		case OP_TYPE_MATRIX: reflect_vector_type(op); break;
+		case OP_TYPE_MATRIX: reflect_matrix_type(op); break;
 		case OP_TYPE_IMAGE: reflect_image_type(op); break;
 		case OP_TYPE_SAMPLED_IMAGE: reflect_sampled_image_type(op); break;
 		case OP_TYPE_ARRAY: reflect_array_type(op); break;
@@ -390,7 +378,7 @@ void SpirVModule::Reflection::reflect_vector_type(CodeIterator op)
 	TypeInfo &type = types[*(op+1)];
 	DataType component = types[*(op+2)].type;
 	unsigned count = *(op+3);
-	type.type = static_cast<DataType>((count<<12) | (component&0xF00) | ((component&0xFF)*count));
+	type.type = static_cast<DataType>(((count-1)<<12) | (component&0xF00) | ((component&0xFF)*count));
 }
 
 void SpirVModule::Reflection::reflect_matrix_type(CodeIterator op)
@@ -398,7 +386,7 @@ void SpirVModule::Reflection::reflect_matrix_type(CodeIterator op)
 	TypeInfo &type = types[*(op+1)];
 	DataType column = types[*(op+2)].type;
 	unsigned count = *(op+3);
-	type.type = static_cast<DataType>((count<<16) | (column&0xF00) | ((column&0xFF)*count));
+	type.type = static_cast<DataType>(((count-1)<<14) | (column&0x3F00) | ((column&0xFF)*count));
 }
 
 void SpirVModule::Reflection::reflect_image_type(CodeIterator op)
@@ -426,9 +414,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;
 }
 
@@ -449,7 +435,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;
 	}
 }
@@ -487,7 +472,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)
@@ -504,6 +488,9 @@ void SpirVModule::Reflection::reflect_decorate(CodeIterator op)
 	case DECO_ARRAY_STRIDE:
 		types[id].array_stride = *op;
 		break;
+	case DECO_BUILTIN:
+		variables[id].builtin = static_cast<BuiltinSemantic>(*op);
+		break;
 	case DECO_LOCATION:
 		variables[id].location = *op;
 		break;
@@ -531,6 +518,9 @@ void SpirVModule::Reflection::reflect_member_decorate(CodeIterator op)
 	case DECO_MATRIX_STRIDE:
 		member.matrix_stride = *op;
 		break;
+	case DECO_BUILTIN:
+		member.builtin = static_cast<BuiltinSemantic>(*op);
+		break;
 	case DECO_OFFSET:
 		member.offset = *op;
 		break;