zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 16:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed macro into a regular function

Browse source
This commit is contained in:
Rachael Alexanderson 2018-09-23 08:30:44 -04:00
parent db7fc3c0ea
commit cbdc0094b3
1 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/textures/hires/hqresize.cpp
View file

@ -187,31 +187,6 @@ static void scale4x ( uint32_t* inputBuffer, uint32_t* outputBuffer, int inWidth
delete[] buffer2x;
}
#define DEFINENORMALSCALER(NAME, SIZE) \
static void NAME ( uint32_t* inputBuffer, uint32_t* outputBuffer, int inWidth, int inHeight ) \
{ \
const int width = SIZE * inWidth; \
const int height = SIZE * inHeight; \
\
for ( int i = 0; i < inWidth; ++i ) \
{ \
for ( int j = 0; j < inHeight; ++j ) \
{ \
const uint32_t E = inputBuffer[ i +inWidth*j ]; \
for ( int k = 0; k < SIZE; k++ ) \
{ \
for ( int l = 0; l < SIZE; l++ ) \
{ \
outputBuffer[SIZE*i+k + width*(SIZE*j+l)] = E; \
} \
} \
} \
} \
}
DEFINENORMALSCALER(normal2x, 2)
DEFINENORMALSCALER(normal3x, 3)
DEFINENORMALSCALER(normal4x, 4)
static unsigned char *scaleNxHelper( void (*scaleNxFunction) ( uint32_t* , uint32_t* , int , int),
const int N,
unsigned char *inputBuffer,
@ -229,6 +204,44 @@ static unsigned char *scaleNxHelper( void (*scaleNxFunction) ( uint32_t* , uint3
return newBuffer;
}
static void normalNx ( uint32_t* inputBuffer, uint32_t* outputBuffer, int inWidth, int inHeight, int size )
{
const int width = size * inWidth;
const int height = size * inHeight;
for ( int i = 0; i < inWidth; ++i )
{
for ( int j = 0; j < inHeight; ++j )
{
const uint32_t E = inputBuffer[ i +inWidth*j ];
for ( int k = 0; k < size; k++ )
{
for ( int l = 0; l < size; l++ )
{
outputBuffer[size*i+k + width*(size*j+l)] = E;
}
}
}
}
}
static unsigned char *normalNxHelper( void (normalNxFunction) ( uint32_t* , uint32_t* , int , int, int),
const int N,
unsigned char *inputBuffer,
const int inWidth,
const int inHeight,
int &outWidth,
int &outHeight )
{
outWidth = N * inWidth;
outHeight = N *inHeight;
unsigned char * newBuffer = new unsigned char[outWidth*outHeight*4];
normalNxFunction ( reinterpret_cast<uint32_t*> ( inputBuffer ), reinterpret_cast<uint32_t*> ( newBuffer ), inWidth, inHeight, N );
delete[] inputBuffer;
return newBuffer;
}
#ifdef HAVE_MMX
static unsigned char *hqNxAsmHelper( void (*hqNxFunction) ( int*, unsigned char*, int, int, int ),
const int N,
@ -415,11 +428,11 @@ unsigned char *FTexture::CreateUpsampledTextureBuffer (unsigned char *inputBuffe
case 15:
return xbrzHelper(xbrzOldScale, type - 11, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 16:
return scaleNxHelper( &normal2x, 2, inputBuffer, inWidth, inHeight, outWidth, outHeight );
return normalNxHelper( &normalNx, 2, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 17:
return scaleNxHelper( &normal3x, 3, inputBuffer, inWidth, inHeight, outWidth, outHeight );
return normalNxHelper( &normalNx, 3, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 18:
return scaleNxHelper( &normal4x, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
return normalNxHelper( &normalNx, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
}
}
return inputBuffer;