Turned two vars of the HQ2x/HQ3x ASM implementation into global vars, to make it possible to adjust them for 555 vs. 565 mode (555 mode is still a bit buggy, due to the interpolation code they use)

svn-id: r36046
This commit is contained in:
Max Horn 2009-01-24 23:06:58 +00:00
parent e5feb689df
commit 16e7a7cd30
4 changed files with 128 additions and 74 deletions

View file

@ -54,10 +54,15 @@ extern "C" {
#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define RGBtoYUV _RGBtoYUV
#define LUT16to32 _LUT16to32
#define hqx_highbits _hqx_highbits
#define hqx_lowbits _hqx_lowbits
#endif
#endif
uint32 hqx_highbits = 0xF7DEF7DE;
uint32 hqx_lowbits = 0x0821;
// FIXME/TODO: The following two tables suck up 512 KB. This is bad.
// In addition we never free them...
//
@ -114,11 +119,25 @@ void InitLUT(Graphics::PixelFormat format) {
void InitScalers(uint32 BitFormat) {
gBitFormat = BitFormat;
#ifndef DISABLE_HQ_SCALERS
if (gBitFormat == 555)
#undef highBits;
#undef lowBits;
if (gBitFormat == 555) {
InitLUT(Graphics::createPixelFormat<555>());
if (gBitFormat == 565)
#ifdef USE_NASM
hqx_highbits = Graphics::ColorMasks<555>::highBits;
hqx_lowbits = Graphics::ColorMasks<555>::lowBits & 0xFFFF;
#endif
}
if (gBitFormat == 565) {
InitLUT(Graphics::createPixelFormat<565>());
#ifdef USE_NASM
hqx_highbits = Graphics::ColorMasks<565>::highBits;
hqx_lowbits = Graphics::ColorMasks<565>::lowBits & 0xFFFF;
#endif
}
#endif
}