ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL/WX: Fix build with asm scalers enabled. 

If Win32 has issues with OpenGL those should not be hacked around in common code.


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1034 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2011-12-03 13:47:20 +00:00
parent 45e20fa544
commit aedfa7a18b
3 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -277,7 +277,6 @@ SET(SRC_APU
SET(SRC_SDL
src/sdl/debugger.cpp
src/sdl/SDL.cpp
# src/sdl/dummy.cpp
src/sdl/filters.cpp
src/sdl/text.cpp
src/sdl/inputSDL.cpp

35
src/filters/hq/asm/hq3x32.cpp
View File

@ -35,7 +35,6 @@ void InitLUTs(void)
}
int hq3xinited=0;
extern int realsystemRedShift, realsystemBlueShift;
//16 bit input, see below for 32 bit input
void hq3x32(unsigned char * pIn, unsigned int srcPitch,
@ -49,23 +48,6 @@ void hq3x32(unsigned char * pIn, unsigned int srcPitch,
hq3xinited=1;
}
hq3x_32( pIn, pOut, Xres, Yres, dstPitch, srcPitch - (Xres *2) );
if (realsystemRedShift == 3)
{ // damn you opengl...
int offset = (dstPitch - (Xres *12)) / 4;
unsigned int *p = (unsigned int *)pOut;
Yres *= 3;
while(Yres--)
{
for(int i=0;i<Xres*3;i++)
{
*p = (*p & 0xFF0000) >> 16 |
(*p & 0x0000FF) << 16 |
(*p & 0x00FF00);
p++;
}
p += offset;
}
}
}
void hq3x16(unsigned char * pIn, unsigned int srcPitch,
@ -107,23 +89,6 @@ void hq4x32(unsigned char * pIn, unsigned int srcPitch,
hq3xinited=1;
}
hq4x_32( pIn, pOut, Xres, Yres, dstPitch, srcPitch - (Xres *2));
if (realsystemRedShift == 3)
{ // damn you opengl...
int offset = (dstPitch - (Xres *16)) / 4;
unsigned int *p = (unsigned int *)pOut;
Yres *= 4;
while(Yres--)
{
for(int i=0;i<Xres*4;i++)
{
*p = (*p & 0xFF0000) >> 16 |
(*p & 0x0000FF) << 16 |
(*p & 0x00FF00);
p++;
}
p += offset;
}
}
}
static inline void convert32bpp_16bpp(unsigned char *pIn, unsigned int width)

46
src/sdl/dummy.cpp
View File

@ -1,46 +0,0 @@
#include <stdio.h>
//I hate hacks
int realsystemRedShift = 0;
bool linkenable = false;
int lspeed = 0;
void LinkSStop()
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}
void StartLink(unsigned short)
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}
void LinkSSend(unsigned short)
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}
void StartGPLink(unsigned short)
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}
void StartJOYLink(unsigned short)
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}
void LinkUpdate(int)
{
const char *f = __func__;
printf("Stub Function: %s\n", f);
}