mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
VideoCommon: add cubemap as a sampler target for shaders, add cubemap as a valid texture asset
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user