piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5305 from iwubcode/abstract_texture

Browse Source 
Abstract Texture
This commit is contained in:
shuffle2
2017-06-18 12:57:05 -07:00
committed by GitHub
parent 09457d3a42 e4896d39bd
commit e63c337830
54 changed files with 1847 additions and 1423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -533,7 +533,7 @@ bool HiresTexture::LoadTexture(Level& level, const std::vector<u8>& buffer)
// Images loaded by SOIL are converted to RGBA.
level.width = static_cast<u32>(width);
level.height = static_cast<u32>(height);
level.format = HostTextureFormat::RGBA8;
level.format = AbstractTextureFormat::RGBA8;
level.data = ImageDataPointer(data, SOIL_free_image_data);
level.row_length = level.width;
level.data_size = static_cast<size_t>(level.row_length) * 4 * level.height;
@ -555,7 +555,7 @@ HiresTexture::~HiresTexture()
{
}
HostTextureFormat HiresTexture::GetFormat() const
AbstractTextureFormat HiresTexture::GetFormat() const
{
return m_levels.at(0).format;
}