X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.cpp;h=85312bc4edb67760f2e87d0591a0e7499707d114;hb=7272d97c23eedb3850661deec964c4a9c96337fe;hp=9cb1b7f2e112a8d8d06d85dc92ab3f1d8561dcd5;hpb=2b1dc627491c987b0459226dcb8ac6aadd7ee4d3;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 9cb1b7f2..85312bc4 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -199,6 +199,18 @@ SpirVGenerator::BuiltinSemantic SpirVGenerator::get_builtin_semantic(const strin
 		return BUILTIN_SAMPLE_POSITION;
 	else if(name=="gl_FragDepth")
 		return BUILTIN_FRAG_DEPTH;
+	else if(name=="gl_NumWorkGroups")
+		return BUILTIN_NUM_WORKGROUPS;
+	else if(name=="gl_WorkGroupSize")
+		return BUILTIN_WORKGROUP_SIZE;
+	else if(name=="gl_WorkGroupID")
+		return BUILTIN_WORKGROUP_ID;
+	else if(name=="gl_LocalInvocationID")
+		return BUILTIN_LOCAL_INVOCATION_ID;
+	else if(name=="gl_GlobalInvocationID")
+		return BUILTIN_GLOBAL_INVOCATION_ID;
+	else if(name=="gl_LocalInvocationIndex")
+		return BUILTIN_LOCAL_INVOCATION_INDEX;
 	else
 		throw invalid_argument("SpirVGenerator::get_builtin_semantic");
 }
@@ -1759,6 +1771,10 @@ void SpirVGenerator::visit(VariableDeclaration &var)
 			BuiltinSemantic semantic = get_builtin_semantic(var.name);
 			writer.write_op_decorate(var_id, DECO_BUILTIN, semantic);
 		}
+		if(var.sampling=="flat")
+			writer.write_op_decorate(var_id, DECO_FLAT);
+		if(var.sampling=="centroid")
+			writer.write_op_decorate(var_id, DECO_CENTROID);
 
 		if(init_id && current_function)
 		{
@@ -1779,6 +1795,7 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 	case Stage::VERTEX: writer.write(0); break;
 	case Stage::GEOMETRY: writer.write(3); break;
 	case Stage::FRAGMENT: writer.write(4); break;
+	case Stage::COMPUTE: writer.write(5); break;
 	default: throw internal_error("unknown stage");
 	}
 	writer.write(func_id);
@@ -1803,6 +1820,8 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 		writer.write_op(content.exec_modes, OP_EXECUTION_MODE, func_id, EXEC_INVOCATIONS, 1);
 	}
 
+	unsigned local_size[3] = { 0, 1, 1 };
+
 	for(const InterfaceLayout *i: interface_layouts)
 	{
 		for(const Layout::Qualifier &q: i->layout.qualifiers)
@@ -1824,8 +1843,24 @@ void SpirVGenerator::visit_entry_point(FunctionDeclaration &func, Id func_id)
 				writer.write_op(content.exec_modes, OP_EXECUTION_MODE, func_id, EXEC_OUTPUT_TRIANGLE_STRIP);
 			else if(q.name=="max_vertices")
 				writer.write_op(content.exec_modes, OP_EXECUTION_MODE, func_id, EXEC_OUTPUT_VERTICES, q.value);
+			else if(q.name=="local_size_x")
+				local_size[0] = q.value;
+			else if(q.name=="local_size_y")
+				local_size[1] = q.value;
+			else if(q.name=="local_size_z")
+				local_size[2] = q.value;
 		}
 	}
+
+	if(stage->type==Stage::COMPUTE && local_size[0])
+	{
+		writer.begin_op(content.exec_modes, OP_EXECUTION_MODE);
+		writer.write(func_id);
+		writer.write(EXEC_LOCAL_SIZE);
+		for(unsigned j=0; j<3; ++j)
+			writer.write(local_size[j]);
+		writer.end_op(OP_EXECUTION_MODE);
+	}
 }
 
 void SpirVGenerator::visit(FunctionDeclaration &func)