Merge pull request #1706 from Armada651/line-width

VideoCommon: Merge LineGeometryShader into GeometryShaderGen.

1 files changed, 197 insertions, 54 deletions

diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
index 57009aedaa..cabdfea191 100644
--- a/Source/Core/VideoCommon/GeometryShaderGen.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -4,15 +4,33 @@
 
 #include <cmath>
 
+#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/GeometryShaderGen.h"
 #include "VideoCommon/LightingShaderGen.h"
+#include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VertexShaderGen.h"
 #include "VideoCommon/VideoConfig.h"
 
 static char text[16384];
 
+static const char* primitives_ogl[] =
+{
+	"points",
+	"lines",
+	"triangles"
+};
+
+static const char* primitives_d3d[] =
+{
+	"point",
+	"line",
+	"triangle"
+};
+
+template<class T> static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType);
+
 template<class T>
-static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiType)
+static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE ApiType)
 {
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	geometry_shader_uid_data dummy_data;
@@ -26,93 +44,154 @@ static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiTy
 	if (is_writing_shadercode)
 		text[sizeof(text) - 1] = 0x7C;  // canary
 
-	out.Write("//Geometry Shader for 3D stereoscopy\n");
+	uid_data->primitive_type = primitive_type;
+	const unsigned int vertex_in = primitive_type + 1;
+	const unsigned int vertex_out = primitive_type == PRIMITIVE_TRIANGLES ? 3 : 4;
 
 	uid_data->stereo = g_ActiveConfig.iStereoMode > 0;
 	if (ApiType == API_OPENGL)
 	{
 		// Insert layout parameters
 		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
-			out.Write("layout(triangles, invocations = %d) in;\n", g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+		{
+			out.Write("layout(%s, invocations = %d) in;\n", primitives_ogl[primitive_type], g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+			out.Write("layout(triangle_strip, max_vertices = %d) out;\n", vertex_out);
+		}
 		else
-			out.Write("layout(triangles) in;\n");
-		out.Write("layout(triangle_strip, max_vertices = %d) out;\n", g_ActiveConfig.backend_info.bSupportsGSInstancing ? 3 : 6);
+		{
+			out.Write("layout(%s) in;\n", primitives_ogl[primitive_type]);
+			out.Write("layout(triangle_strip, max_vertices = %d) out;\n", g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+		}
 	}
 
 	out.Write("%s", s_lighting_struct);
 
 	// uniforms
 	if (ApiType == API_OPENGL)
-		out.Write("layout(std140%s) uniform VSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 2" : "");
+		out.Write("layout(std140%s) uniform GSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 3" : "");
 	else
-		out.Write("cbuffer VSBlock {\n");
-	out.Write(s_shader_uniforms);
-	out.Write("};\n");
-
-	uid_data->numTexGens = xfmem.numTexGen.numTexGens;
+		out.Write("cbuffer GSBlock {\n");
+	out.Write(
+		"\tfloat4 " I_STEREOPARAMS";\n"
+		"\tfloat4 " I_LINEPTPARAMS";\n"
+		"\tint4 " I_TEXOFFSET";\n"
+		"};\n");
+
+	uid_data->numTexGens = bpmem.genMode.numtexgens;
 	uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
 
 	GenerateVSOutputStruct<T>(out, ApiType);
 
 	if (ApiType == API_OPENGL)
 	{
-		out.Write("centroid in VS_OUTPUT o[3];\n");
-		out.Write("centroid out VS_OUTPUT vs;\n");
-		out.Write("flat out int layer;\n");
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+			out.Write("#define InstanceID gl_InvocationID\n");
+
+		out.Write("in VertexData {\n");
+		out.Write("\tcentroid VS_OUTPUT o;\n");
+		out.Write("} vs[%d];\n", vertex_in);
+
+		out.Write("out VertexData {\n");
+		out.Write("\tcentroid VS_OUTPUT o;\n");
+
+		if (g_ActiveConfig.iStereoMode > 0)
+			out.Write("\tflat int layer;\n");
+
+		out.Write("} ps;\n");
 
 		out.Write("void main()\n{\n");
 	}
 	else // D3D
 	{
-		out.Write("struct GS_OUTPUT {\n");
-		out.Write("\tVS_OUTPUT vs;\n");
-		out.Write("\tuint layer : SV_RenderTargetArrayIndex;\n");
+		out.Write("struct VertexData {\n");
+		out.Write("\tVS_OUTPUT o;\n");
+
+		if (g_ActiveConfig.iStereoMode > 0)
+			out.Write("\tuint layer : SV_RenderTargetArrayIndex;\n");
+
 		out.Write("};\n");
 
 		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
 		{
-			out.Write("[maxvertexcount(3)]\n[instance(%d)]\n", g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
-			out.Write("void main(triangle VS_OUTPUT o[3], inout TriangleStream<GS_OUTPUT> Output, in uint InstanceID : SV_GSInstanceID)\n{\n");
+			out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out, g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
+			out.Write("void main(%s VS_OUTPUT o[%d], inout TriangleStream<VertexData> output, in uint InstanceID : SV_GSInstanceID)\n{\n", primitives_d3d[primitive_type], vertex_in);
 		}
 		else
 		{
-			out.Write("[maxvertexcount(6)]\n");
-			out.Write("void main(triangle VS_OUTPUT o[3], inout TriangleStream<GS_OUTPUT> Output)\n{\n");
+			out.Write("[maxvertexcount(%d)]\n", g_ActiveConfig.iStereoMode > 0 ? vertex_out * 2 : vertex_out);
+			out.Write("void main(%s VS_OUTPUT o[%d], inout TriangleStream<VertexData> output)\n{\n", primitives_d3d[primitive_type], vertex_in);
 		}
 
-		out.Write("\tGS_OUTPUT gs;\n");
+		out.Write("\tVertexData ps;\n");
 	}
 
-	out.Write("\tVS_OUTPUT f;\n");
+	if (primitive_type == PRIMITIVE_LINES)
+	{
+		if (ApiType == API_OPENGL)
+		{
+			out.Write("\tVS_OUTPUT start = vs[0].o;\n");
+			out.Write("\tVS_OUTPUT end = vs[1].o;\n");
+		}
+		else
+		{
+			out.Write("\tVS_OUTPUT start = o[0];\n");
+			out.Write("\tVS_OUTPUT end = o[1];\n");
+		}
 
-	// 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.
-	if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
+		// GameCube/Wii's line drawing algorithm is a little quirky. It does not
+		// use the correct line caps. Instead, the line caps are vertical or
+		// horizontal depending the slope of the line.
+		out.Write(
+			"\tfloat2 offset;\n"
+			"\tfloat2 to = abs(end.pos.xy - start.pos.xy);\n"
+			// FIXME: What does real hardware do when line is at a 45-degree angle?
+			// FIXME: Lines aren't drawn at the correct width. See Twilight Princess map.
+			"\tif (" I_LINEPTPARAMS".y * to.y > " I_LINEPTPARAMS".x * to.x) {\n"
+			// Line is more tall. Extend geometry left and right.
+			// Lerp LineWidth/2 from [0..VpWidth] to [-1..1]
+			"\t\toffset = float2(" I_LINEPTPARAMS".z / " I_LINEPTPARAMS".x, 0);\n"
+			"\t} else {\n"
+			// Line is more wide. Extend geometry up and down.
+			// Lerp LineWidth/2 from [0..VpHeight] to [1..-1]
+			"\t\toffset = float2(0, -" I_LINEPTPARAMS".z / " I_LINEPTPARAMS".y);\n"
+			"\t}\n");
+	}
+	else if (primitive_type == PRIMITIVE_POINTS)
 	{
 		if (ApiType == API_OPENGL)
-			out.Write("\tint eye = gl_InvocationID;\n");
+			out.Write("\tVS_OUTPUT center = vs[0].o;\n");
 		else
+			out.Write("\tVS_OUTPUT center = o[0];\n");
+
+		// Offset from center to upper right vertex
+		// Lerp PointSize/2 from [0,0..VpWidth,VpHeight] to [-1,1..1,-1]
+		out.Write("\tfloat2 offset = float2(" I_LINEPTPARAMS".w / " I_LINEPTPARAMS".x, -" I_LINEPTPARAMS".w / " I_LINEPTPARAMS".y) * center.pos.w;\n");
+	}
+
+	if (g_ActiveConfig.iStereoMode > 0)
+	{
+		// 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.
+		if (g_ActiveConfig.backend_info.bSupportsGSInstancing)
 			out.Write("\tint eye = InstanceID;\n");
+		else
+			out.Write("\tfor (int eye = 0; eye < 2; ++eye) {\n");
 	}
-	else
-		out.Write("\tfor (int eye = 0; eye < %d; ++eye) {\n", g_ActiveConfig.iStereoMode > 0 ? 2 : 1);
 
-	out.Write("\tfor (int i = 0; i < 3; ++i) {\n");
+	out.Write("\tfor (int i = 0; i < %d; ++i) {\n", vertex_in);
 
-	// Select the output layer
 	if (ApiType == API_OPENGL)
-	{
-		out.Write("\t\tgl_Layer = eye;\n");
-		out.Write("\t\tlayer = eye;\n");
-	}
+		out.Write("\tVS_OUTPUT f = vs[i].o;\n");
 	else
-		out.Write("\t\tgs.layer = eye;\n");
-
-	out.Write("\t\tf = o[i];\n");
-	out.Write("\t\tfloat4 pos = o[i].pos;\n");
+		out.Write("\tVS_OUTPUT f = o[i];\n");
 
 	if (g_ActiveConfig.iStereoMode > 0)
 	{
+		// Select the output layer
+		out.Write("\tps.layer = eye;\n");
+		if (ApiType == API_OPENGL)
+			out.Write("\tgl_Layer = eye;\n");
+
 		// For stereoscopy add a small horizontal offset in Normalized Device Coordinates proportional
 		// to the depth of the vertex. We retrieve the depth value from the w-component of the projected
 		// vertex which contains the negated z-component of the original vertex.
@@ -120,30 +199,74 @@ static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiTy
 		// the depth value. This results in objects at a distance smaller than the convergence
 		// distance to seemingly appear in front of the screen.
 		// This formula is based on page 13 of the "Nvidia 3D Vision Automatic, Best Practices Guide"
-		out.Write("\t\tf.clipPos.x = o[i].clipPos.x + " I_STEREOPARAMS"[eye] * (o[i].clipPos.w - " I_STEREOPARAMS"[2]);\n");
-		out.Write("\t\tpos.x = o[i].pos.x + " I_STEREOPARAMS"[eye] * (o[i].pos.w - " I_STEREOPARAMS"[2]);\n");
+		out.Write("\tf.clipPos.x += " I_STEREOPARAMS"[eye] * (f.clipPos.w - " I_STEREOPARAMS"[2]);\n");
+		out.Write("\tf.pos.x += " I_STEREOPARAMS"[eye] * (f.pos.w - " I_STEREOPARAMS"[2]);\n");
 	}
 
-	out.Write("\t\tf.pos.x = pos.x;\n");
+	if (primitive_type == PRIMITIVE_LINES)
+	{
+		out.Write("\tVS_OUTPUT l = f;\n"
+		          "\tVS_OUTPUT r = f;\n");
 
-	if (ApiType == API_OPENGL)
-		out.Write("\t\tgl_Position = pos;\n");
+		out.Write("\tl.pos.xy -= offset * l.pos.w;\n"
+		          "\tr.pos.xy += offset * r.pos.w;\n");
 
-	out.Write("\t\t%s = f;\n", (ApiType == API_OPENGL) ? "vs" : "gs.vs");
+		out.Write("\tif (" I_TEXOFFSET"[2] != 0) {\n");
+		out.Write("\tfloat texOffset = 1.0 / float(" I_TEXOFFSET"[2]);\n");
 
-	if (ApiType == API_OPENGL)
-		out.Write("\t\tEmitVertex();\n");
+		for (unsigned int i = 0; i < bpmem.genMode.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);
+		EmitVertex<T>(out, "r", ApiType);
+	}
+	else if (primitive_type == PRIMITIVE_POINTS)
+	{
+		out.Write("\tVS_OUTPUT ll = f;\n"
+		          "\tVS_OUTPUT lr = f;\n"
+		          "\tVS_OUTPUT ul = f;\n"
+		          "\tVS_OUTPUT ur = f;\n");
+
+		out.Write("\tll.pos.xy += float2(-1,-1) * offset;\n"
+		          "\tlr.pos.xy += float2(1,-1) * offset;\n"
+		          "\tul.pos.xy += float2(-1,1) * offset;\n"
+		          "\tur.pos.xy += offset;\n");
+
+		out.Write("\tif (" I_TEXOFFSET"[3] != 0) {\n");
+		out.Write("\tfloat2 texOffset = float2(1.0 / float(" I_TEXOFFSET"[3]), 1.0 / float(" I_TEXOFFSET"[3]));\n");
+
+		for (unsigned int i = 0; i < bpmem.genMode.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);
+			out.Write("\t\tlr.tex%d.xy += texOffset;\n", i);
+			out.Write("\t\tur.tex%d.xy += float2(1,0) * texOffset;\n", i);
+			out.Write("\t}\n");
+		}
+		out.Write("\t}\n");
+
+		EmitVertex<T>(out, "ll", ApiType);
+		EmitVertex<T>(out, "lr", ApiType);
+		EmitVertex<T>(out, "ul", ApiType);
+		EmitVertex<T>(out, "ur", ApiType);
+	}
 	else
-		out.Write("\t\tOutput.Append(gs);\n");
+	{
+		EmitVertex<T>(out, "f", ApiType);
+	}
 
 	out.Write("\t}\n");
 
 	if (ApiType == API_OPENGL)
 		out.Write("\tEndPrimitive();\n");
 	else
-		out.Write("\tOutput.RestartStrip();\n");
+		out.Write("\toutput.RestartStrip();\n");
 
-	if (!g_ActiveConfig.backend_info.bSupportsGSInstancing)
+	if (g_ActiveConfig.iStereoMode > 0 && !g_ActiveConfig.backend_info.bSupportsGSInstancing)
 		out.Write("\t}\n");
 
 	out.Write("}\n");
@@ -155,12 +278,32 @@ static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiTy
 	}
 }
 
-void GetGeometryShaderUid(GeometryShaderUid& object, u32 components, API_TYPE ApiType)
+template<class T>
+static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType)
+{
+	if (ApiType == API_OPENGL)
+		out.Write("\tgl_Position = %s.pos;\n", vertex);
+
+	out.Write("\tps.o = %s;\n", vertex);
+
+	if (ApiType == API_OPENGL)
+		out.Write("\tEmitVertex();\n");
+	else
+		out.Write("\toutput.Append(ps);\n");
+}
+
+void GetGeometryShaderUid(GeometryShaderUid& object, u32 primitive_type, API_TYPE ApiType)
+{
+	GenerateGeometryShader<GeometryShaderUid>(object, primitive_type, ApiType);
+}
+
+void GenerateGeometryShaderCode(ShaderCode& object, u32 primitive_type, API_TYPE ApiType)
 {
-	GenerateGeometryShader<GeometryShaderUid>(object, components, ApiType);
+	GenerateGeometryShader<ShaderCode>(object, primitive_type, ApiType);
 }
 
-void GenerateGeometryShaderCode(ShaderCode& object, u32 components, API_TYPE ApiType)
+bool IsPassthroughGeometryShader(GeometryShaderUid& object)
 {
-	GenerateGeometryShader<ShaderCode>(object, components, ApiType);
+	geometry_shader_uid_data* uid_data = object.GetUidData<geometry_shader_uid_data>();
+	return uid_data->primitive_type == PRIMITIVE_TRIANGLES && !uid_data->stereo;
 }