ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12374 from iwubcode/custom_texture_potential_crash_fix 

VideoCommon: prevent a potential custom texture crash
This commit is contained in:
Mai 2023-12-11 07:42:48 -05:00 committed by GitHub
parent 6e0bc2a4db 02756be381
commit d84ed054ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -1574,7 +1574,7 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
} }
std::vector<VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>> cached_game_assets; std::vector<VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>> cached_game_assets;
std::vector<VideoCommon::CustomTextureData*> data_for_assets; std::vector<std::shared_ptr<VideoCommon::TextureData>> data_for_assets;
bool has_arbitrary_mipmaps = false; bool has_arbitrary_mipmaps = false;
bool skip_texture_dump = false; bool skip_texture_dump = false;
std::shared_ptr<HiresTexture> hires_texture; std::shared_ptr<HiresTexture> hires_texture;
@ -1628,6 +1628,7 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
} }
} }
data_for_assets.reserve(cached_game_assets.size());
for (auto& cached_asset : cached_game_assets) for (auto& cached_asset : cached_game_assets)
{ {
auto data = cached_asset.m_asset->GetData(); auto data = cached_asset.m_asset->GetData();
@ -1635,7 +1636,7 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
{ {
if (cached_asset.m_asset->Validate(texture_info.GetRawWidth(), texture_info.GetRawHeight())) if (cached_asset.m_asset->Validate(texture_info.GetRawWidth(), texture_info.GetRawHeight()))
{ {
data_for_assets.push_back(&data->m_texture); data_for_assets.push_back(data);
} }
} }
} }
@ -1655,7 +1656,8 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
// expected because each texture is loaded into a texture array // expected because each texture is loaded into a texture array
RcTcacheEntry TextureCacheBase::CreateTextureEntry( RcTcacheEntry TextureCacheBase::CreateTextureEntry(
const TextureCreationInfo& creation_info, const TextureInfo& texture_info, const TextureCreationInfo& creation_info, const TextureInfo& texture_info,
const int safety_color_sample_size, std::vector<VideoCommon::CustomTextureData*> assets_data, const int safety_color_sample_size,
std::vector<std::shared_ptr<VideoCommon::TextureData>> assets_data,
const bool custom_arbitrary_mipmaps, bool skip_texture_dump) const bool custom_arbitrary_mipmaps, bool skip_texture_dump)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
@ -1670,12 +1672,13 @@ RcTcacheEntry TextureCacheBase::CreateTextureEntry(
const auto calculate_max_levels = [&]() { const auto calculate_max_levels = [&]() {
const auto max_element = std::max_element( const auto max_element = std::max_element(
assets_data.begin(), assets_data.end(), [](const auto& lhs, const auto& rhs) { assets_data.begin(), assets_data.end(), [](const auto& lhs, const auto& rhs) {
return lhs->m_slices[0].m_levels.size() < rhs->m_slices[0].m_levels.size(); return lhs->m_texture.m_slices[0].m_levels.size() <
rhs->m_texture.m_slices[0].m_levels.size();
}); });
return (*max_element)->m_slices[0].m_levels.size(); return (*max_element)->m_texture.m_slices[0].m_levels.size();
}; };
const u32 texLevels = no_mips ? 1 : (u32)calculate_max_levels(); const u32 texLevels = no_mips ? 1 : (u32)calculate_max_levels();
const auto& first_level = assets_data[0]->m_slices[0].m_levels[0]; const auto& first_level = assets_data[0]->m_texture.m_slices[0].m_levels[0];
const TextureConfig config(first_level.width, first_level.height, texLevels, const TextureConfig config(first_level.width, first_level.height, texLevels,
static_cast<u32>(assets_data.size()), 1, first_level.format, 0); static_cast<u32>(assets_data.size()), 1, first_level.format, 0);
entry = AllocateCacheEntry(config); entry = AllocateCacheEntry(config);
@ -1683,8 +1686,8 @@ RcTcacheEntry TextureCacheBase::CreateTextureEntry(
return entry; return entry;
for (u32 data_index = 0; data_index < static_cast<u32>(assets_data.size()); data_index++) for (u32 data_index = 0; data_index < static_cast<u32>(assets_data.size()); data_index++)
{ {
const auto asset = assets_data[data_index]; const auto& asset = assets_data[data_index];
const auto& slice = asset->m_slices[0]; const auto& slice = asset->m_texture.m_slices[0];
for (u32 level_index = 0; for (u32 level_index = 0;
level_index < std::min(texLevels, static_cast<u32>(slice.m_levels.size())); level_index < std::min(texLevels, static_cast<u32>(slice.m_levels.size()));
++level_index) ++level_index)

9
Source/Core/VideoCommon/TextureCacheBase.h
View File

@ -346,10 +346,11 @@ private:
void SetBackupConfig(const VideoConfig& config); void SetBackupConfig(const VideoConfig& config);
RcTcacheEntry CreateTextureEntry(const TextureCreationInfo& creation_info, RcTcacheEntry
const TextureInfo& texture_info, int safety_color_sample_size, CreateTextureEntry(const TextureCreationInfo& creation_info, const TextureInfo& texture_info,
std::vector<VideoCommon::CustomTextureData*> assets_data, int safety_color_sample_size,
bool custom_arbitrary_mipmaps, bool skip_texture_dump); std::vector<std::shared_ptr<VideoCommon::TextureData>> assets_data,
bool custom_arbitrary_mipmaps, bool skip_texture_dump);
RcTcacheEntry GetXFBFromCache(u32 address, u32 width, u32 height, u32 stride); RcTcacheEntry GetXFBFromCache(u32 address, u32 width, u32 height, u32 stride);