Merge pull request #3513 from phire/make_hdkr_happy

Get shadergen ready for Multithreadded generation of shaders.

1 files changed, 81 insertions, 78 deletions

diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
index 02744c2889..f3562254b9 100644
--- a/Source/Core/VideoCommon/GeometryShaderGen.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -20,43 +20,55 @@ static void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_
 template <class T>
 static void EndPrimitive(T& out, API_TYPE ApiType);
 
-template <class T>
-static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
+GeometryShaderUid GetGeometryShaderUid(u32 primitive_type)
 {
-  T out;
-  // Non-uid template parameters will write to the dummy data (=> gets optimized out)
-  geometry_shader_uid_data dummy_data;
-  geometry_shader_uid_data* uid_data = out.template GetUidData<geometry_shader_uid_data>();
-  if (uid_data != nullptr)
-    memset(uid_data, 0, sizeof(*uid_data));
-  else
-    uid_data = &dummy_data;
+  ShaderUid<geometry_shader_uid_data> out;
+  geometry_shader_uid_data* uid_data = out.GetUidData<geometry_shader_uid_data>();
+  memset(uid_data, 0, sizeof(geometry_shader_uid_data));
 
   uid_data->primitive_type = primitive_type;
-  const unsigned int vertex_in = primitive_type + 1;
-  unsigned int vertex_out = primitive_type == PRIMITIVE_TRIANGLES ? 3 : 4;
-
   uid_data->wireframe = g_ActiveConfig.bWireFrame;
-  if (g_ActiveConfig.bWireFrame)
+  uid_data->msaa = g_ActiveConfig.iMultisamples > 1;
+  uid_data->ssaa = g_ActiveConfig.iMultisamples > 1 && g_ActiveConfig.bSSAA;
+  uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
+  uid_data->numTexGens = xfmem.numTexGen.numTexGens;
+  uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
+
+  return out;
+}
+
+static void EmitVertex(ShaderCode& out, const geometry_shader_uid_data* uid_data,
+                       const char* vertex, API_TYPE ApiType, bool first_vertex = false);
+static void EndPrimitive(ShaderCode& out, const geometry_shader_uid_data* uid_data,
+                         API_TYPE ApiType);
+
+ShaderCode GenerateGeometryShaderCode(API_TYPE ApiType, const geometry_shader_uid_data* uid_data)
+{
+  ShaderCode out;
+  // Non-uid template parameters will write to the dummy data (=> gets optimized out)
+
+  const unsigned int vertex_in = uid_data->primitive_type + 1;
+  unsigned int vertex_out = uid_data->primitive_type == PRIMITIVE_TRIANGLES ? 3 : 4;
+
+  if (uid_data->wireframe)
     vertex_out++;
 
-  uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
   if (ApiType == API_OPENGL)
   {
     // Insert layout parameters
     if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
     {
-      out.Write("layout(%s, invocations = %d) in;\n", primitives_ogl[primitive_type],
-                g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+      out.Write("layout(%s, invocations = %d) in;\n", primitives_ogl[uid_data->primitive_type],
+                uid_data->stereo ? 2 : 1);
       out.Write("layout(%s_strip, max_vertices = %d) out;\n",
-                g_ActiveConfig.bWireFrame ? "line" : "triangle", vertex_out);
+                uid_data->wireframe ? "line" : "triangle", vertex_out);
     }
     else
     {
-      out.Write("layout(%s) in;\n", primitives_ogl[primitive_type]);
+      out.Write("layout(%s) in;\n", primitives_ogl[uid_data->primitive_type]);
       out.Write("layout(%s_strip, max_vertices = %d) out;\n",
-                g_ActiveConfig.bWireFrame ? "line" : "triangle",
-                g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+                uid_data->wireframe ? "line" : "triangle",
+                uid_data->stereo ? vertex_out * 2 : vertex_out);
     }
   }
 
@@ -73,11 +85,9 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
             "\tint4 " I_TEXOFFSET ";\n"
             "};\n");
 
-  uid_data->numTexGens = xfmem.numTexGen.numTexGens;
-  uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
-
   out.Write("struct VS_OUTPUT {\n");
-  GenerateVSOutputMembers<T>(out, ApiType, "");
+  GenerateVSOutputMembers<ShaderCode>(out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting,
+                                      "");
   out.Write("};\n");
 
   if (ApiType == API_OPENGL)
@@ -86,13 +96,17 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
       out.Write("#define InstanceID gl_InvocationID\n");
 
     out.Write("in VertexData {\n");
-    GenerateVSOutputMembers<T>(out, ApiType, GetInterpolationQualifier(true, true));
+    GenerateVSOutputMembers<ShaderCode>(
+        out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting,
+        GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, true));
     out.Write("} vs[%d];\n", vertex_in);
 
     out.Write("out VertexData {\n");
-    GenerateVSOutputMembers<T>(out, ApiType, GetInterpolationQualifier(true, false));
+    GenerateVSOutputMembers<ShaderCode>(
+        out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting,
+        GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, false, true));
 
