summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/HiresTextures.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2017-06-18 12:57:05 -0700
committerGitHub <noreply@github.com>2017-06-18 12:57:05 -0700
commite63c33783049753784a24675bfa0792e54684fbd (patch)
tree3d984535025f4cb97489c9665220ac4237e7761c /Source/Core/VideoCommon/HiresTextures.cpp
parent09457d3a4245ec9d4f2fdac3d1d0873a3354b858 (diff)
parente4896d39bd927b0b8e109e0334fa15cdb8e004f3 (diff)
Merge pull request #5305 from iwubcode/abstract_texture
Abstract Texture
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
-rw-r--r--Source/Core/VideoCommon/HiresTextures.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
index 95a70efc59..7b4a1d387c 100644
--- a/Source/Core/VideoCommon/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -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;
}