Merge pull request #12139 from iwubcode/more_shader_texture_properties

VideoCommon: add additional texture sampler types to ShaderAsset
dolphin-emu · Sep 5, 2023 · 9419d92 · 9419d92
2 parents 82ea4f4 + f982c55
commit 9419d92
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp
@@ -49,6 +49,14 @@ bool ParseShaderProperties(const VideoCommon::CustomAssetLibrary::AssetID& asset
     {
       property.m_type = ShaderProperty::Type::Type_Sampler2D;
     }
+    else if (type == "samplerarrayshared_main")
+    {
+      property.m_type = ShaderProperty::Type::Type_SamplerArrayShared_Main;
+    }
+    else if (type == "samplerarrayshared_additional")
+    {
+      property.m_type = ShaderProperty::Type::Type_SamplerArrayShared_Additional;
+    }
     else
     {
       ERROR_LOG_FMT(VIDEO,

diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.h b/Source/Core/VideoCommon/Assets/ShaderAsset.h
@@ -14,9 +14,17 @@ namespace VideoCommon
 {
 struct ShaderProperty
 {
+  // "SamplerShared" denotes that the sampler
+  // already exists outside of the shader source
+  // (ex: in the Dolphin defined pixel shader)
+  // "Main" is the first entry in a shared sampler array
+  // and "Additional" denotes a subsequent entry
+  // in the array
   enum class Type
   {
     Type_Undefined,
+    Type_SamplerArrayShared_Main,
+    Type_SamplerArrayShared_Additional,
     Type_Sampler2D,
     Type_Max = Type_Sampler2D
   };