FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a handling of different hex long long handling for VS and non

Browse Source 
VS.
This commit is contained in:
Robert Osfield 2004-08-16 21:03:41 +00:00
parent cf99c3c9bd
commit a9cb803404
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/osg/dxtctool.h
View File

@ -44,10 +44,26 @@
#include <osg/Texture> #include <osg/Texture>
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
typedef char __int8;
typedef short __int16; typedef char __int8;
typedef int __int32; typedef short __int16;
typedef long long __int64; typedef int __int32;
typedef long long __int64;
#define HEX_0x000000000000FFFF 0x000000000000FFFFll
#define HEX_0x000000000FFF0000 0x000000000FFF0000ll
#define HEX_0x000000FFF0000000 0x000000FFF0000000ll
#define HEX_0x000FFF0000000000 0x000FFF0000000000ll
#define HEX_0xFFF0000000000000 0xFFF0000000000000ll
#else
#define HEX_0x000000000000FFFF 0x000000000000FFFF
#define HEX_0x000000000FFF0000 0x000000000FFF0000
#define HEX_0x000000FFF0000000 0x000000FFF0000000
#define HEX_0x000FFF0000000000 0x000FFF0000000000
#define HEX_0xFFF0000000000000 0xFFF0000000000000
#endif #endif
namespace dxtc_tool { namespace dxtc_tool {
@ -226,15 +242,19 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const {
} }
inline void dxtc_pixels::BVF_Alpha_DXT5_H4(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) // 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 * const pB = (__int64 * const) pBlock;
__int64 TmpQWord = (pB[0] & 0x000000000000FFFFll); __int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF);
TmpQWord |= (pB[0] & 0x000000000FFF0000ll) << 36; TmpQWord |= (pB[0] & HEX_0x000000000FFF0000) << 36;
TmpQWord |= (pB[0] & 0x000000FFF0000000ll) << 12; TmpQWord |= (pB[0] & HEX_0x000000FFF0000000) << 12;
TmpQWord |= (pB[0] & 0x000FFF0000000000ll) >> 12; TmpQWord |= (pB[0] & HEX_0x000FFF0000000000) >> 12;
TmpQWord |= (pB[0] & 0xFFF0000000000000ll) >> 36; TmpQWord |= (pB[0] & HEX_0xFFF0000000000000) >> 36;
pB[0] = TmpQWord; pB[0] = TmpQWord;
} }
@ -244,17 +264,17 @@ inline void dxtc_pixels::BVF_Alpha_DXT5(void * const pBlock1, void * const pBloc
__int64 * const pB1 = (__int64 * const) pBlock1; __int64 * const pB1 = (__int64 * const) pBlock1;
__int64 * const pB2 = (__int64 * const) pBlock2; __int64 * const pB2 = (__int64 * const) pBlock2;
__int64 TmpQWord1 = (pB1[0] & 0x000000000000FFFFll); __int64 TmpQWord1 = (pB1[0] & HEX_0x000000000000FFFF);
TmpQWord1 |= (pB1[0] & 0x000000000FFF0000ll) << 36; TmpQWord1 |= (pB1[0] & HEX_0x000000000FFF0000) << 36;
TmpQWord1 |= (pB1[0] & 0x000000FFF0000000ll) << 12; TmpQWord1 |= (pB1[0] & HEX_0x000000FFF0000000) << 12;
TmpQWord1 |= (pB1[0] & 0x000FFF0000000000ll) >> 12; TmpQWord1 |= (pB1[0] & HEX_0x000FFF0000000000) >> 12;
TmpQWord1 |= (pB1[0] & 0xFFF0000000000000ll) >> 36; TmpQWord1 |= (pB1[0] & HEX_0xFFF0000000000000) >> 36;
__int64 TmpQWord2 = (pB2[0] & 0x000000000000FFFFll); __int64 TmpQWord2 = (pB2[0] & HEX_0x000000000000FFFF);
TmpQWord2 |= (pB2[0] & 0x000000000FFF0000ll) << 36; TmpQWord2 |= (pB2[0] & HEX_0x000000000FFF0000) << 36;
TmpQWord2 |= (pB2[0] & 0x000000FFF0000000ll) << 12; TmpQWord2 |= (pB2[0] & HEX_0x000000FFF0000000) << 12;
TmpQWord2 |= (pB2[0] & 0x000FFF0000000000ll) >> 12; TmpQWord2 |= (pB2[0] & HEX_0x000FFF0000000000) >> 12;
TmpQWord2 |= (pB2[0] & 0xFFF0000000000000ll) >> 36; TmpQWord2 |= (pB2[0] & HEX_0xFFF0000000000000) >> 36;
pB1[0] = TmpQWord2; pB1[0] = TmpQWord2;
pB2[0] = TmpQWord1; pB2[0] = TmpQWord1;