zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

etcpak: Replace use of std::array (which seems not to exist under all compilers) with simple custom class.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5687 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-03-28 05:16:02 +00:00
parent b4d59a287d
commit 7b639accc1
1 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
polymer/eduke32/source/android/etcpak/ProcessRGB.cpp
View file

@ -1,4 +1,3 @@
#include <array>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
@ -17,7 +16,28 @@ static inline uint32 byteswap(uint32 l)
return ((l >> 8u) & 0xff00u) | ((l & 0xff00u) << 8u) | (l << 24u) | (l >> 24u); return ((l >> 8u) & 0xff00u) | ((l & 0xff00u) << 8u) | (l << 24u) | (l >> 24u);
} }
typedef std::array<uint16, 4> v4i; template<typename T, size_t size>
struct simple_array
{
simple_array()
{
memset(data, 0, sizeof(data));
}
T operator [](int i) const
{
return data[i];
}
T & operator [](int i)
{
return data[i];
}
protected:
T data[size];
};
typedef simple_array<uint16, 4> v4i;
void Average( const uint8* data, v4i* a ) void Average( const uint8* data, v4i* a )
{ {
@ -41,10 +61,22 @@ void Average( const uint8* data, v4i* a )
} }
} }
a[0] = v4i{ uint16( (r[2] + r[3] + 4) / 8 ), uint16( (g[2] + g[3] + 4) / 8 ), uint16( (b[2] + b[3] + 4) / 8 ), 0}; a[0][0] = uint16( (r[2] + r[3] + 4) / 8 );
a[1] = v4i{ uint16( (r[0] + r[1] + 4) / 8 ), uint16( (g[0] + g[1] + 4) / 8 ), uint16( (b[0] + b[1] + 4) / 8 ), 0}; a[0][1] = uint16( (g[2] + g[3] + 4) / 8 );
a[2] = v4i{ uint16( (r[1] + r[3] + 4) / 8 ), uint16( (g[1] + g[3] + 4) / 8 ), uint16( (b[1] + b[3] + 4) / 8 ), 0}; a[0][2] = uint16( (b[2] + b[3] + 4) / 8 );
a[3] = v4i{ uint16( (r[0] + r[2] + 4) / 8 ), uint16( (g[0] + g[2] + 4) / 8 ), uint16( (b[0] + b[2] + 4) / 8 ), 0}; a[0][3] = 0;
a[1][0] = uint16( (r[0] + r[1] + 4) / 8 );
a[1][1] = uint16( (g[0] + g[1] + 4) / 8 );
a[1][2] = uint16( (b[0] + b[1] + 4) / 8 );
a[1][3] = 0;
a[2][0] = uint16( (r[1] + r[3] + 4) / 8 );
a[2][1] = uint16( (g[1] + g[3] + 4) / 8 );
a[2][2] = uint16( (b[1] + b[3] + 4) / 8 );
a[2][3] = 0;
a[3][0] = uint16( (r[0] + r[2] + 4) / 8 );
a[3][1] = uint16( (g[0] + g[2] + 4) / 8 );
a[3][2] = uint16( (b[0] + b[2] + 4) / 8 );
a[3][3] = 0;
} }
void CalcErrorBlock( const uint8* data, uint err[4][4] ) void CalcErrorBlock( const uint8* data, uint err[4][4] )