Merge pull request #10281 from Pokechu22/static-lighting-struct-string

LightingShaderGen: Make s_lighting_struct not inline
dolphin-emu · Dec 23, 2021 · 6dae404 · 6dae404
2 parents e6f40fa + 8502561
commit 6dae404
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h
@@ -36,13 +36,13 @@ struct LightingUidData
   u32 light_mask : 32;     // 4x8 bits
 };
 
-constexpr inline char s_lighting_struct[] = "struct Light {\n"
-                                            "\tint4 color;\n"
-                                            "\tfloat4 cosatt;\n"
-                                            "\tfloat4 distatt;\n"
-                                            "\tfloat4 pos;\n"
-                                            "\tfloat4 dir;\n"
-                                            "};\n";
+constexpr char s_lighting_struct[] = "struct Light {\n"
+                                     "\tint4 color;\n"
+                                     "\tfloat4 cosatt;\n"
+                                     "\tfloat4 distatt;\n"
+                                     "\tfloat4 pos;\n"
+                                     "\tfloat4 dir;\n"
+                                     "};\n";
 
 void GenerateLightingShaderCode(ShaderCode& object, const LightingUidData& uid_data,
                                 std::string_view in_color_name, std::string_view dest);