libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing up my previous commit: finished moving common/scaler* to graphics

Browse Source 
svn-id: r20798
This commit is contained in:
Max Horn 2006-02-20 20:40:12 +00:00
parent 7335d348ba
commit e49e7ebb3f
10 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/thumbnail.cpp
View File

@ -24,7 +24,7 @@
#include "common/stdafx.h"
#include "common/system.h"
#include "common/savefile.h"
#include "common/scaler.h"
#include "graphics/scaler.h"
#include "scumm/scumm.h"
namespace Scumm {

2
graphics/scaler/2xsai.cpp
View File

@ -21,7 +21,7 @@
*
*/
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"

4
graphics/scaler/aspect.cpp
View File

@ -21,8 +21,8 @@
*
*/
#include "common/scaler/intern.h"
#include "common/scaler.h"
#include "graphics/scaler/intern.h"
#include "graphics/scaler.h"
#define kVeryFastAndUglyAspectMode 0 // No interpolation at all, but super-fast

10
graphics/scaler/hq2x.cpp
View File

@ -21,7 +21,7 @@
*
*/
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"
#ifdef USE_NASM
// Assembly version of HQ2x
@ -128,13 +128,13 @@ static bool isAltiVecAvailable() {
#define bitFormat 565
void HQ2x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq2x.h"
#include "graphics/scaler/hq2x.h"
}
#undef bitFormat
#define bitFormat 555
void HQ2x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq2x.h"
#include "graphics/scaler/hq2x.h"
}
#undef bitFormat
@ -144,13 +144,13 @@ void HQ2x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
#define bitFormat 565
void HQ2x_565_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq2x.h"
#include "graphics/scaler/hq2x.h"
}
#undef bitFormat
#define bitFormat 555
void HQ2x_555_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq2x.h"
#include "graphics/scaler/hq2x.h"
}
#undef bitFormat
#endif

10
graphics/scaler/hq3x.cpp
View File

@ -21,7 +21,7 @@
*
*/
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"
#ifdef USE_NASM
// Assembly version of HQ3x
@ -129,13 +129,13 @@ static bool isAltiVecAvailable() {
#define bitFormat 565
void HQ3x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq3x.h"
#include "graphics/scaler/hq3x.h"
}
#undef bitFormat
#define bitFormat 555
void HQ3x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq3x.h"
#include "graphics/scaler/hq3x.h"
}
#undef bitFormat
@ -145,13 +145,13 @@ void HQ3x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
#define bitFormat 565
void HQ3x_565_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq3x.h"
#include "graphics/scaler/hq3x.h"
}
#undef bitFormat
#define bitFormat 555
void HQ3x_555_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
#include "common/scaler/hq3x.h"
#include "graphics/scaler/hq3x.h"
}
#undef bitFormat
#endif

2
graphics/scaler/scale2x.cpp
View File

@ -36,7 +36,7 @@
#include <config.h>
#endif
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"
#include "scale2x.h"

2
graphics/scaler/scale3x.cpp
View File

@ -36,7 +36,7 @@
#include <config.h>
#endif
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"
#include "scale3x.h"

2
graphics/scaler/scalebit.cpp
View File

@ -37,7 +37,7 @@
#include <config.h>
#endif
#include "common/scaler/intern.h"
#include "graphics/scaler/intern.h"
#include "scale2x.h"
#include "scale3x.h"

5
graphics/scaler/thumbnail.cpp
View File

@ -25,7 +25,8 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "common/scaler/intern.h"
#include "graphics/scaler.h"
#include "graphics/scaler/intern.h"
template<int bitFormat>
uint16 quadBlockInterpolate(const uint8* src, uint32 srcPitch) {
@ -69,8 +70,6 @@ void createThumbnail_4(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32
}
}
#include "common/scaler.h"
void createThumbnail(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 dstPitch, int width, int height) {
// only 1/2 and 1/4 downscale supported
if (width != 320 && width != 640)

2
gui/options.cpp
View File

@ -29,7 +29,7 @@
#include "backends/fs/fs.h"
#include "common/config-manager.h"
#include "common/scaler.h"
#include "graphics/scaler.h"
#include "common/system.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"