summaryrefslogtreecommitdiff
path: root/thirdparty/basis_universal/basisu_gpu_texture.h
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparty/basis_universal/basisu_gpu_texture.h')
-rw-r--r--thirdparty/basis_universal/basisu_gpu_texture.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/thirdparty/basis_universal/basisu_gpu_texture.h b/thirdparty/basis_universal/basisu_gpu_texture.h
index 9b18116737..8a49757ca7 100644
--- a/thirdparty/basis_universal/basisu_gpu_texture.h
+++ b/thirdparty/basis_universal/basisu_gpu_texture.h
@@ -37,7 +37,7 @@ namespace basisu
void clear()
{
- m_fmt = cInvalidTextureFormat;
+ m_fmt = texture_format::cInvalidTextureFormat;
m_width = 0;
m_height = 0;
m_block_width = 0;
@@ -101,7 +101,7 @@ namespace basisu
m_blocks.resize(m_blocks_x * m_blocks_y * m_qwords_per_block);
}
- bool unpack(image& img, bool pvrtc_wrap_addressing = true) const;
+ bool unpack(image& img) const;
void override_dimensions(uint32_t w, uint32_t h)
{
@@ -132,6 +132,7 @@ namespace basisu
bool write_compressed_texture_file(const char *pFilename, const gpu_image &g);
+ bool write_3dfx_out_file(const char* pFilename, const gpu_image& gi);
// GPU texture block unpacking
void unpack_etc2_eac(const void *pBlock_bits, color_rgba *pPixels);
@@ -142,6 +143,9 @@ namespace basisu
bool unpack_bc7_mode6(const void *pBlock_bits, color_rgba *pPixels);
bool unpack_bc7_mode5(const void* pBlock_bits, color_rgba* pPixels);
void unpack_atc(const void* pBlock_bits, color_rgba* pPixels);
+ bool unpack_fxt1(const void* p, color_rgba* pPixels);
+ bool unpack_pvrtc2(const void* p, color_rgba* pPixels);
+ void unpack_etc2_eac_rg(const void* p, color_rgba* pPixels);
// unpack_block() is only capable of unpacking texture data created by the transcoder.
// For some texture formats (like BC7, or ETC2) it's not a complete implementation.