From Bruce Clay, fixes for VS6.0 build.
This commit is contained in:
Robert Osfield
@@ -11,8 +11,11 @@
|
||||
|
||||
namespace dxtc_tool {
|
||||
|
||||
|
||||
|
||||
const size_t dxtc_pixels::BSIZE_DXT1 = 8;
|
||||
const size_t dxtc_pixels::BSIZE_DXT3 = 16;
|
||||
const size_t dxtc_pixels::BSIZE_DXT5 = 16;
|
||||
const size_t dxtc_pixels::BSIZE_ALPHA_DXT3 = 8;
|
||||
const size_t dxtc_pixels::BSIZE_ALPHA_DXT5 = 8;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Construction/Destruction
|
||||
@@ -26,129 +29,129 @@ namespace dxtc_tool {
|
||||
|
||||
bool dxtc_pixels::OpenGLSize() const
|
||||
{
|
||||
size_t Width = m_Width;
|
||||
size_t Height = m_Height;
|
||||
// size_t TotalTrueBits = 0;
|
||||
size_t Width = m_Width;
|
||||
size_t Height = m_Height;
|
||||
// size_t TotalTrueBits = 0;
|
||||
|
||||
if ((Width == 0) || (Height == 0))
|
||||
return false;
|
||||
if ((Width == 0) || (Height == 0))
|
||||
return false;
|
||||
|
||||
for (; (Width % 2) == 0; Width /= 2);
|
||||
for (; (Height % 2) == 0; Height /= 2);
|
||||
for (; (Width % 2) == 0; Width /= 2);
|
||||
for (; (Height % 2) == 0; Height /= 2);
|
||||
|
||||
if ((Width != 1) || (Height != 1))
|
||||
return false;
|
||||
else
|
||||
return true;
|
||||
if ((Width != 1) || (Height != 1))
|
||||
return false;
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool dxtc_pixels::VFlip() const
|
||||
{
|
||||
// Check that the given dimentions are 2^x, 2^y
|
||||
if (! OpenGLSize())
|
||||
return false;
|
||||
// Check that the given dimentions are 2^x, 2^y
|
||||
if (! OpenGLSize())
|
||||
return false;
|
||||
|
||||
// Check that the given format are supported
|
||||
if (! SupportedFormat())
|
||||
return false;
|
||||
// Check that the given format are supported
|
||||
if (! SupportedFormat())
|
||||
return false;
|
||||
|
||||
// Nothing to do if Height == 1
|
||||
if (m_Height == 1)
|
||||
return true;
|
||||
|
||||
if (DXT1())
|
||||
VFlip_DXT1();
|
||||
else if (DXT3())
|
||||
VFlip_DXT3();
|
||||
else if (DXT5())
|
||||
VFlip_DXT5();
|
||||
else
|
||||
return false; // We should never get there
|
||||
// Nothing to do if Height == 1
|
||||
if (m_Height == 1)
|
||||
return true;
|
||||
|
||||
if (DXT1())
|
||||
VFlip_DXT1();
|
||||
else if (DXT3())
|
||||
VFlip_DXT3();
|
||||
else if (DXT5())
|
||||
VFlip_DXT5();
|
||||
else
|
||||
return false; // We should never get there
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void dxtc_pixels::VFlip_DXT1() const
|
||||
{
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT1;
|
||||
__int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT1;
|
||||
__int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j)
|
||||
BVF_Color_H2(pPixels + j * BSIZE_DXT1);
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j)
|
||||
BVF_Color_H2(pPixels + j * BSIZE_DXT1);
|
||||
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j)
|
||||
BVF_Color_H4(pPixels + j * BSIZE_DXT1);
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j)
|
||||
BVF_Color_H4(pPixels + j * BSIZE_DXT1);
|
||||
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Color(GetBlock(i, j, BSIZE_DXT1), GetBlock(TargetRow, j, BSIZE_DXT1));
|
||||
}
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Color(GetBlock(i, j, BSIZE_DXT1), GetBlock(TargetRow, j, BSIZE_DXT1));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void dxtc_pixels::VFlip_DXT3() const
|
||||
{
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT3;
|
||||
// __int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT3;
|
||||
// __int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT3_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
|
||||
BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
|
||||
}
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT3_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
|
||||
BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
|
||||
}
|
||||
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT3_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
|
||||
BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
|
||||
}
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT3_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
|
||||
BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
|
||||
}
|
||||
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Alpha_DXT3(GetBlock(i, j, BSIZE_DXT3), GetBlock(TargetRow, j, BSIZE_DXT3));
|
||||
BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3,
|
||||
((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3);
|
||||
}
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Alpha_DXT3(GetBlock(i, j, BSIZE_DXT3), GetBlock(TargetRow, j, BSIZE_DXT3));
|
||||
BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3,
|
||||
((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void dxtc_pixels::VFlip_DXT5() const
|
||||
{
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT5;
|
||||
// __int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
// const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT5;
|
||||
// __int8 * const pPixels = (__int8 * const) m_pPixels;
|
||||
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT5_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
|
||||
BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
|
||||
}
|
||||
if (m_Height == 2)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT5_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
|
||||
BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
|
||||
}
|
||||
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT5_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
|
||||
BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
|
||||
}
|
||||
if (m_Height == 4)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
BVF_Alpha_DXT5_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
|
||||
BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
|
||||
}
|
||||
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Alpha_DXT5(GetBlock(i, j, BSIZE_DXT5), GetBlock(TargetRow, j, BSIZE_DXT5));
|
||||
BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5,
|
||||
((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5);
|
||||
}
|
||||
if (m_Height > 4)
|
||||
for (size_t i = 0; i < ((m_Height + 7) / 8); ++i)
|
||||
for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
|
||||
const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
|
||||
BVF_Alpha_DXT5(GetBlock(i, j, BSIZE_DXT5), GetBlock(TargetRow, j, BSIZE_DXT5));
|
||||
BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5,
|
||||
((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DXTC Tools: Vertical Flip.
|
||||
// *************************
|
||||
// DXTC Tools: Vertical Flip.
|
||||
// *************************
|
||||
//
|
||||
// Current version: 1.00 BETA 1 (27/08/2002)
|
||||
//
|
||||
@@ -80,50 +80,50 @@ bool VerticalFlip(size_t Width, size_t Height, GLenum Format, void * pPixels);
|
||||
class dxtc_pixels
|
||||
{
|
||||
public:
|
||||
dxtc_pixels(size_t Width, size_t Height, GLenum Format, void * pPixels);
|
||||
dxtc_pixels(size_t Width, size_t Height, GLenum Format, void * pPixels);
|
||||
|
||||
// Vertically flip the whole picture
|
||||
bool VFlip() const;
|
||||
// Vertically flip the whole picture
|
||||
bool VFlip() const;
|
||||
|
||||
protected:
|
||||
|
||||
// Limitation check functions
|
||||
bool DXT1() const;
|
||||
bool DXT3() const;
|
||||
bool DXT5() const;
|
||||
bool OpenGLSize() const;
|
||||
bool SupportedFormat() const;
|
||||
// Limitation check functions
|
||||
bool DXT1() const;
|
||||
bool DXT3() const;
|
||||
bool DXT5() const;
|
||||
bool OpenGLSize() const;
|
||||
bool SupportedFormat() const;
|
||||
|
||||
// Vertical flipping functions
|
||||
void VFlip_DXT1() const;
|
||||
void VFlip_DXT3() const;
|
||||
void VFlip_DXT5() const;
|
||||
// Vertical flipping functions
|
||||
void VFlip_DXT1() const;
|
||||
void VFlip_DXT3() const;
|
||||
void VFlip_DXT5() const;
|
||||
|
||||
// Block vertical flipping functions
|
||||
void BVF_Color_H2(void * const pBlock) const; // V. flip one color block with its virtual height == 2
|
||||
void BVF_Color_H4(void * const pBlock) const; // V. flip one color block with its virtual height == 4
|
||||
void BVF_Color(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two color blocks, with their virtual height == 4
|
||||
void BVF_Alpha_DXT3_H2(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 2
|
||||
void BVF_Alpha_DXT3_H4(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 4
|
||||
void BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT3) blocks, with their virtual height == 4
|
||||
void BVF_Alpha_DXT5_H2(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 2
|
||||
void BVF_Alpha_DXT5_H4(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 4
|
||||
void BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT5) blocks, with their virtual height == 4
|
||||
|
||||
// Block localization functions
|
||||
void * GetBlock(size_t i, size_t j, size_t BlockSize) const;
|
||||
// Block vertical flipping functions
|
||||
void BVF_Color_H2(void * const pBlock) const; // V. flip one color block with its virtual height == 2
|
||||
void BVF_Color_H4(void * const pBlock) const; // V. flip one color block with its virtual height == 4
|
||||
void BVF_Color(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two color blocks, with their virtual height == 4
|
||||
void BVF_Alpha_DXT3_H2(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 2
|
||||
void BVF_Alpha_DXT3_H4(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 4
|
||||
void BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT3) blocks, with their virtual height == 4
|
||||
void BVF_Alpha_DXT5_H2(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 2
|
||||
void BVF_Alpha_DXT5_H4(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 4
|
||||
void BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT5) blocks, with their virtual height == 4
|
||||
|
||||
// Block localization functions
|
||||
void * GetBlock(size_t i, size_t j, size_t BlockSize) const;
|
||||
|
||||
// mighty const and var
|
||||
static const size_t BSIZE_DXT1 = 8;
|
||||
static const size_t BSIZE_DXT3 = 16;
|
||||
static const size_t BSIZE_DXT5 = 16;
|
||||
static const size_t BSIZE_ALPHA_DXT3 = 8;
|
||||
static const size_t BSIZE_ALPHA_DXT5 = 8;
|
||||
// mighty const and var
|
||||
static const size_t BSIZE_DXT1;
|
||||
static const size_t BSIZE_DXT3;
|
||||
static const size_t BSIZE_DXT5;
|
||||
static const size_t BSIZE_ALPHA_DXT3;
|
||||
static const size_t BSIZE_ALPHA_DXT5;
|
||||
|
||||
const size_t m_Width;
|
||||
const size_t m_Height;
|
||||
const GLenum m_Format;
|
||||
void * const m_pPixels;
|
||||
const size_t m_Width;
|
||||
const size_t m_Height;
|
||||
const GLenum m_Format;
|
||||
void * const m_pPixels;
|
||||
};
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ protected:
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline bool VerticalFlip(size_t Width, size_t Height, GLenum Format, void * pPixels) {
|
||||
return (dxtc_pixels(Width, Height, Format, pPixels)).VFlip();
|
||||
return (dxtc_pixels(Width, Height, Format, pPixels)).VFlip();
|
||||
}
|
||||
|
||||
|
||||
@@ -144,101 +144,101 @@ inline bool VerticalFlip(size_t Width, size_t Height, GLenum Format, void * pPix
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline dxtc_pixels::dxtc_pixels(size_t Width, size_t Height, GLenum Format, void * pPixels) :
|
||||
m_Width(Width), m_Height(Height), m_Format(Format), m_pPixels(pPixels) { }
|
||||
m_Width(Width), m_Height(Height), m_Format(Format), m_pPixels(pPixels) { }
|
||||
|
||||
|
||||
inline bool dxtc_pixels::DXT1() const {
|
||||
return ((m_Format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) || (m_Format == GL_COMPRESSED_RGB_S3TC_DXT1_EXT));
|
||||
return ((m_Format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) || (m_Format == GL_COMPRESSED_RGB_S3TC_DXT1_EXT));
|
||||
}
|
||||
|
||||
|
||||
inline bool dxtc_pixels::DXT3() const {
|
||||
return (m_Format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
|
||||
return (m_Format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
|
||||
}
|
||||
|
||||
|
||||
inline bool dxtc_pixels::DXT5() const {
|
||||
return (m_Format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
|
||||
return (m_Format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
|
||||
}
|
||||
|
||||
|
||||
inline bool dxtc_pixels::SupportedFormat() const {
|
||||
return (DXT1() || DXT3() || DXT5());
|
||||
return (DXT1() || DXT3() || DXT5());
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Color_H2(void * const pBlock) const {
|
||||
// Swap the two first row of pixels
|
||||
__int8 * const pP = ((__int8 * const) pBlock) + 4;
|
||||
// Swap the two first row of pixels
|
||||
__int8 * const pP = ((__int8 * const) pBlock) + 4;
|
||||
|
||||
std::swap(pP[0], pP[1]);
|
||||
std::swap(pP[0], pP[1]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Color_H4(void * const pBlock) const {
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels
|
||||
__int8 * const pP = ((__int8 * const) pBlock) + 4;
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels
|
||||
__int8 * const pP = ((__int8 * const) pBlock) + 4;
|
||||
|
||||
std::swap(pP[0], pP[3]);
|
||||
std::swap(pP[1], pP[2]);
|
||||
std::swap(pP[0], pP[3]);
|
||||
std::swap(pP[1], pP[2]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Color(void * const pBlock1, void * const pBlock2) const {
|
||||
// Swap the "2 colors" header (32bits each header)
|
||||
__int32 * const pHdr1 = (__int32 * const) pBlock1;
|
||||
__int32 * const pHdr2 = (__int32 * const) pBlock2;
|
||||
// Swap the "2 colors" header (32bits each header)
|
||||
__int32 * const pHdr1 = (__int32 * const) pBlock1;
|
||||
__int32 * const pHdr2 = (__int32 * const) pBlock2;
|
||||
|
||||
std::swap(* pHdr1, * pHdr2);
|
||||
std::swap(* pHdr1, * pHdr2);
|
||||
|
||||
// Now swap the pixel values
|
||||
__int8 * const pP1 = ((__int8 * const) pBlock1) + 4;
|
||||
__int8 * const pP2 = ((__int8 * const) pBlock2) + 4;
|
||||
// Now swap the pixel values
|
||||
__int8 * const pP1 = ((__int8 * const) pBlock1) + 4;
|
||||
__int8 * const pP2 = ((__int8 * const) pBlock2) + 4;
|
||||
|
||||
std::swap(pP1[0], pP2[3]);
|
||||
std::swap(pP1[1], pP2[2]);
|
||||
std::swap(pP1[2], pP2[1]);
|
||||
std::swap(pP1[3], pP2[0]);
|
||||
std::swap(pP1[0], pP2[3]);
|
||||
std::swap(pP1[1], pP2[2]);
|
||||
std::swap(pP1[2], pP2[1]);
|
||||
std::swap(pP1[3], pP2[0]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT3_H2(void * const pBlock) const {
|
||||
// Swap the two first row of pixels
|
||||
__int16 * const pP = (__int16 * const) pBlock;
|
||||
// Swap the two first row of pixels
|
||||
__int16 * const pP = (__int16 * const) pBlock;
|
||||
|
||||
std::swap(pP[0], pP[1]);
|
||||
std::swap(pP[0], pP[1]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT3_H4(void * const pBlock) const {
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels
|
||||
__int16 * const pP = (__int16 * const) pBlock;
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels
|
||||
__int16 * const pP = (__int16 * const) pBlock;
|
||||
|
||||
std::swap(pP[0], pP[3]);
|
||||
std::swap(pP[1], pP[2]);
|
||||
std::swap(pP[0], pP[3]);
|
||||
std::swap(pP[1], pP[2]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const {
|
||||
// Swap all the pixel values
|
||||
__int16 * const pP1 = (__int16 * const) pBlock1;
|
||||
__int16 * const pP2 = (__int16 * const) pBlock2;
|
||||
// Swap all the pixel values
|
||||
__int16 * const pP1 = (__int16 * const) pBlock1;
|
||||
__int16 * const pP2 = (__int16 * const) pBlock2;
|
||||
|
||||
std::swap(pP1[0], pP2[3]);
|
||||
std::swap(pP1[1], pP2[2]);
|
||||
std::swap(pP1[2], pP2[1]);
|
||||
std::swap(pP1[3], pP2[0]);
|
||||
std::swap(pP1[0], pP2[3]);
|
||||
std::swap(pP1[1], pP2[2]);
|
||||
std::swap(pP1[2], pP2[1]);
|
||||
std::swap(pP1[3], pP2[0]);
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const {
|
||||
// Swap the two first row of pixels (kinda tricky with DXT5 unaligned encoding)
|
||||
__int32 * const pP = (__int32 * const) (((__int8 * const) pBlock) + 2);
|
||||
// Swap the two first row of pixels (kinda tricky with DXT5 unaligned encoding)
|
||||
__int32 * const pP = (__int32 * const) (((__int8 * const) pBlock) + 2);
|
||||
|
||||
__int32 TmpDWord = (pP[0] & 0xFF000000);
|
||||
TmpDWord |= (pP[0] & 0x00000FFF) << 12;
|
||||
TmpDWord |= (pP[0] & 0x00FFF000) >> 12;
|
||||
pP[0] = TmpDWord;
|
||||
__int32 TmpDWord = (pP[0] & 0xFF000000);
|
||||
TmpDWord |= (pP[0] & 0x00000FFF) << 12;
|
||||
TmpDWord |= (pP[0] & 0x00FFF000) >> 12;
|
||||
pP[0] = TmpDWord;
|
||||
}
|
||||
|
||||
|
||||
@@ -247,44 +247,44 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const {
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT5_H4(void * const pBlock) const {
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels (tricky again)
|
||||
__int64 * const pB = (__int64 * const) pBlock;
|
||||
// Swap the the first row of pixels with the last one, then the 2 middle row of pixels (tricky again)
|
||||
__int64 * const pB = (__int64 * const) pBlock;
|
||||
|
||||
__int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord |= (pB[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord |= (pB[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord |= (pB[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord |= (pB[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
pB[0] = TmpQWord;
|
||||
__int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord |= (pB[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord |= (pB[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord |= (pB[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord |= (pB[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
pB[0] = TmpQWord;
|
||||
}
|
||||
|
||||
|
||||
inline void dxtc_pixels::BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const {
|
||||
// Swap all the pixel values (same trick for DXT5)
|
||||
__int64 * const pB1 = (__int64 * const) pBlock1;
|
||||
__int64 * const pB2 = (__int64 * const) pBlock2;
|
||||
// Swap all the pixel values (same trick for DXT5)
|
||||
__int64 * const pB1 = (__int64 * const) pBlock1;
|
||||
__int64 * const pB2 = (__int64 * const) pBlock2;
|
||||
|
||||
__int64 TmpQWord1 = (pB1[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
__int64 TmpQWord1 = (pB1[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord1 |= (pB1[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
|
||||
__int64 TmpQWord2 = (pB2[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
__int64 TmpQWord2 = (pB2[0] & HEX_0x000000000000FFFF);
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000000000FFF0000) << 36;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000000FFF0000000) << 12;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0x000FFF0000000000) >> 12;
|
||||
TmpQWord2 |= (pB2[0] & HEX_0xFFF0000000000000) >> 36;
|
||||
|
||||
pB1[0] = TmpQWord2;
|
||||
pB2[0] = TmpQWord1;
|
||||
pB1[0] = TmpQWord2;
|
||||
pB2[0] = TmpQWord1;
|
||||
}
|
||||
|
||||
|
||||
inline void * dxtc_pixels::GetBlock(size_t i, size_t j, size_t BlockSize) const {
|
||||
const __int8 * pPixels = (const __int8 *) m_pPixels;
|
||||
const __int8 * pPixels = (const __int8 *) m_pPixels;
|
||||
|
||||
return (void *) (pPixels + i * ((m_Width + 3) / 4) * BlockSize + j * BlockSize);
|
||||
return (void *) (pPixels + i * ((m_Width + 3) / 4) * BlockSize + j * BlockSize);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user