-    if (g_ActiveConfig.iStereoMode > 0)
+    if (uid_data->stereo)
       out.Write("\tflat int layer;\n");
 
     out.Write("} ps;\n");
@@ -104,39 +118,37 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
     out.Write("struct VertexData {\n");
     out.Write("\tVS_OUTPUT o;\n");
 
-    if (g_ActiveConfig.iStereoMode > 0)
+    if (uid_data->stereo)
       out.Write("\tuint layer : SV_RenderTargetArrayIndex;\n");
 
     out.Write("};\n");
 
     if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
     {
-      out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out,
-                g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+      out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out, uid_data->stereo ? 2 : 1);
       out.Write("void main(%s VS_OUTPUT o[%d], inout %sStream<VertexData> output, in uint "
                 "InstanceID : SV_GSInstanceID)\n{\n",
-                primitives_d3d[primitive_type], vertex_in,
-                g_ActiveConfig.bWireFrame ? "Line" : "Triangle");
+                primitives_d3d[uid_data->primitive_type], vertex_in,
+                uid_data->wireframe ? "Line" : "Triangle");
     }
     else
     {
-      out.Write("[maxvertexcount(%d)]\n",
-                g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+      out.Write("[maxvertexcount(%d)]\n", uid_data->stereo ? vertex_out * 2 : vertex_out);
       out.Write("void main(%s VS_OUTPUT o[%d], inout %sStream<VertexData> output)\n{\n",
-                primitives_d3d[primitive_type], vertex_in,
-                g_ActiveConfig.bWireFrame ? "Line" : "Triangle");
+                primitives_d3d[uid_data->primitive_type], vertex_in,
+                uid_data->wireframe ? "Line" : "Triangle");
     }
 
     out.Write("\tVertexData ps;\n");
   }
 
-  if (primitive_type == PRIMITIVE_LINES)
+  if (uid_data->primitive_type == PRIMITIVE_LINES)
   {
     if (ApiType == API_OPENGL)
     {
       out.Write("\tVS_OUTPUT start, end;\n");
-      AssignVSOutputMembers(out, "start", "vs[0]");
-      AssignVSOutputMembers(out, "end", "vs[1]");
+      AssignVSOutputMembers(out, "start", "vs[0]", uid_data->numTexGens, uid_data->pixel_lighting);
+      AssignVSOutputMembers(out, "end", "vs[1]", uid_data->numTexGens, uid_data->pixel_lighting);
     }
     else
     {
@@ -161,16 +173,16 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
               "\t\toffset = float2(0, -" I_LINEPTPARAMS ".z / " I_LINEPTPARAMS ".y);\n"
               "\t}\n");
   }
-  else if (primitive_type == PRIMITIVE_POINTS)
+  else if (uid_data->primitive_type == PRIMITIVE_POINTS)
   {
     if (ApiType == API_OPENGL)
     {
       out.Write("\tVS_OUTPUT center;\n");
-      AssignVSOutputMembers(out, "center", "vs[0]");
+      AssignVSOutputMembers(out, "center", "vs[0]", uid_data->numTexGens, uid_data->pixel_lighting);
     }
     else
     {
-      out.Write("\tVS_OUTPUT center = o[0];\n");
+      out.Write("\tVS_OUTPUT center = o[0];\n", uid_data->numTexGens, uid_data->pixel_lighting);
     }
 
     // Offset from center to upper right vertex
@@ -179,7 +191,7 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
               ".x, -" I_LINEPTPARAMS ".w / " I_LINEPTPARAMS ".y) * center.pos.w;\n");
   }
 
-  if (g_ActiveConfig.iStereoMode > 0)
+  if (uid_data->stereo)
   {
     // If the GPU supports invocation we don't need a for loop and can simply use the
     // invocation identifier to determine which layer we're rendering.
@@ -189,7 +201,7 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
       out.Write("\tfor (int eye = 0; eye < 2; ++eye) {\n");
   }
 
-  if (g_ActiveConfig.bWireFrame)
+  if (uid_data->wireframe)
     out.Write("\tVS_OUTPUT first;\n");
 
   out.Write("\tfor (int i = 0; i < %d; ++i) {\n", vertex_in);
@@ -197,14 +209,14 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
   if (ApiType == API_OPENGL)
   {
     out.Write("\tVS_OUTPUT f;\n");
-    AssignVSOutputMembers(out, "f", "vs[i]");
+    AssignVSOutputMembers(out, "f", "vs[i]", uid_data->numTexGens, uid_data->pixel_lighting);
   }
   else
   {
     out.Write("\tVS_OUTPUT f = o[i];\n");
   }
 
-  if (g_ActiveConfig.iStereoMode > 0)
+  if (uid_data->stereo)
   {
     // Select the output layer
     out.Write("\tps.layer = eye;\n");
@@ -221,7 +233,7 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
     out.Write("\tf.pos.x += " I_STEREOPARAMS "[eye] * (f.pos.w - " I_STEREOPARAMS "[2]);\n");
   }
 
