X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.cpp;h=8c69cd7e256673bb1887c61a9f82da31539f2cfb;hb=cebf1330ef6773b7b4496dc279ec02a7ca4351bb;hp=f42a0da76a17d75f30c2da746fcf35f061a8e1ae;hpb=77973a48acbe29c2a64d43de7084574aaf7a26c4;p=libs%2Fgl.git

diff --git a/source/core/module.cpp b/source/core/module.cpp
index f42a0da7..8c69cd7e 100644
--- a/source/core/module.cpp
+++ b/source/core/module.cpp
@@ -48,6 +48,8 @@ enum SpirVConstants
 	OP_RETURN_VALUE = 254,
 	OP_UNREACHABLE = 255,
 
+	EXEC_LOCAL_SIZE = 17,
+
 	DECO_SPEC_ID = 1,
 	DECO_ARRAY_STRIDE = 6,
 	DECO_MATRIX_STRIDE = 7,
@@ -313,7 +315,7 @@ SpirVModule *SpirVModule::specialize(const map<string, int> &spec_values) const
 				unsigned func_id = *(op+2);
 				new_code.push_back(func_id);
 
-				unsigned i=3;
+				unsigned i = 3;
 				while(i<word_count)
 				{
 					unsigned word = *(op+i++);
@@ -513,6 +515,7 @@ void SpirVModule::Reflection::reflect_code(const vector<uint32_t> &code)
 		case OP_NAME: reflect_name(op); break;
 		case OP_MEMBER_NAME: reflect_member_name(op); break;
 		case OP_ENTRY_POINT: reflect_entry_point(op); break;
+		case OP_EXECUTION_MODE: reflect_execution_mode(op); break;
 		case OP_TYPE_VOID: reflect_void_type(op); break;
 		case OP_TYPE_BOOL: reflect_bool_type(op); break;
 		case OP_TYPE_INT: reflect_int_type(op); break;
@@ -579,6 +582,18 @@ void SpirVModule::Reflection::reflect_entry_point(CodeIterator op)
 		entry.globals.push_back(&variables[*op]);
 }
 
+void SpirVModule::Reflection::reflect_execution_mode(CodeIterator op)
+{
+	EntryPoint &entry = entry_points[*(op+1)];
+	unsigned mode = *(op+2);
+	if(mode==EXEC_LOCAL_SIZE)
+	{
+		entry.compute_local_size.x = *(op+3);
+		entry.compute_local_size.y = *(op+4);
+		entry.compute_local_size.z = *(op+5);
+	}
+}
+
 void SpirVModule::Reflection::reflect_void_type(CodeIterator op)
 {
 	types[*(op+1)].type = VOID;
@@ -623,11 +638,13 @@ void SpirVModule::Reflection::reflect_matrix_type(CodeIterator op)
 void SpirVModule::Reflection::reflect_image_type(CodeIterator op)
 {
 	TypeInfo &type = types[*(op+1)];
-	DataType sample = types[*(op+2)].type;
+	DataType sample_type = types[*(op+2)].type;
 	unsigned dimensions = *(op+3);
 	bool depth = *(op+4)==1;
 	bool array = *(op+5);
-	type.type = static_cast<DataType>((depth*0x200000) | (array*0x80000) | ((dimensions+1)<<16) | sample);
+	bool sampled = *(op+7)==1;
+	type.type = static_cast<DataType>((depth*0x200000) | (sampled*0x100000) | (array*0x80000) |
+		((dimensions+1)<<16) | sample_type);
 }
 
 void SpirVModule::Reflection::reflect_sampled_image_type(CodeIterator op)