The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 14:39:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12139 from iwubcode/more_shader_texture_properties

Browse Source 
VideoCommon: add additional texture sampler types to ShaderAsset
This commit is contained in:
JMC47 2023-09-04 22:45:56 -04:00 committed by GitHub
commit 9419d92446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/Assets/ShaderAsset.cpp
View File

@ -49,6 +49,14 @@ bool ParseShaderProperties(const VideoCommon::CustomAssetLibrary::AssetID& asset
{ {
property.m_type = ShaderProperty::Type::Type_Sampler2D; 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 else
{ {
ERROR_LOG_FMT(VIDEO, ERROR_LOG_FMT(VIDEO,

8
Source/Core/VideoCommon/Assets/ShaderAsset.h
View File

@ -14,9 +14,17 @@ namespace VideoCommon
{ {
struct ShaderProperty 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 enum class Type
{ {
Type_Undefined, Type_Undefined,
Type_SamplerArrayShared_Main,
Type_SamplerArrayShared_Additional,
Type_Sampler2D, Type_Sampler2D,
Type_Max = Type_Sampler2D Type_Max = Type_Sampler2D
}; };