diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2017-07-27 13:30:38 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 13:30:38 +1000 |
| commit | a11bde7d167c65bb693e5138e47dd4586683c092 (patch) | |
| tree | 84f9128b0478b0b18e271e0426fceb499c9e72e3 /Source/Core/VideoCommon | |
| parent | 10db1bcbca947a56e872ed4b6625d9d3de31b298 (diff) | |
| parent | 3ea9d86faa2544b8c1c235db9456f271baf42fec (diff) | |
Merge pull request #5679 from stenzek/no-host-state-in-uids
ShaderGen: Decouple host state from shader UIDs
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/GeometryShaderGen.cpp | 135 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/GeometryShaderGen.h | 13 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.cpp | 95 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.h | 12 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 14 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.h | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/ShaderGenCommon.cpp | 75 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/ShaderGenCommon.h | 35 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderGen.cpp | 59 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderGen.h | 9 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoCommon.vcxproj | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 3 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.h | 1 |
15 files changed, 282 insertions, 176 deletions
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 9eeb9f93bb..0724212bdc 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -29,6 +29,7 @@ set(SRCS PostProcessing.cpp RenderBase.cpp RenderState.cpp + ShaderGenCommon.cpp Statistics.cpp TextureCacheBase.cpp TextureConfig.cpp diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index 5695e9c256..bb201ddb0f 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -18,10 +18,12 @@ static const char* primitives_ogl[] = {"points", "lines", "triangles"}; static const char* primitives_d3d[] = {"point", "line", "triangle"}; -template <class T> -static void EmitVertex(T& out, const char* vertex, APIType ApiType, bool first_vertex = false); -template <class T> -static void EndPrimitive(T& out, APIType ApiType); +bool geometry_shader_uid_data::IsPassthrough() const +{ + const bool stereo = g_ActiveConfig.iStereoMode > 0; + const bool wireframe = g_ActiveConfig.bWireFrame; + return primitive_type == PRIMITIVE_TRIANGLES && !stereo && !wireframe; +} GeometryShaderUid GetGeometryShaderUid(u32 primitive_type) { @@ -30,48 +32,51 @@ GeometryShaderUid GetGeometryShaderUid(u32 primitive_type) memset(uid_data, 0, sizeof(geometry_shader_uid_data)); uid_data->primitive_type = primitive_type; - uid_data->wireframe = 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, APIType ApiType, bool first_vertex = false); -static void EndPrimitive(ShaderCode& out, const geometry_shader_uid_data* uid_data, - APIType ApiType); +static void EmitVertex(ShaderCode& out, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data, const char* vertex, + APIType ApiType, bool wireframe, bool pixel_lighting, + bool first_vertex = false); +static void EndPrimitive(ShaderCode& out, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data, APIType ApiType, bool wireframe, + bool pixel_lighting); -ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid_data* uid_data) +ShaderCode GenerateGeometryShaderCode(APIType ApiType, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data) { ShaderCode out; // Non-uid template parameters will write to the dummy data (=> gets optimized out) + const bool wireframe = host_config.wireframe; + const bool pixel_lighting = g_ActiveConfig.bEnablePixelLighting; + const bool msaa = host_config.msaa; + const bool ssaa = host_config.ssaa; + const bool stereo = host_config.stereo; 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) + if (wireframe) vertex_out++; if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) { // Insert layout parameters - if (g_ActiveConfig.backend_info.bSupportsGSInstancing) + if (host_config.backend_gs_instancing) { 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", - uid_data->wireframe ? "line" : "triangle", vertex_out); + stereo ? 2 : 1); + out.Write("layout(%s_strip, max_vertices = %d) out;\n", wireframe ? "line" : "triangle", + vertex_out); } else { out.Write("layout(%s) in;\n", primitives_ogl[uid_data->primitive_type]); - out.Write("layout(%s_strip, max_vertices = %d) out;\n", - uid_data->wireframe ? "line" : "triangle", - uid_data->stereo ? vertex_out * 2 : vertex_out); + out.Write("layout(%s_strip, max_vertices = %d) out;\n", wireframe ? "line" : "triangle", + stereo ? vertex_out * 2 : vertex_out); } } @@ -89,27 +94,24 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid "};\n"); out.Write("struct VS_OUTPUT {\n"); - GenerateVSOutputMembers<ShaderCode>(out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting, - ""); + GenerateVSOutputMembers<ShaderCode>(out, ApiType, uid_data->numTexGens, pixel_lighting, ""); out.Write("};\n"); if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) { - if (g_ActiveConfig.backend_info.bSupportsGSInstancing) + if (host_config.backend_gs_instancing) out.Write("#define InstanceID gl_InvocationID\n"); out.Write("VARYING_LOCATION(0) in VertexData {\n"); - GenerateVSOutputMembers<ShaderCode>( - out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting, - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, true)); + GenerateVSOutputMembers<ShaderCode>(out, ApiType, uid_data->numTexGens, pixel_lighting, + GetInterpolationQualifier(msaa, ssaa, true, true)); out.Write("} vs[%d];\n", vertex_in); out.Write("VARYING_LOCATION(0) out VertexData {\n"); - GenerateVSOutputMembers<ShaderCode>( - out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting, - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, false)); + GenerateVSOutputMembers<ShaderCode>(out, ApiType, uid_data->numTexGens, pixel_lighting, + GetInterpolationQualifier(msaa, ssaa, true, false)); - if (uid_data->stereo) + if (stereo) out.Write("\tflat int layer;\n"); out.Write("} ps;\n"); @@ -121,25 +123,25 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid out.Write("struct VertexData {\n"); out.Write("\tVS_OUTPUT o;\n"); - if (uid_data->stereo) + if (stereo) out.Write("\tuint layer : SV_RenderTargetArrayIndex;\n"); out.Write("};\n"); - if (g_ActiveConfig.backend_info.bSupportsGSInstancing) + if (host_config.backend_gs_instancing) { - out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out, uid_data->stereo ? 2 : 1); + out.Write("[maxvertexcount(%d)]\n[instance(%d)]\n", vertex_out, 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[uid_data->primitive_type], vertex_in, - uid_data->wireframe ? "Line" : "Triangle"); + wireframe ? "Line" : "Triangle"); } else { - out.Write("[maxvertexcount(%d)]\n", uid_data->stereo ? vertex_out * 2 : vertex_out); + out.Write("[maxvertexcount(%d)]\n", stereo ? vertex_out * 2 : vertex_out); out.Write("void main(%s VS_OUTPUT o[%d], inout %sStream<VertexData> output)\n{\n", primitives_d3d[uid_data->primitive_type], vertex_in, - uid_data->wireframe ? "Line" : "Triangle"); + wireframe ? "Line" : "Triangle"); } out.Write("\tVertexData ps;\n"); @@ -150,8 +152,8 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) { out.Write("\tVS_OUTPUT start, end;\n"); - AssignVSOutputMembers(out, "start", "vs[0]", uid_data->numTexGens, uid_data->pixel_lighting); - AssignVSOutputMembers(out, "end", "vs[1]", uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "start", "vs[0]", uid_data->numTexGens, pixel_lighting); + AssignVSOutputMembers(out, "end", "vs[1]", uid_data->numTexGens, pixel_lighting); } else { @@ -181,7 +183,7 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) { out.Write("\tVS_OUTPUT center;\n"); - AssignVSOutputMembers(out, "center", "vs[0]", uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "center", "vs[0]", uid_data->numTexGens, pixel_lighting); } else { @@ -194,17 +196,17 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid ".x, -" I_LINEPTPARAMS ".w / " I_LINEPTPARAMS ".y) * center.pos.w;\n"); } - if (uid_data->stereo) + if (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. - if (g_ActiveConfig.backend_info.bSupportsGSInstancing) + if (host_config.backend_gs_instancing) out.Write("\tint eye = InstanceID;\n"); else out.Write("\tfor (int eye = 0; eye < 2; ++eye) {\n"); } - if (uid_data->wireframe) + if (wireframe) out.Write("\tVS_OUTPUT first;\n"); out.Write("\tfor (int i = 0; i < %d; ++i) {\n", vertex_in); @@ -212,9 +214,9 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) { out.Write("\tVS_OUTPUT f;\n"); - AssignVSOutputMembers(out, "f", "vs[i]", uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "f", "vs[i]", uid_data->numTexGens, pixel_lighting); - if (g_ActiveConfig.backend_info.bSupportsDepthClamp && + if (host_config.backend_depth_clamp && DriverDetails::HasBug(DriverDetails::BUG_BROKEN_CLIP_DISTANCE)) { // On certain GPUs we have to consume the clip distance from the vertex shader @@ -228,7 +230,7 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid out.Write("\tVS_OUTPUT f = o[i];\n"); } - if (uid_data->stereo) + if (stereo) { // Select the output layer out.Write("\tps.layer = eye;\n"); @@ -264,8 +266,8 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid } out.Write("\t}\n"); - EmitVertex(out, uid_data, "l", ApiType, true); - EmitVertex(out, uid_data, "r", ApiType); + EmitVertex(out, host_config, uid_data, "l", ApiType, wireframe, pixel_lighting, true); + EmitVertex(out, host_config, uid_data, "r", ApiType, wireframe, pixel_lighting); } else if (uid_data->primitive_type == PRIMITIVE_POINTS) { @@ -293,21 +295,21 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid } out.Write("\t}\n"); - 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); + EmitVertex(out, host_config, uid_data, "ll", ApiType, wireframe, pixel_lighting, true); + EmitVertex(out, host_config, uid_data, "lr", ApiType, wireframe, pixel_lighting); + EmitVertex(out, host_config, uid_data, "ul", ApiType, wireframe, pixel_lighting); + EmitVertex(out, host_config, uid_data, "ur", ApiType, wireframe, pixel_lighting); } else { - EmitVertex(out, uid_data, "f", ApiType, true); + EmitVertex(out, host_config, uid_data, "f", ApiType, wireframe, pixel_lighting, true); } out.Write("\t}\n"); - EndPrimitive(out, uid_data, ApiType); + EndPrimitive(out, host_config, uid_data, ApiType, wireframe, pixel_lighting); - if (uid_data->stereo && !g_ActiveConfig.backend_info.bSupportsGSInstancing) + if (stereo && !host_config.backend_gs_instancing) out.Write("\t}\n"); out.Write("}\n"); @@ -315,28 +317,29 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid return out; } -static void EmitVertex(ShaderCode& out, const geometry_shader_uid_data* uid_data, - const char* vertex, APIType ApiType, bool first_vertex) +static void EmitVertex(ShaderCode& out, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data, const char* vertex, + APIType ApiType, bool wireframe, bool pixel_lighting, bool first_vertex) { - if (uid_data->wireframe && first_vertex) + if (wireframe && first_vertex) out.Write("\tif (i == 0) first = %s;\n", vertex); if (ApiType == APIType::OpenGL) { out.Write("\tgl_Position = %s.pos;\n", vertex); - if (g_ActiveConfig.backend_info.bSupportsDepthClamp) + if (host_config.backend_depth_clamp) { out.Write("\tgl_ClipDistance[0] = %s.clipDist0;\n", vertex); out.Write("\tgl_ClipDistance[1] = %s.clipDist1;\n", vertex); } - AssignVSOutputMembers(out, "ps", vertex, uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "ps", vertex, uid_data->numTexGens, pixel_lighting); } else if (ApiType == APIType::Vulkan) { // Vulkan NDC space has Y pointing down (right-handed NDC space). out.Write("\tgl_Position = %s.pos;\n", vertex); out.Write("\tgl_Position.y = -gl_Position.y;\n"); - AssignVSOutputMembers(out, "ps", vertex, uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "ps", vertex, uid_data->numTexGens, pixel_lighting); } else { @@ -349,10 +352,12 @@ static void EmitVertex(ShaderCode& out, const geometry_shader_uid_data* uid_data out.Write("\toutput.Append(ps);\n"); } -static void EndPrimitive(ShaderCode& out, const geometry_shader_uid_data* uid_data, APIType ApiType) +static void EndPrimitive(ShaderCode& out, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data, APIType ApiType, bool wireframe, + bool pixel_lighting) { - if (uid_data->wireframe) - EmitVertex(out, uid_data, "first", ApiType); + if (wireframe) + EmitVertex(out, host_config, uid_data, "first", ApiType, wireframe, pixel_lighting); if (ApiType == APIType::OpenGL || ApiType == APIType::Vulkan) out.Write("\tEndPrimitive();\n"); diff --git a/Source/Core/VideoCommon/GeometryShaderGen.h b/Source/Core/VideoCommon/GeometryShaderGen.h index 03b58a0367..58ab01f757 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.h +++ b/Source/Core/VideoCommon/GeometryShaderGen.h @@ -15,23 +15,16 @@ enum class APIType; struct geometry_shader_uid_data { u32 NumValues() const { return sizeof(geometry_shader_uid_data); } - bool IsPassthrough() const - { - return primitive_type == PRIMITIVE_TRIANGLES && !stereo && !wireframe; - } + bool IsPassthrough() const; - u32 stereo : 1; u32 numTexGens : 4; - u32 pixel_lighting : 1; u32 primitive_type : 2; - u32 wireframe : 1; - u32 msaa : 1; - u32 ssaa : 1; }; #pragma pack() typedef ShaderUid<geometry_shader_uid_data> GeometryShaderUid; -ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid_data* uid_data); +ShaderCode GenerateGeometryShaderCode(APIType ApiType, const ShaderHostConfig& host_config, + const geometry_shader_uid_data* uid_data); GeometryShaderUid GetGeometryShaderUid(u32 primitive_type); diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index cec2c5183d..fe4ef11bb0 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -170,7 +170,6 @@ PixelShaderUid GetPixelShaderUid() uid_data->genMode_numindstages = bpmem.genMode.numindstages; uid_data->genMode_numtevstages = bpmem.genMode.numtevstages; uid_data->genMode_numtexgens = bpmem.genMode.numtexgens; - uid_data->per_pixel_lighting = g_ActiveConfig.bEnablePixelLighting; uid_data->bounding_box = g_ActiveConfig.BBoxUseFragmentShaderImplementation() && g_ActiveConfig.bBBoxEnable && BoundingBox::active; uid_data->rgba6_format = @@ -192,13 +191,9 @@ PixelShaderUid GetPixelShaderUid() uid_data->per_pixel_depth = per_pixel_depth; uid_data->forced_early_z = forced_early_z; - uid_data->fast_depth_calc = g_ActiveConfig.bFastDepthCalc; - uid_data->msaa = g_ActiveConfig.iMultisamples > 1; - uid_data->ssaa = g_ActiveConfig.iMultisamples > 1 && g_ActiveConfig.bSSAA; - uid_data->stereo = g_ActiveConfig.iStereoMode > 0; if (!uid_data->forced_early_z && bpmem.UseEarlyDepthTest() && - (!uid_data->fast_depth_calc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED)) + (!g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED)) { static bool warn_once = true; if (warn_once) @@ -209,7 +204,7 @@ PixelShaderUid GetPixelShaderUid() warn_once = false; } - if (uid_data->per_pixel_lighting) + if (g_ActiveConfig.bEnablePixelLighting) { // The lighting shader only needs the two color bits of the 23bit component bit array. uid_data->components = @@ -297,7 +292,7 @@ PixelShaderUid GetPixelShaderUid() } #define MY_STRUCT_OFFSET(str, elem) ((u32)((u64) & (str).elem - (u64) & (str))) - uid_data->num_values = (uid_data->per_pixel_lighting) ? + uid_data->num_values = (g_ActiveConfig.bEnablePixelLighting) ? sizeof(*uid_data) : MY_STRUCT_OFFSET(*uid_data, stagehash[numStages]); @@ -339,7 +334,7 @@ PixelShaderUid GetPixelShaderUid() } static void WriteStage(ShaderCode& out, const pixel_shader_uid_data* uid_data, int n, - APIType ApiType); + APIType ApiType, bool stereo); static void WriteTevRegular(ShaderCode& out, const char* components, int bias, int op, int clamp, int shift, bool alpha); static void SampleTexture(ShaderCode& out, const char* texcoords, const char* texswap, int texmap, @@ -350,11 +345,16 @@ static void WriteFog(ShaderCode& out, const pixel_shader_uid_data* uid_data); static void WriteColor(ShaderCode& out, const pixel_shader_uid_data* uid_data, bool use_dual_source); -ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* uid_data) +ShaderCode GeneratePixelShaderCode(APIType ApiType, const ShaderHostConfig& host_config, + const pixel_shader_uid_data* uid_data) { ShaderCode out; - u32 numStages = uid_data->genMode_numtevstages + 1; + const bool per_pixel_lighting = g_ActiveConfig.bEnablePixelLighting; + const bool msaa = host_config.msaa; + const bool ssaa = host_config.ssaa; + const bool stereo = host_config.stereo; + const u32 numStages = uid_data->genMode_numtevstages + 1; out.Write("//Pixel Shader for TEV stages\n"); out.Write("//%i TEV stages, %i texgens, %i IND stages\n", numStages, uid_data->genMode_numtexgens, @@ -422,7 +422,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* "\tfloat4 " I_EFBSCALE ";\n" "};\n"); - if (uid_data->per_pixel_lighting) + if (per_pixel_lighting) { out.Write("%s", s_lighting_struct); @@ -450,8 +450,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* } out.Write("struct VS_OUTPUT {\n"); - GenerateVSOutputMembers(out, ApiType, uid_data->genMode_numtexgens, uid_data->per_pixel_lighting, - ""); + GenerateVSOutputMembers(out, ApiType, uid_data->genMode_numtexgens, per_pixel_lighting, ""); out.Write("};\n"); if (uid_data->forced_early_z) @@ -503,7 +502,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* // Only use dual-source blending when required on drivers that don't support it very well. const bool use_dual_source = - g_ActiveConfig.backend_info.bSupportsDualSourceBlend && + host_config.backend_dual_source_blend && (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING) || uid_data->useDstAlpha); @@ -531,45 +530,38 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* out.Write("#define depth gl_FragDepth\n"); // We need to always use output blocks for Vulkan, but geometry shaders are also optional. - if (g_ActiveConfig.backend_info.bSupportsGeometryShaders || ApiType == APIType::Vulkan) + if (host_config.backend_geometry_shaders || ApiType == APIType::Vulkan) { out.Write("VARYING_LOCATION(0) in VertexData {\n"); - GenerateVSOutputMembers( - out, ApiType, uid_data->genMode_numtexgens, uid_data->per_pixel_lighting, - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, true)); + GenerateVSOutputMembers(out, ApiType, uid_data->genMode_numtexgens, per_pixel_lighting, + GetInterpolationQualifier(msaa, ssaa, true, true)); - if (uid_data->stereo) + if (stereo) out.Write("\tflat int layer;\n"); out.Write("};\n"); } else { - out.Write("%s in float4 colors_0;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - out.Write("%s in float4 colors_1;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); + out.Write("%s in float4 colors_0;\n", GetInterpolationQualifier(msaa, ssaa)); + out.Write("%s in float4 colors_1;\n", GetInterpolationQualifier(msaa, ssaa)); // compute window position if needed because binding semantic WPOS is not widely supported // Let's set up attributes for (unsigned int i = 0; i < uid_data->genMode_numtexgens; ++i) { - out.Write("%s in float3 uv%d;\n", GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), - i); + out.Write("%s in float3 uv%d;\n", GetInterpolationQualifier(msaa, ssaa), i); } - out.Write("%s in float4 clipPos;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - if (uid_data->per_pixel_lighting) + out.Write("%s in float4 clipPos;\n", GetInterpolationQualifier(msaa, ssaa)); + if (per_pixel_lighting) { - out.Write("%s in float3 Normal;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - out.Write("%s in float3 WorldPos;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); + out.Write("%s in float3 Normal;\n", GetInterpolationQualifier(msaa, ssaa)); + out.Write("%s in float3 WorldPos;\n", GetInterpolationQualifier(msaa, ssaa)); } } out.Write("void main()\n{\n"); - if (g_ActiveConfig.backend_info.bSupportsGeometryShaders || ApiType == APIType::Vulkan) + if (host_config.backend_geometry_shaders || ApiType == APIType::Vulkan) { for (unsigned int i = 0; i < uid_data->genMode_numtexgens; ++i) out.Write("\tfloat3 uv%d = tex%d;\n", i, i); @@ -585,30 +577,24 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* " in float4 rawpos : SV_Position,\n", uid_data->per_pixel_depth ? " out float depth : SV_Depth,\n" : ""); - out.Write(" in %s float4 colors_0 : COLOR0,\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - out.Write(" in %s float4 colors_1 : COLOR1\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); + out.Write(" in %s float4 colors_0 : COLOR0,\n", GetInterpolationQualifier(msaa, ssaa)); + out.Write(" in %s float4 colors_1 : COLOR1\n", GetInterpolationQualifier(msaa, ssaa)); // compute window position if needed because binding semantic WPOS is not widely supported for (unsigned int i = 0; i < uid_data->genMode_numtexgens; ++i) - out.Write(",\n in %s float3 uv%d : TEXCOORD%d", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), i, i); - out.Write(",\n in %s float4 clipPos : TEXCOORD%d", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), + out.Write(",\n in %s float3 uv%d : TEXCOORD%d", GetInterpolationQualifier(msaa, ssaa), i, i); + out.Write(",\n in %s float4 clipPos : TEXCOORD%d", GetInterpolationQualifier(msaa, ssaa), uid_data->genMode_numtexgens); - if (uid_data->per_pixel_lighting) + if (per_pixel_lighting) { - out.Write(",\n in %s float3 Normal : TEXCOORD%d", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), + out.Write(",\n in %s float3 Normal : TEXCOORD%d", GetInterpolationQualifier(msaa, ssaa), uid_data->genMode_numtexgens + 1); - out.Write(",\n in %s float3 WorldPos : TEXCOORD%d", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), + out.Write(",\n in %s float3 WorldPos : TEXCOORD%d", GetInterpolationQualifier(msaa, ssaa), uid_data->genMode_numtexgens + 2); } out.Write(",\n in float clipDist0 : SV_ClipDistance0\n"); out.Write(",\n in float clipDist1 : SV_ClipDistance1\n"); - if (uid_data->stereo) + if (stereo) out.Write(",\n in uint layer : SV_RenderTargetArrayIndex\n"); out.Write(" ) {\n"); } @@ -630,7 +616,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* out.Write("\tfloat4 col0 = colors_0;\n"); out.Write("\tfloat4 col1 = colors_1;\n"); - if (uid_data->per_pixel_lighting) + if (per_pixel_lighting) { out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n"); out.Write("\tfloat3 pos = WorldPos;\n"); @@ -682,12 +668,12 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* out.Write("\ttempcoord = int2(0, 0);\n"); out.Write("\tint3 iindtex%d = ", i); - SampleTexture(out, "float2(tempcoord)", "abg", texmap, uid_data->stereo, ApiType); + SampleTexture(out, "float2(tempcoord)", "abg", texmap, stereo, ApiType); } } for (unsigned int i = 0; i < numStages; i++) - WriteStage(out, uid_data, i, ApiType); // build the equation for this stage + WriteStage(out, uid_data, i, ApiType, stereo); // build the equation for this stage { // The results of the last texenv stage are put onto the screen, @@ -728,7 +714,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* out.Write("\tint zCoord = int(" I_ZSLOPE ".z + " I_ZSLOPE ".x * screenpos.x + " I_ZSLOPE ".y * screenpos.y);\n"); } - else if (!uid_data->fast_depth_calc) + else if (!host_config.fast_depth_calc) { // FastDepth means to trust the depth generated in perspective division. // It should be correct, but it seems not to be as accurate as required. TODO: Find out why! @@ -814,7 +800,7 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* } static void WriteStage(ShaderCode& out, const pixel_shader_uid_data* uid_data, int n, - APIType ApiType) + APIType ApiType, bool stereo) { auto& stage = uid_data->stagehash[n]; out.Write("\n\t// TEV stage %d\n", n); @@ -1013,8 +999,7 @@ static void WriteStage(ShaderCode& out, const pixel_shader_uid_data* uid_data, i out.Write("\ttevcoord.xy = int2(0, 0);\n"); } out.Write("\ttextemp = "); - SampleTexture(out, "float2(tevcoord.xy)", texswap, stage.tevorders_texmap, uid_data->stereo, - ApiType); + SampleTexture(out, "float2(tevcoord.xy)", texswap, stage.tevorders_texmap, stereo, ApiType); } else { diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h index 2c19d38d87..23de4635e1 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.h +++ b/Source/Core/VideoCommon/PixelShaderGen.h @@ -18,11 +18,10 @@ struct pixel_shader_uid_data u32 num_values; // TODO: Shouldn't be a u32 u32 NumValues() const { return num_values; } u32 components : 2; - u32 pad0 : 1; + u32 pad0 : 2; u32 useDstAlpha : 1; u32 Pretest : 2; u32 nIndirectStagesUsed : 4; - u32 stereo : 1; u32 genMode_numtexgens : 4; u32 genMode_numtevstages : 4; u32 genMode_numindstages : 3; @@ -35,20 +34,16 @@ struct pixel_shader_uid_data u32 fog_fsel : 3; u32 fog_RangeBaseEnabled : 1; u32 ztex_op : 2; - u32 fast_depth_calc : 1; u32 per_pixel_depth : 1; - u32 per_pixel_lighting : 1; u32 forced_early_z : 1; u32 early_ztest : 1; u32 late_ztest : 1; u32 bounding_box : 1; u32 zfreeze : 1; - u32 msaa : 1; - u32 ssaa : 1; u32 numColorChans : 2; u32 rgba6_format : 1; u32 dither : 1; - u32 pad : 12; + u32 pad : 16; u32 texMtxInfo_n_projection : 8; // 8x1 bit u32 tevindref_bi0 : 3; @@ -162,5 +157,6 @@ struct pixel_shader_uid_data typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid; -ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* uid_data); +ShaderCode GeneratePixelShaderCode(APIType ApiType, const ShaderHostConfig& host_config, + const pixel_shader_uid_data* uid_data); PixelShaderUid GetPixelShaderUid(); diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 62f86534c9..45e2006cb6 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -52,6 +52,7 @@ #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/PostProcessing.h" +#include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/TextureDecoder.h" @@ -96,6 +97,8 @@ Renderer::Renderer(int backbuffer_width, int backbuffer_height) { m_aspect_wide = SConfig::GetInstance().m_wii_aspect_ratio != 0; } + + m_last_host_config_bits = ShaderHostConfig::GetCurrent().bits; } Renderer::~Renderer() @@ -315,6 +318,17 @@ void Renderer::SaveScreenshot(const std::string& filename, bool wait_for_complet } } +bool Renderer::CheckForHostConfigChanges() +{ + ShaderHostConfig new_host_config = ShaderHostConfig::GetCurrent(); + if (new_host_config.bits == m_last_host_config_bits) + return false; + + OSD::AddMessage("Video config changed, reloading shaders.", OSD::Duration::NORMAL); + m_last_host_config_bits = new_host_config.bits; + return true; +} + // Create On-Screen-Messages void Renderer::DrawDebugText() { diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 55ec03ee7b..4045b223aa 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -147,6 +147,8 @@ protected: std::tuple<int, int> CalculateTargetScale(int x, int y) const; bool CalculateTargetSize(); + bool CheckForHostConfigChanges(); + void CheckFifoRecording(); void RecordVideoMemory(); @@ -182,6 +184,8 @@ protected: Common::Event m_surface_changed; void* m_new_surface_handle = nullptr; + u32 m_last_host_config_bits = 0; + private: void RunFrameDumps(); void ShutdownFrameDumping(); diff --git a/Source/Core/VideoCommon/ShaderGenCommon.cpp b/Source/Core/VideoCommon/ShaderGenCommon.cpp new file mode 100644 index 0000000000..58085fdafa --- /dev/null +++ b/Source/Core/VideoCommon/ShaderGenCommon.cpp @@ -0,0 +1,75 @@ +// Copyright 2017 Dolphin Emulator Project +// Licensed under GPLv2+ +// Refer to the license.txt file included. + +#include "VideoCommon/ShaderGenCommon.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Core/ConfigManager.h" + +ShaderHostConfig ShaderHostConfig::GetCurrent() +{ + ShaderHostConfig bits = {}; + bits.msaa = g_ActiveConfig.iMultisamples > 1; + bits.ssaa = g_ActiveConfig.iMultisamples > 1 && g_ActiveConfig.bSSAA && + g_ActiveConfig.backend_info.bSupportsSSAA; + bits.stereo = g_ActiveConfig.iStereoMode > 0; + bits.wireframe = g_ActiveConfig.bWireFrame; + bits.per_pixel_lighting = g_ActiveConfig.bEnablePixelLighting; + bits.vertex_rounding = g_ActiveConfig.UseVertexRounding(); + bits.fast_depth_calc = g_ActiveConfig.bFastDepthCalc; + bits.bounding_box = g_ActiveConfig.bBBoxEnable; + bits.backend_dual_source_blend = g_ActiveConfig.backend_info.bSupportsDualSourceBlend; + bits.backend_geometry_shaders = g_ActiveConfig.backend_info.bSupportsGeometryShaders; + bits.backend_early_z = g_ActiveConfig.backend_info.bSupportsEarlyZ; + bits.backend_bbox = g_ActiveConfig.backend_info.bSupportsBBox; + bits.backend_gs_instancing = g_ActiveConfig.backend_info.bSupportsGSInstancing; + bits.backend_clip_control = g_ActiveConfig.backend_info.bSupportsClipControl; + bits.backend_ssaa = g_ActiveConfig.backend_info.bSupportsSSAA; + bits.backend_atomics = g_ActiveConfig.backend_info.bSupportsFragmentStoresAndAtomics; + bits.backend_depth_clamp = g_ActiveConfig.backend_info.bSupportsDepthClamp; + bits.backend_reversed_depth_range = g_ActiveConfig.backend_info.bSupportsReversedDepthRange; + return bits; +} + +std::string GetDiskShaderCacheFileName(APIType api_type, const char* type, bool include_gameid, + bool include_host_config) +{ + if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX))) + File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX)); + + std::string filename = File::GetUserPath(D_SHADERCACHE_IDX); + switch (api_type) + { + case APIType::D3D: + filename += "D3D"; + break; + case APIType::OpenGL: + filename += "OpenGL"; + break; + case APIType::Vulkan: + filename += "Vulkan"; + break; + default: + break; + } + + filename += '-'; + filename += type; + + if (include_gameid) + { + filename += '-'; + filename += SConfig::GetInstance().GetGameID(); + } + + if (include_host_config) + { + // We're using 18 bits, so 5 hex characters. + ShaderHostConfig host_config = ShaderHostConfig::GetCurrent(); + filename += StringFromFormat("-%05X", host_config.bits); + } + + filename += ".cache"; + return filename; +} diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index f70d6288e6..5750e58c3e 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -151,6 +151,41 @@ private: std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here? }; +// Host config contains the settings which can influence generated shaders. +union ShaderHostConfig +{ + u32 bits; + + struct + { + u32 msaa : 1; + u32 ssaa : 1; + u32 stereo : 1; + u32 wireframe : 1; + u32 per_pixel_lighting : 1; + u32 vertex_rounding : 1; + u32 fast_depth_calc : 1; + u32 bounding_box : 1; + u32 backend_dual_source_blend : 1; + u32 backend_geometry_shaders : 1; + u32 backend_early_z : 1; + u32 backend_bbox : 1; + u32 backend_gs_instancing : 1; + u32 backend_clip_control : 1; + u32 backend_ssaa : 1; + u32 backend_atomics : 1; + u32 backend_depth_clamp : 1; + u32 backend_reversed_depth_range : 1; + u32 pad : 14; + }; + + static ShaderHostConfig GetCurrent(); +}; + +// Gets the filename of the specified type of cache object (e.g. vertex shader, pipeline). +std::string GetDiskShaderCacheFileName(APIType api_type, const char* type, bool include_gameid, + bool include_host_config); + template <class T> inline void DefineOutputMember(T& object, APIType api_type, const char* qualifier, const char* type, const char* name, int var_index, const char* semantic = "", diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp index 9fe4bfcada..2ee9532254 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/VertexShaderGen.cpp @@ -26,11 +26,6 @@ VertexShaderUid GetVertexShaderUid() uid_data->numTexGens = xfmem.numTexGen.numTexGens; uid_data->components = VertexLoaderManager::g_current_components; - uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting; - uid_data->vertex_rounding = - g_ActiveConfig.bVertexRounding && g_ActiveConfig.iEFBScale != SCALE_1X; - uid_data->msaa = g_ActiveConfig.iMultisamples > 1; - uid_data->ssaa = g_ActiveConfig.iMultisamples > 1 && g_ActiveConfig.bSSAA; uid_data->numColorChans = xfmem.numChan.numColorChans; GetLightingShaderUid(uid_data->lighting); @@ -81,9 +76,16 @@ VertexShaderUid GetVertexShaderUid() return out; } -ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_data* uid_data) +ShaderCode GenerateVertexShaderCode(APIType api_type, const ShaderHostConfig& host_config, + const vertex_shader_uid_data* uid_data) { ShaderCode out; + + const bool per_pixel_lighting = g_ActiveConfig.bEnablePixelLighting; + const bool msaa = host_config.msaa; + const bool ssaa = host_config.ssaa; + const bool vertex_rounding = host_config.vertex_rounding; + out.Write("%s", s_lighting_struct); // uniforms @@ -96,7 +98,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da out.Write("};\n"); out.Write("struct VS_OUTPUT {\n"); - GenerateVSOutputMembers(out, api_type, uid_data->numTexGens, uid_data->pixel_lighting, ""); + GenerateVSOutputMembers(out, api_type, uid_data->numTexGens, per_pixel_lighting, ""); out.Write("};\n"); if (api_type == APIType::OpenGL || api_type == APIType::Vulkan) @@ -127,12 +129,11 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da } // We need to always use output blocks for Vulkan, but geometry shaders are also optional. - if (g_ActiveConfig.backend_info.bSupportsGeometryShaders || api_type == APIType::Vulkan) + if (host_config.backend_geometry_shaders || api_type == APIType::Vulkan) { out.Write("VARYING_LOCATION(0) out VertexData {\n"); - GenerateVSOutputMembers( - out, api_type, uid_data->numTexGens, uid_data->pixel_lighting, - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, false)); + GenerateVSOutputMembers(out, api_type, uid_data->numTexGens, per_pixel_lighting, + GetInterpolationQualifier(msaa, ssaa, true, false)); out.Write("} vs;\n"); } else @@ -142,23 +143,17 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da { if (i < uid_data->numTexGens) { - out.Write("%s out float3 uv%u;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa), i); + out.Write("%s out float3 uv%u;\n", GetInterpolationQualifier(msaa, ssaa), i); } } - out.Write("%s out float4 clipPos;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - if (uid_data->pixel_lighting) + out.Write("%s out float4 clipPos;\n", GetInterpolationQualifier(msaa, ssaa)); + if (per_pixel_lighting) { - out.Write("%s out float3 Normal;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - out.Write("%s out float3 WorldPos;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); + out.Write("%s out float3 Normal;\n", GetInterpolationQualifier(msaa, ssaa)); + out.Write("%s out float3 WorldPos;\n", GetInterpolationQualifier(msaa, ssaa)); } - out.Write("%s out float4 colors_0;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); - out.Write("%s out float4 colors_1;\n", - GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa)); + out.Write("%s out float4 colors_0;\n", GetInterpolationQualifier(msaa, ssaa)); + out.Write("%s out float4 colors_1;\n", GetInterpolationQualifier(msaa, ssaa)); } out.Write("void main()\n{\n"); @@ -406,7 +401,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da // clipPos/w needs to be done in pixel shader, not here out.Write("o.clipPos = o.pos;\n"); - if (uid_data->pixel_lighting) + if (per_pixel_lighting) { out.Write("o.Normal = _norm0;\n"); out.Write("o.WorldPos = pos.xyz;\n"); @@ -421,7 +416,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da // If we can disable the incorrect depth clipping planes using depth clamping, then we can do // our own depth clipping and calculate the depth range before the perspective divide if // necessary. - if (g_ActiveConfig.backend_info.bSupportsDepthClamp) + if (host_config.backend_depth_clamp) { // Since we're adjusting z for the depth range before the perspective divide, we have to do our // own clipping. We want to clip so that -w <= z <= 0, which matches the console -1..0 range. @@ -446,7 +441,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da out.Write("o.pos.z = o.pos.w * " I_PIXELCENTERCORRECTION ".w - " "o.pos.z * " I_PIXELCENTERCORRECTION ".z;\n"); - if (!g_ActiveConfig.backend_info.bSupportsClipControl) + if (!host_config.backend_clip_control) { // If the graphics API doesn't support a depth range of 0..1, then we need to map z to // the -1..1 range. Unfortunately we have to use a substraction, which is a lossy floating-point @@ -466,7 +461,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da // get rasterized correctly. out.Write("o.pos.xy = o.pos.xy - o.pos.w * " I_PIXELCENTERCORRECTION ".xy;\n"); - if (uid_data->vertex_rounding) + if (vertex_rounding) { // By now our position is in clip space // however, higher resolutions than the Wii outputs @@ -491,9 +486,9 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da if (api_type == APIType::OpenGL || api_type == APIType::Vulkan) { - if (g_ActiveConfig.backend_info.bSupportsGeometryShaders || api_type == APIType::Vulkan) + if (host_config.backend_geometry_shaders || api_type == APIType::Vulkan) { - AssignVSOutputMembers(out, "vs", "o", uid_data->numTexGens, uid_data->pixel_lighting); + AssignVSOutputMembers(out, "vs", "o", uid_data->numTexGens, per_pixel_lighting); } else { @@ -502,7 +497,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da for (unsigned int i = 0; i < uid_data->numTexGens; ++i) out.Write("uv%d.xyz = o.tex%d;\n", i, i); out.Write("clipPos = o.clipPos;\n"); - if (uid_data->pixel_lighting) + if (per_pixel_lighting) { out.Write("Normal = o.Normal;\n"); out.Write("WorldPos = o.WorldPos;\n"); @@ -511,7 +506,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da out.Write("colors_1 = o.colors_1;\n"); } - if (g_ActiveConfig.backend_info.bSupportsDepthClamp) + if (host_config.backend_depth_clamp) { out.Write("gl_ClipDistance[0] = o.clipDist0;\n"); out.Write("gl_ClipDistance[1] = o.clipDist1;\n"); diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h index 0fa8e88815..a93358d923 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.h +++ b/Source/Core/VideoCommon/VertexShaderGen.h @@ -37,14 +37,10 @@ struct vertex_shader_uid_data u32 numTexGens : 4; u32 numColorChans : 2; u32 dualTexTrans_enabled : 1; - u32 pixel_lighting : 1; - u32 msaa : 1; u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is // 8 bits wide - u32 ssaa : 1; - u32 vertex_rounding : 1; - u32 pad : 14; + u32 pad : 18; struct { @@ -69,4 +65,5 @@ struct vertex_shader_uid_data typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid; VertexShaderUid GetVertexShaderUid(); -ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_data* uid_data); +ShaderCode GenerateVertexShaderCode(APIType api_type, const ShaderHostConfig& host_config, + const vertex_shader_uid_data* uid_data); diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 97adb25ac6..e33ccd9d7f 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -65,6 +65,7 @@ <ClCompile Include="RenderBase.cpp" /> <ClCompile Include="RenderState.cpp" /> <ClCompile Include="LightingShaderGen.cpp" /> + <ClCompile Include="ShaderGenCommon.cpp" /> <ClCompile Include="Statistics.cpp" /> <ClCompile Include="GeometryShaderGen.cpp" /> <ClCompile Include="GeometryShaderManager.cpp" /> diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index a9f632493e..f4ec59eb1d 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -173,6 +173,9 @@ <ClCompile Include="AbstractTexture.cpp"> <Filter>Base</Filter> </ClCompile> + <ClCompile Include="ShaderGenCommon.cpp"> + <Filter>Shader Generators</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="CommandProcessor.h" /> diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 7dc68abb72..355d2486b4 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -5,6 +5,7 @@ #include <algorithm> #include "Common/CommonTypes.h" +#include "Common/StringUtil.h" #include "Core/Config/GraphicsSettings.h" #include "Core/Core.h" #include "Core/Movie.h" diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index e706cea1c3..1216bcc431 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -223,6 +223,7 @@ struct VideoConfig final { return backend_info.bSupportsGPUTextureDecoding && bEnableGPUTextureDecoding; } + bool UseVertexRounding() const { return bVertexRounding && iEFBScale != SCALE_1X; } }; extern VideoConfig g_Config; |
