Merge branch 'reflect-workgroup_size' of git://github.com/res2k/SPIRV-Cross

reference/shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-none-ssbo-1.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-none-ssbo-2.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-none-uav-1.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/asm/op-source-none-uav-2.asm.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/comp/struct-layout.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

reference/shaders-reflection/comp/struct-packing.comp.json

@@ -2,7 +2,12 @@
     "entryPoints" : [
         {
             "name" : "main",
-            "mode" : "comp"
+            "mode" : "comp",
+            "workgroup_size" : [
+                1,
+                1,
+                1
+            ]
         }
     ],
     "types" : {

spirv_reflect.cpp

@@ -424,6 +424,15 @@ void CompilerReflection::emit_entry_points()
 			json_stream->begin_json_object();
 			json_stream->emit_json_key_value("name", e.name);
 			json_stream->emit_json_key_value("mode", execution_model_to_str(e.execution_model));
+			if(e.execution_model == ExecutionModelGLCompute)
+			{
+				const auto &spv_entry = get_entry_point(e.name, e.execution_model);
+				json_stream->emit_json_key_array("workgroup_size");
+				json_stream->emit_json_array_value(spv_entry.workgroup_size.x);
+				json_stream->emit_json_array_value(spv_entry.workgroup_size.y);
+				json_stream->emit_json_array_value(spv_entry.workgroup_size.z);
+				json_stream->end_json_array();
+			}
 			json_stream->end_json_object();
 		}
 		json_stream->end_json_array();