diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-18 12:57:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 12:57:05 -0700 |
| commit | e63c33783049753784a24675bfa0792e54684fbd (patch) | |
| tree | 3d984535025f4cb97489c9665220ac4237e7761c /Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp | |
| parent | 09457d3a4245ec9d4f2fdac3d1d0873a3354b858 (diff) | |
| parent | e4896d39bd927b0b8e109e0334fa15cdb8e004f3 (diff) | |
Merge pull request #5305 from iwubcode/abstract_texture
Abstract Texture
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp b/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp index 27af3b6828..5b9bbeced9 100644 --- a/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp +++ b/Source/Core/VideoCommon/HiresTextures_DDSLoader.cpp @@ -142,7 +142,7 @@ struct DDSLoadInfo u32 width = 0; u32 height = 0; u32 mip_count = 0; - HostTextureFormat format = HostTextureFormat::RGBA8; + AbstractTextureFormat format = AbstractTextureFormat::RGBA8; size_t first_mip_offset = 0; size_t first_mip_size = 0; u32 first_mip_row_length = 0; @@ -300,21 +300,21 @@ bool ParseDDSHeader(File::IOFile& file, DDSLoadInfo* info) // In the future, this could be extended, but these isn't much benefit in doing so currently. if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '1') || dxt10_format == 71) { - info->format = HostTextureFormat::DXT1; + info->format = AbstractTextureFormat::DXT1; info->block_size = 4; info->bytes_per_block = 8; needs_s3tc = true; } else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '3') || dxt10_format == 74) { - info->format = HostTextureFormat::DXT3; + info->format = AbstractTextureFormat::DXT3; info->block_size = 4; info->bytes_per_block = 16; needs_s3tc = true; } else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '5') || dxt10_format == 77) { - info->format = HostTextureFormat::DXT5; + info->format = AbstractTextureFormat::DXT5; info->block_size = 4; info->bytes_per_block = 16; needs_s3tc = true; @@ -353,7 +353,7 @@ bool ParseDDSHeader(File::IOFile& file, DDSLoadInfo* info) } // All these formats are RGBA, just with byte swapping. - info->format = HostTextureFormat::RGBA8; + info->format = AbstractTextureFormat::RGBA8; info->block_size = 1; info->bytes_per_block = header.ddspf.dwRGBBitCount / 8; } |
