diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-06-03 19:35:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-03 19:35:48 +0200 |
| commit | 80bf175c48ea04739637b1ad6fda9716ae610635 (patch) | |
| tree | 8e1f2e11fabd808d7fd419b55b30c209fdb49eca /Source/Core/VideoCommon/Assets/CustomTextureData.cpp | |
| parent | 0b3d28abaf2563b64a83acae82ace2f5149d2855 (diff) | |
| parent | 47c40d51dffe646465bb5bb8454c6143005859da (diff) | |
Merge pull request #11879 from iwubcode/texture_data_load_nolevels
VideoCommon: avoid segfault when loading a PNG with no custom texture data levels
Diffstat (limited to 'Source/Core/VideoCommon/Assets/CustomTextureData.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomTextureData.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Assets/CustomTextureData.cpp b/Source/Core/VideoCommon/Assets/CustomTextureData.cpp index 26b65ad365..04183da3f0 100644 --- a/Source/Core/VideoCommon/Assets/CustomTextureData.cpp +++ b/Source/Core/VideoCommon/Assets/CustomTextureData.cpp @@ -515,11 +515,6 @@ bool LoadDDSTexture(CustomTextureData::Level* level, const std::string& filename info.first_mip_row_length, info.first_mip_size); } -bool LoadPNGTexture(CustomTextureData* texture, const std::string& filename) -{ - return LoadPNGTexture(&texture->m_levels[0], filename); -} - bool LoadPNGTexture(CustomTextureData::Level* level, const std::string& filename) { if (!level) [[unlikely]] |