-  if (primitive_type == PRIMITIVE_LINES)
+  if (uid_data->primitive_type == PRIMITIVE_LINES)
   {
     out.Write("\tVS_OUTPUT l = f;\n"
               "\tVS_OUTPUT r = f;\n");
@@ -232,17 +244,17 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
     out.Write("\tif (" I_TEXOFFSET "[2] != 0) {\n");
     out.Write("\tfloat texOffset = 1.0 / float(" I_TEXOFFSET "[2]);\n");
 
-    for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+    for (unsigned int i = 0; i < uid_data->numTexGens; ++i)
     {
       out.Write("\tif (((" I_TEXOFFSET "[0] >> %d) & 0x1) != 0)\n", i);
       out.Write("\t\tr.tex%d.x += texOffset;\n", i);
     }
     out.Write("\t}\n");
 
-    EmitVertex<T>(out, "l", ApiType, true);
-    EmitVertex<T>(out, "r", ApiType);
+    EmitVertex(out, uid_data, "l", ApiType, true);
+    EmitVertex(out, uid_data, "r", ApiType);
   }
-  else if (primitive_type == PRIMITIVE_POINTS)
+  else if (uid_data->primitive_type == PRIMITIVE_POINTS)
   {
     out.Write("\tVS_OUTPUT ll = f;\n"
               "\tVS_OUTPUT lr = f;\n"
@@ -258,7 +270,7 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
     out.Write("\tfloat2 texOffset = float2(1.0 / float(" I_TEXOFFSET
               "[3]), 1.0 / float(" I_TEXOFFSET "[3]));\n");
 
-    for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
+    for (unsigned int i = 0; i < uid_data->numTexGens; ++i)
     {
       out.Write("\tif (((" I_TEXOFFSET "[1] >> %d) & 0x1) != 0) {\n", i);
       out.Write("\t\tll.tex%d.xy += float2(0,1) * texOffset;\n", i);
@@ -268,21 +280,21 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
     }
     out.Write("\t}\n");
 
-    EmitVertex<T>(out, "ll", ApiType, true);
-    EmitVertex<T>(out, "lr", ApiType);
-    EmitVertex<T>(out, "ul", ApiType);
-    EmitVertex<T>(out, "ur", ApiType);
+    EmitVertex(out, uid_data, "ll", ApiType, true);
+    EmitVertex(out, uid_data, "lr", ApiType);
+    EmitVertex(out, uid_data, "ul", ApiType);
+    EmitVertex(out, uid_data, "ur", ApiType);
   }
   else
   {
-    EmitVertex<T>(out, "f", ApiType, true);
+    EmitVertex(out, uid_data, "f", ApiType, true);
   }
 
   out.Write("\t}\n");
 
-  EndPrimitive<T>(out, ApiType);
+  EndPrimitive(out, uid_data, ApiType);
 
-  if (g_ActiveConfig.iStereoMode > 0 && !g_ActiveConfig.backend_info.bSupportsGSInstancing)
+  if (uid_data->stereo && !g_ActiveConfig.backend_info.bSupportsGSInstancing)
     out.Write("\t}\n");
 
   out.Write("}\n");
@@ -290,16 +302,16 @@ static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType)
   return out;
 }
 
-template <class T>
-static void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex)
+static void EmitVertex(ShaderCode& out, const geometry_shader_uid_data* uid_data,
+                       const char* vertex, API_TYPE ApiType, bool first_vertex)
 {
-  if (g_ActiveConfig.bWireFrame && first_vertex)
+  if (uid_data->wireframe && first_vertex)
     out.Write("\tif (i == 0) first = %s;\n", vertex);
 
   if (ApiType == API_OPENGL)
   {
     out.Write("\tgl_Position = %s.pos;\n", vertex);
-    AssignVSOutputMembers(out, "ps", vertex);
+    AssignVSOutputMembers(out, "ps", vertex, uid_data->numTexGens, uid_data->pixel_lighting);
   }
   else
   {
@@ -311,24 +323,15 @@ static void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_
   else
     out.Write("\toutput.Append(ps);\n");
 }
-template <class T>
-static void EndPrimitive(T& out, API_TYPE ApiType)
+
+static void EndPrimitive(ShaderCode& out, const geometry_shader_uid_data* uid_data,
+                         API_TYPE ApiType)
 {
-  if (g_ActiveConfig.bWireFrame)
-    EmitVertex<T>(out, "first", ApiType);
+  if (uid_data->wireframe)
+    EmitVertex(out, uid_data, "first", ApiType);
 
   if (ApiType == API_OPENGL)
     out.Write("\tEndPrimitive();\n");
   else
     out.Write("\toutput.RestartStrip();\n");
 }
-
-GeometryShaderUid GetGeometryShaderUid(u32 primitive_type, API_TYPE ApiType)
-{
-  return GenerateGeometryShader<GeometryShaderUid>(primitive_type, ApiType);
-}
-
-ShaderCode GenerateGeometryShaderCode(u32 primitive_type, API_TYPE ApiType)
-{
-  return GenerateGeometryShader<ShaderCode>(primitive_type, ApiType);
-}