2 files changed, 19 insertions, 13 deletions
diff --git a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
index fc9b971f8b..f5d75d18f6 100644
--- a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
+++ b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
@@ -12,11 +12,13 @@
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
-TextureConverterShaderUid GetTextureConverterShaderUid(EFBCopyFormat dst_format, bool is_depth_copy,
-                                                       bool is_intensity, bool scale_by_half)
+namespace TextureConversionShaderGen
 {
-  TextureConverterShaderUid out;
-  convertion_shader_uid_data* uid_data = out.GetUidData<convertion_shader_uid_data>();
+TCShaderUid GetShaderUid(EFBCopyFormat dst_format, bool is_depth_copy, bool is_intensity,
+                         bool scale_by_half)
+{
+  TCShaderUid out;
+  UidData* uid_data = out.GetUidData<UidData>();
   memset(uid_data, 0, sizeof(*uid_data));
 
   uid_data->dst_format = dst_format;
@@ -28,8 +30,7 @@ TextureConverterShaderUid GetTextureConverterShaderUid(EFBCopyFormat dst_format,
   return out;
 }
 
-ShaderCode GenerateTextureConverterShaderCode(APIType api_type,
-                                              const convertion_shader_uid_data* uid_data)
+ShaderCode GenerateShader(APIType api_type, const UidData* uid_data)
 {
   ShaderCode out;
 
@@ -299,3 +300,5 @@ ShaderCode GenerateTextureConverterShaderCode(APIType api_type,
 
   return out;
 }
+
+}  // namespace TextureConversionShaderGen
diff --git a/Source/Core/VideoCommon/TextureConverterShaderGen.h b/Source/Core/VideoCommon/TextureConverterShaderGen.h
index 410940a63e..b55bf57065 100644
--- a/Source/Core/VideoCommon/TextureConverterShaderGen.h
+++ b/Source/Core/VideoCommon/TextureConverterShaderGen.h
@@ -10,10 +10,12 @@
 
 enum class APIType;
 
+namespace TextureConversionShaderGen
+{
 #pragma pack(1)
-struct convertion_shader_uid_data
+struct UidData
 {
-  u32 NumValues() const { return sizeof(convertion_shader_uid_data); }
+  u32 NumValues() const { return sizeof(UidData); }
   EFBCopyFormat dst_format;
 
   u32 efb_has_alpha : 1;
@@ -23,10 +25,11 @@ struct convertion_shader_uid_data
 };
 #pragma pack()
 
-using TextureConverterShaderUid = ShaderUid<convertion_shader_uid_data>;
+using TCShaderUid = ShaderUid<UidData>;
+
+ShaderCode GenerateShader(APIType api_type, const UidData* uid_data);
 
-ShaderCode GenerateTextureConverterShaderCode(APIType api_type,
-                                              const convertion_shader_uid_data* uid_data);
+TCShaderUid GetShaderUid(EFBCopyFormat dst_format, bool is_depth_copy, bool is_intensity,
+                         bool scale_by_half);
 
-TextureConverterShaderUid GetTextureConverterShaderUid(EFBCopyFormat dst_format, bool is_depth_copy,
-                                                       bool is_intensity, bool scale_by_half);
+}  // namespace TextureConversionShaderGen