mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-05-11 12:42:06 +08:00
4a6bcc706e
This commit fixes most -Wzero-as-null-pointer-constant warnings, except in
some places which appear to be vendored 3rd party libraries, e.g. in sdl_ttf.c,
libchdr, physfs and gmock and in 3rd party components therein. Since it might
make more sense to update this 3rd party code to some later versions instead of
fixing the warnings manually, I decided not to enable the C++ compiler flag in
configure.ac at this point.
In two functions with the return type of std::string executed `return 0;`
statements, causing std::string to be constructed from a null pointer. To avoid
undefined behavior these were changed to `return {};`.
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
643 lines
25 KiB
C++
643 lines
25 KiB
C++
/*
|
|
* Copyright (C) 2002-2021 The DOSBox Team
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
|
|
//TODO:
|
|
//Maybe just do the cache checking back into the simple scalers so they can
|
|
//just handle it all in one go, but this seems to work well enough for now
|
|
|
|
#include "dosbox.h"
|
|
#include "render.h"
|
|
#include <string.h>
|
|
|
|
uint8_t Scaler_Aspect[SCALER_MAXHEIGHT];
|
|
uint16_t Scaler_ChangedLines[SCALER_MAXHEIGHT];
|
|
Bitu Scaler_ChangedLineIndex;
|
|
|
|
static union {
|
|
uint32_t b32 [4][SCALER_MAXWIDTH*3];
|
|
uint16_t b16 [4][SCALER_MAXWIDTH*3];
|
|
uint8_t b8 [4][SCALER_MAXWIDTH*3];
|
|
} scalerWriteCache;
|
|
//scalerFrameCache_t scalerFrameCache;
|
|
scalerSourceCache_t scalerSourceCache;
|
|
#if RENDER_USE_ADVANCED_SCALERS>1
|
|
scalerChangeCache_t scalerChangeCache;
|
|
#endif
|
|
|
|
#define _conc2(A,B) A ## B
|
|
#define _conc3(A,B,C) A ## B ## C
|
|
#define _conc4(A,B,C,D) A ## B ## C ## D
|
|
#define _conc5(A,B,C,D,E) A ## B ## C ## D ## E
|
|
#define _conc7(A,B,C,D,E,F,G) A ## B ## C ## D ## E ## F ## G
|
|
|
|
#define conc2(A,B) _conc2(A,B)
|
|
#define conc3(A,B,C) _conc3(A,B,C)
|
|
#define conc4(A,B,C,D) _conc4(A,B,C,D)
|
|
#define conc2d(A,B) _conc3(A,_,B)
|
|
#define conc3d(A,B,C) _conc5(A,_,B,_,C)
|
|
#define conc4d(A,B,C,D) _conc7(A,_,B,_,C,_,D)
|
|
|
|
static INLINE void BituMove( void *_dst, const void * _src, Bitu size) {
|
|
Bitu * dst=(Bitu *)(_dst);
|
|
const Bitu * src=(Bitu *)(_src);
|
|
size/=sizeof(Bitu);
|
|
for (Bitu x=0; x<size;x++)
|
|
dst[x] = src[x];
|
|
}
|
|
|
|
static INLINE void ScalerAddLines( Bitu changed, Bitu count ) {
|
|
if ((Scaler_ChangedLineIndex & 1) == changed ) {
|
|
Scaler_ChangedLines[Scaler_ChangedLineIndex] += (uint16_t)count;
|
|
} else {
|
|
Scaler_ChangedLines[++Scaler_ChangedLineIndex] = (uint16_t)count;
|
|
}
|
|
render.scale.outWrite += render.scale.outPitch * count;
|
|
}
|
|
|
|
|
|
#define BituMove2(_DST,_SRC,_SIZE) \
|
|
{ \
|
|
Bitu bsize=(_SIZE)/sizeof(Bitu); \
|
|
Bitu * bdst=(Bitu *)(_DST); \
|
|
Bitu * bsrc=(Bitu *)(_SRC); \
|
|
while (bsize--) *bdst++=*bsrc++; \
|
|
}
|
|
|
|
#if !defined(C_SDL2) && defined(MACOSX)
|
|
/* SDL1 builds are subject to Mac OS X strange BGRA (alpha in low byte) order.
|
|
The code in the #else case happens to work because most OSes put the alpha byte in the upper 32 bits,
|
|
while on Mac OS X the blue channel is up there. Integer overflow will trash the blue channel in that
|
|
case, without this alternate code. */
|
|
#define interp_w2(P0,P1,W0,W1) \
|
|
((((uint64_t)(P0&redblueMask)*(uint64_t)W0+(uint64_t)(P1&redblueMask)*(uint64_t)W1)/(uint64_t)(W0+W1)) & redblueMask) | \
|
|
((((uint64_t)(P0& greenMask)*(uint64_t)W0+(uint64_t)(P1& greenMask)*(uint64_t)W1)/(uint64_t)(W0+W1)) & greenMask)
|
|
#define interp_w3(P0,P1,P2,W0,W1,W2) \
|
|
((((uint64_t)(P0&redblueMask)*(uint64_t)W0+(uint64_t)(P1&redblueMask)*(uint64_t)W1+(uint64_t)(P2&redblueMask)*(uint64_t)W2)/(uint64_t)(W0+W1+W2)) & redblueMask) | \
|
|
((((uint64_t)(P0& greenMask)*(uint64_t)W0+(uint64_t)(P1& greenMask)*(uint64_t)W1+(uint64_t)(P2& greenMask)*(uint64_t)W2)/(uint64_t)(W0+W1+W2)) & greenMask)
|
|
#define interp_w4(P0,P1,P2,P3,W0,W1,W2,W3) \
|
|
((((uint64_t)(P0&redblueMask)*(uint64_t)W0+(uint64_t)(P1&redblueMask)*(uint64_t)W1+(uint64_t)(P2&redblueMask)*(uint64_t)W2+(uint64_t)(P3&redblueMask)*(uint64_t)W3)/(uint64_t)(W0+W1+W2+W3)) & redblueMask) | \
|
|
((((uint64_t)(P0& greenMask)*(uint64_t)W0+(uint64_t)(P1& greenMask)*(uint64_t)W1+(uint64_t)(P2& greenMask)*(uint64_t)W2+(uint64_t)(P3& greenMask)*(uint64_t)W3)/(uint64_t)(W0+W1+W2+W3)) & greenMask)
|
|
#else
|
|
#define interp_w2(P0,P1,W0,W1) \
|
|
((((P0&redblueMask)*W0+(P1&redblueMask)*W1)/(W0+W1)) & redblueMask) | \
|
|
((((P0& greenMask)*W0+(P1& greenMask)*W1)/(W0+W1)) & greenMask)
|
|
#define interp_w3(P0,P1,P2,W0,W1,W2) \
|
|
((((P0&redblueMask)*W0+(P1&redblueMask)*W1+(P2&redblueMask)*W2)/(W0+W1+W2)) & redblueMask) | \
|
|
((((P0& greenMask)*W0+(P1& greenMask)*W1+(P2& greenMask)*W2)/(W0+W1+W2)) & greenMask)
|
|
#define interp_w4(P0,P1,P2,P3,W0,W1,W2,W3) \
|
|
((((P0&redblueMask)*W0+(P1&redblueMask)*W1+(P2&redblueMask)*W2+(P3&redblueMask)*W3)/(W0+W1+W2+W3)) & redblueMask) | \
|
|
((((P0& greenMask)*W0+(P1& greenMask)*W1+(P2& greenMask)*W2+(P3& greenMask)*W3)/(W0+W1+W2+W3)) & greenMask)
|
|
#endif
|
|
|
|
#define CC scalerChangeCache
|
|
|
|
/* Include the different rendering routines */
|
|
#define SBPP 8
|
|
#define DBPP 8
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 15
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 16
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 32
|
|
#include "render_templates.h"
|
|
#undef SBPP
|
|
#undef DBPP
|
|
|
|
/* SBPP 9 is a special case with palette check support */
|
|
#define SBPP 9
|
|
#define DBPP 8
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 15
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 16
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 32
|
|
#include "render_templates.h"
|
|
#undef SBPP
|
|
#undef DBPP
|
|
|
|
#define SBPP 15
|
|
#define DBPP 15
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 16
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 32
|
|
#include "render_templates.h"
|
|
#undef SBPP
|
|
#undef DBPP
|
|
|
|
#define SBPP 16
|
|
#define DBPP 15
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 16
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 32
|
|
#include "render_templates.h"
|
|
#undef SBPP
|
|
#undef DBPP
|
|
|
|
#define SBPP 32
|
|
#define DBPP 15
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 16
|
|
#include "render_templates.h"
|
|
#undef DBPP
|
|
#define DBPP 32
|
|
#include "render_templates.h"
|
|
#undef SBPP
|
|
#undef DBPP
|
|
|
|
|
|
#if RENDER_USE_ADVANCED_SCALERS>1
|
|
ScalerLineBlock_t ScalerCache = {
|
|
{ Cache_8_8, Cache_8_15 , Cache_8_16 , Cache_8_32 },
|
|
{ nullptr, Cache_15_15, Cache_15_16, Cache_15_32},
|
|
{ nullptr, Cache_16_15, Cache_16_16, Cache_16_32},
|
|
{ nullptr, Cache_32_15, Cache_32_16, Cache_32_32},
|
|
{ Cache_8_8, Cache_9_15 , Cache_9_16 , Cache_9_32 }
|
|
};
|
|
#endif
|
|
|
|
ScalerSimpleBlock_t ScaleNormal1x = {
|
|
"Normal",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
1,1,{
|
|
{ Normal1x_8_8_L, Normal1x_8_15_L , Normal1x_8_16_L , Normal1x_8_32_L },
|
|
{ nullptr, Normal1x_15_15_L, Normal1x_15_16_L, Normal1x_15_32_L},
|
|
{ nullptr, Normal1x_16_15_L, Normal1x_16_16_L, Normal1x_16_32_L},
|
|
{ nullptr, Normal1x_32_15_L, Normal1x_32_16_L, Normal1x_32_32_L},
|
|
{ Normal1x_8_8_L, Normal1x_9_15_L , Normal1x_9_16_L , Normal1x_9_32_L }
|
|
},{
|
|
{ Normal1x_8_8_R, Normal1x_8_15_R , Normal1x_8_16_R , Normal1x_8_32_R },
|
|
{ nullptr, Normal1x_15_15_R, Normal1x_15_16_R, Normal1x_15_32_R},
|
|
{ nullptr, Normal1x_16_15_R, Normal1x_16_16_R, Normal1x_16_32_R},
|
|
{ nullptr, Normal1x_32_15_R, Normal1x_32_16_R, Normal1x_32_32_R},
|
|
{ Normal1x_8_8_R, Normal1x_9_15_R , Normal1x_9_16_R , Normal1x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormalDw = {
|
|
"Normal",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
2,1,{
|
|
{ NormalDw_8_8_L, NormalDw_8_15_L , NormalDw_8_16_L , NormalDw_8_32_L },
|
|
{ nullptr, NormalDw_15_15_L, NormalDw_15_16_L, NormalDw_15_32_L},
|
|
{ nullptr, NormalDw_16_15_L, NormalDw_16_16_L, NormalDw_16_32_L},
|
|
{ nullptr, NormalDw_32_15_L, NormalDw_32_16_L, NormalDw_32_32_L},
|
|
{ NormalDw_8_8_L, NormalDw_9_15_L , NormalDw_9_16_L , NormalDw_9_32_L }
|
|
},{
|
|
{ NormalDw_8_8_R, NormalDw_8_15_R , NormalDw_8_16_R , NormalDw_8_32_R },
|
|
{ nullptr, NormalDw_15_15_R, NormalDw_15_16_R, NormalDw_15_32_R},
|
|
{ nullptr, NormalDw_16_15_R, NormalDw_16_16_R, NormalDw_16_32_R},
|
|
{ nullptr, NormalDw_32_15_R, NormalDw_32_16_R, NormalDw_32_32_R},
|
|
{ NormalDw_8_8_R, NormalDw_9_15_R , NormalDw_9_16_R , NormalDw_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormalDh = {
|
|
"Normal",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
1,2,{
|
|
{ NormalDh_8_8_L, NormalDh_8_15_L , NormalDh_8_16_L , NormalDh_8_32_L },
|
|
{ nullptr, NormalDh_15_15_L, NormalDh_15_16_L, NormalDh_15_32_L},
|
|
{ nullptr, NormalDh_16_15_L, NormalDh_16_16_L, NormalDh_16_32_L},
|
|
{ nullptr, NormalDh_32_15_L, NormalDh_32_16_L, NormalDh_32_32_L},
|
|
{ NormalDh_8_8_L, NormalDh_9_15_L , NormalDh_9_16_L , NormalDh_9_32_L }
|
|
},{
|
|
{ NormalDh_8_8_R, NormalDh_8_15_R , NormalDh_8_16_R , NormalDh_8_32_R },
|
|
{ nullptr, NormalDh_15_15_R, NormalDh_15_16_R, NormalDh_15_32_R},
|
|
{ nullptr, NormalDh_16_15_R, NormalDh_16_16_R, NormalDh_16_32_R},
|
|
{ nullptr, NormalDh_32_15_R, NormalDh_32_16_R, NormalDh_32_32_R},
|
|
{ NormalDh_8_8_R, NormalDh_9_15_R , NormalDh_9_16_R , NormalDh_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal2xDw = {
|
|
"Normal2x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
4,2,{
|
|
{ Normal2xDw_8_8_L, Normal2xDw_8_15_L , Normal2xDw_8_16_L , Normal2xDw_8_32_L },
|
|
{ nullptr, Normal2xDw_15_15_L, Normal2xDw_15_16_L, Normal2xDw_15_32_L},
|
|
{ nullptr, Normal2xDw_16_15_L, Normal2xDw_16_16_L, Normal2xDw_16_32_L},
|
|
{ nullptr, Normal2xDw_32_15_L, Normal2xDw_32_16_L, Normal2xDw_32_32_L},
|
|
{ Normal2xDw_8_8_L, Normal2xDw_9_15_L , Normal2xDw_9_16_L , Normal2xDw_9_32_L }
|
|
},{
|
|
{ Normal2xDw_8_8_R, Normal2xDw_8_15_R , Normal2xDw_8_16_R , Normal2xDw_8_32_R },
|
|
{ nullptr, Normal2xDw_15_15_R, Normal2xDw_15_16_R, Normal2xDw_15_32_R},
|
|
{ nullptr, Normal2xDw_16_15_R, Normal2xDw_16_16_R, Normal2xDw_16_32_R},
|
|
{ nullptr, Normal2xDw_32_15_R, Normal2xDw_32_16_R, Normal2xDw_32_32_R},
|
|
{ Normal2xDw_8_8_R, Normal2xDw_9_15_R , Normal2xDw_9_16_R , Normal2xDw_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal2xDh = {
|
|
"Normal2x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
2,4,{
|
|
{ Normal2xDh_8_8_L, Normal2xDh_8_15_L , Normal2xDh_8_16_L , Normal2xDh_8_32_L },
|
|
{ nullptr, Normal2xDh_15_15_L, Normal2xDh_15_16_L, Normal2xDh_15_32_L},
|
|
{ nullptr, Normal2xDh_16_15_L, Normal2xDh_16_16_L, Normal2xDh_16_32_L},
|
|
{ nullptr, Normal2xDh_32_15_L, Normal2xDh_32_16_L, Normal2xDh_32_32_L},
|
|
{ Normal2xDh_8_8_L, Normal2xDh_9_15_L , Normal2xDh_9_16_L , Normal2xDh_9_32_L }
|
|
},{
|
|
{ Normal2xDh_8_8_R, Normal2xDh_8_15_R , Normal2xDh_8_16_R , Normal2xDh_8_32_R },
|
|
{ nullptr, Normal2xDh_15_15_R, Normal2xDh_15_16_R, Normal2xDh_15_32_R},
|
|
{ nullptr, Normal2xDh_16_15_R, Normal2xDh_16_16_R, Normal2xDh_16_32_R},
|
|
{ nullptr, Normal2xDh_32_15_R, Normal2xDh_32_16_R, Normal2xDh_32_32_R},
|
|
{ Normal2xDh_8_8_R, Normal2xDh_9_15_R , Normal2xDh_9_16_R , Normal2xDh_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal2x = {
|
|
"Normal2x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
2,2,{
|
|
{ Normal2x_8_8_L, Normal2x_8_15_L, Normal2x_8_16_L, Normal2x_8_32_L },
|
|
{ nullptr, Normal2x_15_15_L, Normal2x_15_16_L, Normal2x_15_32_L},
|
|
{ nullptr, Normal2x_16_15_L, Normal2x_16_16_L, Normal2x_16_32_L},
|
|
{ nullptr, Normal2x_32_15_L, Normal2x_32_16_L, Normal2x_32_32_L},
|
|
{ Normal2x_8_8_L, Normal2x_9_15_L , Normal2x_9_16_L, Normal2x_9_32_L }
|
|
},{
|
|
{ Normal2x_8_8_R, Normal2x_8_15_R , Normal2x_8_16_R, Normal2x_8_32_R },
|
|
{ nullptr, Normal2x_15_15_R, Normal2x_15_16_R, Normal2x_15_32_R},
|
|
{ nullptr, Normal2x_16_15_R, Normal2x_16_16_R, Normal2x_16_32_R},
|
|
{ nullptr, Normal2x_32_15_R, Normal2x_32_16_R, Normal2x_32_32_R},
|
|
{ Normal2x_8_8_R, Normal2x_9_15_R , Normal2x_9_16_R, Normal2x_9_32_R },
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal3x = {
|
|
"Normal3x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
3,3,{
|
|
{ Normal3x_8_8_L, Normal3x_8_15_L , Normal3x_8_16_L , Normal3x_8_32_L },
|
|
{ nullptr, Normal3x_15_15_L, Normal3x_15_16_L, Normal3x_15_32_L},
|
|
{ nullptr, Normal3x_16_15_L, Normal3x_16_16_L, Normal3x_16_32_L},
|
|
{ nullptr, Normal3x_32_15_L, Normal3x_32_16_L, Normal3x_32_32_L},
|
|
{ Normal3x_8_8_L, Normal3x_9_15_L , Normal3x_9_16_L , Normal3x_9_32_L }
|
|
},{
|
|
{ Normal3x_8_8_R, Normal3x_8_15_R , Normal3x_8_16_R , Normal3x_8_32_R },
|
|
{ nullptr, Normal3x_15_15_R, Normal3x_15_16_R, Normal3x_15_32_R},
|
|
{ nullptr, Normal3x_16_15_R, Normal3x_16_16_R, Normal3x_16_32_R},
|
|
{ nullptr, Normal3x_32_15_R, Normal3x_32_16_R, Normal3x_32_32_R},
|
|
{ Normal3x_8_8_R, Normal3x_9_15_R , Normal3x_9_16_R , Normal3x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal4x = {
|
|
"Normal4x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
4,4,{
|
|
{ Normal4x_8_8_L, Normal4x_8_15_L , Normal4x_8_16_L , Normal4x_8_32_L },
|
|
{ nullptr, Normal4x_15_15_L, Normal4x_15_16_L, Normal4x_15_32_L},
|
|
{ nullptr, Normal4x_16_15_L, Normal4x_16_16_L, Normal4x_16_32_L},
|
|
{ nullptr, Normal4x_32_15_L, Normal4x_32_16_L, Normal4x_32_32_L},
|
|
{ Normal4x_8_8_L, Normal4x_9_15_L , Normal4x_9_16_L , Normal4x_9_32_L }
|
|
},{
|
|
{ Normal4x_8_8_R, Normal4x_8_15_R , Normal4x_8_16_R , Normal4x_8_32_R },
|
|
{ nullptr, Normal4x_15_15_R, Normal4x_15_16_R, Normal4x_15_32_R},
|
|
{ nullptr, Normal4x_16_15_R, Normal4x_16_16_R, Normal4x_16_32_R},
|
|
{ nullptr, Normal4x_32_15_R, Normal4x_32_16_R, Normal4x_32_32_R},
|
|
{ Normal4x_8_8_R, Normal4x_9_15_R , Normal4x_9_16_R , Normal4x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleNormal5x = {
|
|
"Normal5x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
5,5,{
|
|
{ Normal5x_8_8_L, Normal5x_8_15_L , Normal5x_8_16_L , Normal5x_8_32_L },
|
|
{ nullptr, Normal5x_15_15_L, Normal5x_15_16_L, Normal5x_15_32_L},
|
|
{ nullptr, Normal5x_16_15_L, Normal5x_16_16_L, Normal5x_16_32_L},
|
|
{ nullptr, Normal5x_32_15_L, Normal5x_32_16_L, Normal5x_32_32_L},
|
|
{ Normal5x_8_8_L, Normal5x_9_15_L , Normal5x_9_16_L , Normal5x_9_32_L }
|
|
},{
|
|
{ Normal5x_8_8_R, Normal5x_8_15_R , Normal5x_8_16_R , Normal5x_8_32_R },
|
|
{ nullptr, Normal5x_15_15_R, Normal5x_15_16_R, Normal5x_15_32_R},
|
|
{ nullptr, Normal5x_16_15_R, Normal5x_16_16_R, Normal5x_16_32_R},
|
|
{ nullptr, Normal5x_32_15_R, Normal5x_32_16_R, Normal5x_32_32_R},
|
|
{ Normal5x_8_8_R, Normal5x_9_15_R , Normal5x_9_16_R , Normal5x_9_32_R }
|
|
}};
|
|
|
|
/*ScalerSimpleBlock_t ScaleNormal6x = {
|
|
"Normal6x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
6,6,{
|
|
{ Normal6x_8_8_L, Normal6x_8_15_L , Normal6x_8_16_L , Normal6x_8_32_L },
|
|
{ nullptr, Normal6x_15_15_L, Normal6x_15_16_L, Normal6x_15_32_L},
|
|
{ nullptr, Normal6x_16_15_L, Normal6x_16_16_L, Normal6x_16_32_L},
|
|
{ nullptr, Normal6x_32_15_L, Normal6x_32_16_L, Normal6x_32_32_L},
|
|
{ Normal6x_8_8_L, Normal6x_9_15_L , Normal6x_9_16_L , Normal6x_9_32_L }
|
|
},{
|
|
{ Normal6x_8_8_R, Normal6x_8_15_R , Normal6x_8_16_R , Normal6x_8_32_R },
|
|
{ nullptr, Normal6x_15_15_R, Normal6x_15_16_R, Normal6x_15_32_R},
|
|
{ nullptr, Normal6x_16_15_R, Normal6x_16_16_R, Normal6x_16_32_R},
|
|
{ nullptr, Normal6x_32_15_R, Normal6x_32_16_R, Normal6x_32_32_R},
|
|
{ Normal6x_8_8_R, Normal6x_9_15_R , Normal6x_9_16_R , Normal6x_9_32_R }
|
|
}};*/
|
|
|
|
#if RENDER_USE_ADVANCED_SCALERS>0
|
|
ScalerSimpleBlock_t ScaleTV2x = {
|
|
"TV2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,{
|
|
{ nullptr, TV2x_8_15_L , TV2x_8_16_L , TV2x_8_32_L },
|
|
{ nullptr, TV2x_15_15_L, TV2x_15_16_L, TV2x_15_32_L},
|
|
{ nullptr, TV2x_16_15_L, TV2x_16_16_L, TV2x_16_32_L},
|
|
{ nullptr, TV2x_32_15_L, TV2x_32_16_L, TV2x_32_32_L},
|
|
{ nullptr, TV2x_9_15_L , TV2x_9_16_L , TV2x_9_32_L }
|
|
},{
|
|
{ nullptr, TV2x_8_15_R , TV2x_8_16_R , TV2x_8_32_R },
|
|
{ nullptr, TV2x_15_15_R, TV2x_15_16_R, TV2x_15_32_R},
|
|
{ nullptr, TV2x_16_15_R, TV2x_16_16_R, TV2x_16_32_R},
|
|
{ nullptr, TV2x_32_15_R, TV2x_32_16_R, TV2x_32_32_R},
|
|
{ nullptr, TV2x_9_15_R , TV2x_9_16_R , TV2x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleTVDh = {
|
|
"TV2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
1,2,{
|
|
{ nullptr, TVDh_8_15_L , TVDh_8_16_L , TVDh_8_32_L },
|
|
{ nullptr, TVDh_15_15_L, TVDh_15_16_L, TVDh_15_32_L},
|
|
{ nullptr, TVDh_16_15_L, TVDh_16_16_L, TVDh_16_32_L},
|
|
{ nullptr, TVDh_32_15_L, TVDh_32_16_L, TVDh_32_32_L},
|
|
{ nullptr, TVDh_9_15_L , TVDh_9_16_L , TVDh_9_32_L }
|
|
},{
|
|
{ nullptr, TVDh_8_15_R , TVDh_8_16_R , TVDh_8_32_R },
|
|
{ nullptr, TVDh_15_15_R, TVDh_15_16_R, TVDh_15_32_R},
|
|
{ nullptr, TVDh_16_15_R, TVDh_16_16_R, TVDh_16_32_R},
|
|
{ nullptr, TVDh_32_15_R, TVDh_32_16_R, TVDh_32_32_R},
|
|
{ nullptr, TVDh_9_15_R , TVDh_9_16_R , TVDh_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleTV3x = {
|
|
"TV3x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
3,3,{
|
|
{ nullptr, TV3x_8_15_L , TV3x_8_16_L , TV3x_8_32_L },
|
|
{ nullptr, TV3x_15_15_L, TV3x_15_16_L, TV3x_15_32_L},
|
|
{ nullptr, TV3x_16_15_L, TV3x_16_16_L, TV3x_16_32_L},
|
|
{ nullptr, TV3x_32_15_L, TV3x_32_16_L, TV3x_32_32_L},
|
|
{ nullptr, TV3x_9_15_L , TV3x_9_16_L , TV3x_9_32_L }
|
|
},{
|
|
{ nullptr, TV3x_8_15_R , TV3x_8_16_R , TV3x_8_32_R },
|
|
{ nullptr, TV3x_15_15_R, TV3x_15_16_R, TV3x_15_32_R},
|
|
{ nullptr, TV3x_16_15_R, TV3x_16_16_R, TV3x_16_32_R},
|
|
{ nullptr, TV3x_32_15_R, TV3x_32_16_R, TV3x_32_32_R},
|
|
{ nullptr, TV3x_9_15_R , TV3x_9_16_R , TV3x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleScan2x = {
|
|
"Scan2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,{
|
|
{ nullptr, Scan2x_8_15_L , Scan2x_8_16_L , Scan2x_8_32_L },
|
|
{ nullptr, Scan2x_15_15_L, Scan2x_15_16_L, Scan2x_15_32_L},
|
|
{ nullptr, Scan2x_16_15_L, Scan2x_16_16_L, Scan2x_16_32_L},
|
|
{ nullptr, Scan2x_32_15_L, Scan2x_32_16_L, Scan2x_32_32_L},
|
|
{ nullptr, Scan2x_9_15_L , Scan2x_9_16_L , Scan2x_9_32_L }
|
|
},{
|
|
{ nullptr, Scan2x_8_15_R , Scan2x_8_16_R , Scan2x_8_32_R },
|
|
{ nullptr, Scan2x_15_15_R, Scan2x_15_16_R, Scan2x_15_32_R},
|
|
{ nullptr, Scan2x_16_15_R, Scan2x_16_16_R, Scan2x_16_32_R},
|
|
{ nullptr, Scan2x_32_15_R, Scan2x_32_16_R, Scan2x_32_32_R},
|
|
{ nullptr, Scan2x_9_15_R , Scan2x_9_16_R , Scan2x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleScanDh = {
|
|
"Scan2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
1,2,{
|
|
{ nullptr, ScanDh_8_15_L , ScanDh_8_16_L , ScanDh_8_32_L },
|
|
{ nullptr, ScanDh_15_15_L, ScanDh_15_16_L, ScanDh_15_32_L},
|
|
{ nullptr, ScanDh_16_15_L, ScanDh_16_16_L, ScanDh_16_32_L},
|
|
{ nullptr, ScanDh_32_15_L, ScanDh_32_16_L, ScanDh_32_32_L},
|
|
{ nullptr, ScanDh_9_15_L , ScanDh_9_16_L , ScanDh_9_32_L }
|
|
},{
|
|
{ nullptr, ScanDh_8_15_R , ScanDh_8_16_R , ScanDh_8_32_R },
|
|
{ nullptr, ScanDh_15_15_R, ScanDh_15_16_R, ScanDh_15_32_R},
|
|
{ nullptr, ScanDh_16_15_R, ScanDh_16_16_R, ScanDh_16_32_R},
|
|
{ nullptr, ScanDh_32_15_R, ScanDh_32_16_R, ScanDh_32_32_R},
|
|
{ nullptr, ScanDh_9_15_R , ScanDh_9_16_R , ScanDh_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleScan3x = {
|
|
"Scan3x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
3,3,{
|
|
{ nullptr, Scan3x_8_15_L , Scan3x_8_16_L , Scan3x_8_32_L },
|
|
{ nullptr, Scan3x_15_15_L, Scan3x_15_16_L, Scan3x_15_32_L},
|
|
{ nullptr, Scan3x_16_15_L, Scan3x_16_16_L, Scan3x_16_32_L},
|
|
{ nullptr, Scan3x_32_15_L, Scan3x_32_16_L, Scan3x_32_32_L},
|
|
{ nullptr, Scan3x_9_15_L , Scan3x_9_16_L , Scan3x_9_32_L },
|
|
},{
|
|
{ nullptr, Scan3x_8_15_R , Scan3x_8_16_R , Scan3x_8_32_R },
|
|
{ nullptr, Scan3x_15_15_R, Scan3x_15_16_R, Scan3x_15_32_R},
|
|
{ nullptr, Scan3x_16_15_R, Scan3x_16_16_R, Scan3x_16_32_R},
|
|
{ nullptr, Scan3x_32_15_R, Scan3x_32_16_R, Scan3x_32_32_R},
|
|
{ nullptr, Scan3x_9_15_R , Scan3x_9_16_R , Scan3x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleRGB2x = {
|
|
"RGB2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,{
|
|
{ nullptr, RGB2x_8_15_L , RGB2x_8_16_L , RGB2x_8_32_L },
|
|
{ nullptr, RGB2x_15_15_L, RGB2x_15_16_L, RGB2x_15_32_L},
|
|
{ nullptr, RGB2x_16_15_L, RGB2x_16_16_L, RGB2x_16_32_L},
|
|
{ nullptr, RGB2x_32_15_L, RGB2x_32_16_L, RGB2x_32_32_L},
|
|
{ nullptr, RGB2x_9_15_L , RGB2x_9_16_L , RGB2x_9_32_L }
|
|
},{
|
|
{ nullptr, RGB2x_8_15_R , RGB2x_8_16_R , RGB2x_8_32_R },
|
|
{ nullptr, RGB2x_15_15_R, RGB2x_15_16_R, RGB2x_15_32_R},
|
|
{ nullptr, RGB2x_16_15_R, RGB2x_16_16_R, RGB2x_16_32_R},
|
|
{ nullptr, RGB2x_32_15_R, RGB2x_32_16_R, RGB2x_32_32_R},
|
|
{ nullptr, RGB2x_9_15_R , RGB2x_9_16_R , RGB2x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleRGB3x = {
|
|
"RGB3x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
3,3,{
|
|
{ nullptr, RGB3x_8_15_L , RGB3x_8_16_L , RGB3x_8_32_L },
|
|
{ nullptr, RGB3x_15_15_L, RGB3x_15_16_L, RGB3x_15_32_L},
|
|
{ nullptr, RGB3x_16_15_L, RGB3x_16_16_L, RGB3x_16_32_L},
|
|
{ nullptr, RGB3x_32_15_L, RGB3x_32_16_L, RGB3x_32_32_L},
|
|
{ nullptr, RGB3x_9_15_L , RGB3x_9_16_L , RGB3x_9_32_L }
|
|
},{
|
|
{ nullptr, RGB3x_8_15_R , RGB3x_8_16_R , RGB3x_8_32_R },
|
|
{ nullptr, RGB3x_15_15_R, RGB3x_15_16_R, RGB3x_15_32_R},
|
|
{ nullptr, RGB3x_16_15_R, RGB3x_16_16_R, RGB3x_16_32_R},
|
|
{ nullptr, RGB3x_32_15_R, RGB3x_32_16_R, RGB3x_32_32_R},
|
|
{ nullptr, RGB3x_9_15_R , RGB3x_9_16_R , RGB3x_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleGrayNormal = {
|
|
"Gray2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
1,1,{
|
|
{ nullptr, GrayNormal_8_15_L , GrayNormal_8_16_L , GrayNormal_8_32_L },
|
|
{ nullptr, GrayNormal_15_15_L, GrayNormal_15_16_L, GrayNormal_15_32_L},
|
|
{ nullptr, GrayNormal_16_15_L, GrayNormal_16_16_L, GrayNormal_16_32_L},
|
|
{ nullptr, GrayNormal_32_15_L, GrayNormal_32_16_L, GrayNormal_32_32_L},
|
|
{ nullptr, GrayNormal_9_15_L , GrayNormal_9_16_L , GrayNormal_9_32_L }
|
|
},{
|
|
{ nullptr, GrayNormal_8_15_R , GrayNormal_8_16_R , GrayNormal_8_32_R },
|
|
{ nullptr, GrayNormal_15_15_R, GrayNormal_15_16_R, GrayNormal_15_32_R},
|
|
{ nullptr, GrayNormal_16_15_R, GrayNormal_16_16_R, GrayNormal_16_32_R},
|
|
{ nullptr, GrayNormal_32_15_R, GrayNormal_32_16_R, GrayNormal_32_32_R},
|
|
{ nullptr, GrayNormal_9_15_R , GrayNormal_9_16_R , GrayNormal_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleGrayDw = {
|
|
"Gray2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,1,{
|
|
{ nullptr, GrayDw_8_15_L , GrayDw_8_16_L , GrayDw_8_32_L },
|
|
{ nullptr, GrayDw_15_15_L, GrayDw_15_16_L, GrayDw_15_32_L},
|
|
{ nullptr, GrayDw_16_15_L, GrayDw_16_16_L, GrayDw_16_32_L},
|
|
{ nullptr, GrayDw_32_15_L, GrayDw_32_16_L, GrayDw_32_32_L},
|
|
{ nullptr, GrayDw_9_15_L , GrayDw_9_16_L , GrayDw_9_32_L }
|
|
},{
|
|
{ nullptr, GrayDw_8_15_R , GrayDw_8_16_R , GrayDw_8_32_R },
|
|
{ nullptr, GrayDw_15_15_R, GrayDw_15_16_R, GrayDw_15_32_R},
|
|
{ nullptr, GrayDw_16_15_R, GrayDw_16_16_R, GrayDw_16_32_R},
|
|
{ nullptr, GrayDw_32_15_R, GrayDw_32_16_R, GrayDw_32_32_R},
|
|
{ nullptr, GrayDw_9_15_R , GrayDw_9_16_R , GrayDw_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleGrayDh = {
|
|
"Gray2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
1,2,{
|
|
{ nullptr, GrayDh_8_15_L , GrayDh_8_16_L , GrayDh_8_32_L },
|
|
{ nullptr, GrayDh_15_15_L, GrayDh_15_16_L, GrayDh_15_32_L},
|
|
{ nullptr, GrayDh_16_15_L, GrayDh_16_16_L, GrayDh_16_32_L},
|
|
{ nullptr, GrayDh_32_15_L, GrayDh_32_16_L, GrayDh_32_32_L},
|
|
{ nullptr, GrayDh_9_15_L , GrayDh_9_16_L , GrayDh_9_32_L }
|
|
},{
|
|
{ nullptr, GrayDh_8_15_R , GrayDh_8_16_R , GrayDh_8_32_R },
|
|
{ nullptr, GrayDh_15_15_R, GrayDh_15_16_R, GrayDh_15_32_R},
|
|
{ nullptr, GrayDh_16_15_R, GrayDh_16_16_R, GrayDh_16_32_R},
|
|
{ nullptr, GrayDh_32_15_R, GrayDh_32_16_R, GrayDh_32_32_R},
|
|
{ nullptr, GrayDh_9_15_R , GrayDh_9_16_R , GrayDh_9_32_R }
|
|
}};
|
|
|
|
ScalerSimpleBlock_t ScaleGray2x = {
|
|
"Gray2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,{
|
|
{ nullptr, Gray2x_8_15_L , Gray2x_8_16_L , Gray2x_8_32_L },
|
|
{ nullptr, Gray2x_15_15_L, Gray2x_15_16_L, Gray2x_15_32_L},
|
|
{ nullptr, Gray2x_16_15_L, Gray2x_16_16_L, Gray2x_16_32_L},
|
|
{ nullptr, Gray2x_32_15_L, Gray2x_32_16_L, Gray2x_32_32_L},
|
|
{ nullptr, Gray2x_9_15_L , Gray2x_9_16_L , Gray2x_9_32_L }
|
|
},{
|
|
{ nullptr, Gray2x_8_15_R , Gray2x_8_16_R , Gray2x_8_32_R },
|
|
{ nullptr, Gray2x_15_15_R, Gray2x_15_16_R, Gray2x_15_32_R},
|
|
{ nullptr, Gray2x_16_15_R, Gray2x_16_16_R, Gray2x_16_32_R},
|
|
{ nullptr, Gray2x_32_15_R, Gray2x_32_16_R, Gray2x_32_32_R},
|
|
{ nullptr, Gray2x_9_15_R , Gray2x_9_16_R , Gray2x_9_32_R }
|
|
}};
|
|
#endif
|
|
|
|
|
|
/* Complex scalers */
|
|
|
|
#if RENDER_USE_ADVANCED_SCALERS>2
|
|
ScalerComplexBlock_t ScaleAdvMame2x ={
|
|
"AdvMame2x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
2,2,
|
|
{ AdvMame2x_8_L,AdvMame2x_16_L,AdvMame2x_16_L,AdvMame2x_32_L},
|
|
{ AdvMame2x_8_R,AdvMame2x_16_R,AdvMame2x_16_R,AdvMame2x_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleAdvMame3x = {
|
|
"AdvMame3x",
|
|
GFX_CAN_8|GFX_CAN_15|GFX_CAN_16|GFX_CAN_32,
|
|
3,3,
|
|
{ AdvMame3x_8_L,AdvMame3x_16_L,AdvMame3x_16_L,AdvMame3x_32_L},
|
|
{ AdvMame3x_8_R,AdvMame3x_16_R,AdvMame3x_16_R,AdvMame3x_32_R}
|
|
};
|
|
|
|
/* These need specific 15bpp versions */
|
|
ScalerComplexBlock_t ScaleHQ2x ={
|
|
"HQ2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,
|
|
{ nullptr,HQ2x_16_L,HQ2x_16_L,HQ2x_32_L},
|
|
{ nullptr,HQ2x_16_R,HQ2x_16_R,HQ2x_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleHQ3x ={
|
|
"HQ3x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
3,3,
|
|
{ nullptr,HQ3x_16_L,HQ3x_16_L,HQ3x_32_L},
|
|
{ nullptr,HQ3x_16_R,HQ3x_16_R,HQ3x_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleSuper2xSaI ={
|
|
"Super2xSaI",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,
|
|
{ nullptr,Super2xSaI_16_L,Super2xSaI_16_L,Super2xSaI_32_L},
|
|
{ nullptr,Super2xSaI_16_R,Super2xSaI_16_R,Super2xSaI_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t Scale2xSaI ={
|
|
"2xSaI",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,
|
|
{ nullptr,_2xSaI_16_L,_2xSaI_16_L,_2xSaI_32_L},
|
|
{ nullptr,_2xSaI_16_R,_2xSaI_16_R,_2xSaI_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleSuperEagle ={
|
|
"SuperEagle",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,
|
|
{ nullptr,SuperEagle_16_L,SuperEagle_16_L,SuperEagle_32_L},
|
|
{ nullptr,SuperEagle_16_R,SuperEagle_16_R,SuperEagle_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleAdvInterp2x = {
|
|
"AdvInterp2x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
2,2,
|
|
{ nullptr,AdvInterp2x_15_L,AdvInterp2x_16_L,AdvInterp2x_32_L},
|
|
{ nullptr,AdvInterp2x_15_R,AdvInterp2x_16_R,AdvInterp2x_32_R}
|
|
};
|
|
|
|
ScalerComplexBlock_t ScaleAdvInterp3x = {
|
|
"AdvInterp3x",
|
|
GFX_CAN_15|GFX_CAN_16|GFX_CAN_32|GFX_RGBONLY,
|
|
3,3,
|
|
{ nullptr,AdvInterp3x_15_L,AdvInterp3x_16_L,AdvInterp3x_32_L},
|
|
{ nullptr,AdvInterp3x_15_R,AdvInterp3x_16_R,AdvInterp3x_32_R}
|
|
};
|
|
|
|
#endif
|