piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

VideoCommon: add cubemap as a sampler target for shaders, add cubemap as a valid texture asset

Browse Source
This commit is contained in:
iwubcode 2023-09-05 21:11:19 -05:00
parent 9419d92446
commit 589834f562
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,10 @@ bool ParseShaderProperties(const VideoCommon::CustomAssetLibrary::AssetID& asset
{
property.m_type = ShaderProperty::Type::Type_Sampler2D;
}
else if (type == "samplercube")
{
property.m_type = ShaderProperty::Type::Type_SamplerCube;
}
else if (type == "samplerarrayshared_main")
{
property.m_type = ShaderProperty::Type::Type_SamplerArrayShared_Main;

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

@ -26,7 +26,8 @@ struct ShaderProperty
Type_SamplerArrayShared_Main,
Type_SamplerArrayShared_Additional,
Type_Sampler2D,
Type_Max = Type_Sampler2D
Type_SamplerCube,
Type_Max = Type_SamplerCube
};
Type m_type;
std::string m_description;

14
Source/Core/VideoCommon/Assets/TextureAsset.cpp
View File

@ -136,6 +136,15 @@ bool TextureData::FromJson(const CustomAssetLibrary::AssetID& asset_id,
if (type == "texture2d")
{
data->m_type = TextureData::Type::Type_Texture2D;
if (!ParseSampler(asset_id, json, &data->m_sampler))
{
return false;
}
}
else if (type == "texturecube")
{
data->m_type = TextureData::Type::Type_TextureCube;
}
else
{
@ -146,11 +155,6 @@ bool TextureData::FromJson(const CustomAssetLibrary::AssetID& asset_id,
return false;
}
if (!ParseSampler(asset_id, json, &data->m_sampler))
{
return false;
}
return true;
}

3
Source/Core/VideoCommon/Assets/TextureAsset.h
View File

@ -28,7 +28,8 @@ struct TextureData
{
Type_Undefined,
Type_Texture2D,
Type_Max = Type_Texture2D
Type_TextureCube,
Type_Max = Type_TextureCube
};
Type m_type;
CustomTextureData m_data;