Merge pull request #10819 from Dentomologist/fix_shader_compilation_warnings

VideoCommon: Fix D3D shader compilation warnings

1 files changed, 8 insertions, 2 deletions

diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
index 10895ccf88..818a22bfa4 100644
--- a/Source/Core/VideoCommon/GeometryShaderGen.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -219,7 +219,11 @@ ShaderCode GenerateGeometryShaderCode(APIType api_type, const ShaderHostConfig&
   if (wireframe)
     out.Write("\tVS_OUTPUT first;\n");
 
-  out.Write("\tfor (int i = 0; i < {}; ++i) {{\n", vertex_in);
+  // Avoid D3D warning about forced unrolling of single-iteration loop
+  if (vertex_in > 1)
+    out.Write("\tfor (int i = 0; i < {}; ++i) {{\n", vertex_in);
+  else
+    out.Write("\tint i = 0;\n");
 
   if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
   {
@@ -310,7 +314,9 @@ ShaderCode GenerateGeometryShaderCode(APIType api_type, const ShaderHostConfig&
     EmitVertex(out, host_config, uid_data, "f", api_type, wireframe, stereo, true);
   }
 
-  out.Write("\t}}\n");
+  // Only close loop if previous code was in one (See D3D warning above)
+  if (vertex_in > 1)
+    out.Write("\t}}\n");
 
   EndPrimitive(out, host_config, uid_data, api_type, wireframe, stereo);