Merge pull request #8141 from lioncash/init

VideoCommon/ShaderGenCommon: Simplify initialization of ShaderUid class

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/Core/VideoCommon/UberShaderVertex.cpp b/Source/Core/VideoCommon/UberShaderVertex.cpp
index 4032e0df40..5fb30aaf03 100644
--- a/Source/Core/VideoCommon/UberShaderVertex.cpp
+++ b/Source/Core/VideoCommon/UberShaderVertex.cpp
@@ -15,9 +15,10 @@ namespace UberShader
 VertexShaderUid GetVertexShaderUid()
 {
   VertexShaderUid out;
-  vertex_ubershader_uid_data* uid_data = out.GetUidData<vertex_ubershader_uid_data>();
-  memset(uid_data, 0, sizeof(*uid_data));
+
+  vertex_ubershader_uid_data* const uid_data = out.GetUidData();
   uid_data->num_texgens = xfmem.numTexGen.numTexGens;
+
   return out;
 }
 
@@ -487,11 +488,10 @@ void GenVertexShaderTexGens(APIType ApiType, u32 numTexgen, ShaderCode& out)
 void EnumerateVertexShaderUids(const std::function<void(const VertexShaderUid&)>& callback)
 {
   VertexShaderUid uid;
-  std::memset(&uid, 0, sizeof(uid));
 
   for (u32 texgens = 0; texgens <= 8; texgens++)
   {
-    auto* vuid = uid.GetUidData<UberShader::vertex_ubershader_uid_data>();
+    vertex_ubershader_uid_data* const vuid = uid.GetUidData();
     vuid->num_texgens = texgens;
     callback(uid);
   }