Builds now, but hq3x is still not fully implemented.

This commit is contained in:
theoddone33
2003-07-18 04:31:57 +00:00
parent 1be7460614
commit addb385cc8
3 changed files with 17 additions and 7 deletions

View File

@@ -26,7 +26,7 @@ ZIPDIR=zip
CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\ CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\
${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\ ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o $CHIPDIR}/dsp1emu.o ${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1emu.o
CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\ CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\
${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o \ ${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o \
@@ -42,7 +42,7 @@ VIDEOBJ=${VIDEODIR}/makev16b.o ${VIDEODIR}/makev16t.o ${VIDEODIR}/makevid.o\
${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\ ${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\
${VIDEODIR}/m716text.o ${VIDEODIR}/2xsaiw.o\ ${VIDEODIR}/m716text.o ${VIDEODIR}/2xsaiw.o\
${VIDEODIR}/procvid.o ${VIDEODIR}/sw_draw.o\ ${VIDEODIR}/procvid.o ${VIDEODIR}/sw_draw.o\
$${VIDEODIR}/hq3x16.o ${VIDEODIR}/hq3x32.o ${VIDEODIR}/hq3x16.o ${VIDEODIR}/hq3x32.o
WINOBJ=${WINDIR}/copyvwin.o \ WINOBJ=${WINDIR}/copyvwin.o \
${WINDIR}/sdlintrf.o ${WINDIR}/sdllink.o \ ${WINDIR}/sdlintrf.o ${WINDIR}/sdllink.o \

View File

@@ -935,6 +935,9 @@ NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1 ; binlinear = 1, nea
NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering (Win) NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering (Win)
NEWSYM GUIMBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 NEWSYM GUIMBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
NEWSYM GUIHQ3X, db 0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0 ; hq3x filter
SECTION .text SECTION .text
; **************************** ; ****************************

View File

@@ -63,8 +63,15 @@ static const int BitDepth = 16;
DWORD FirstVid = 1; DWORD FirstVid = 1;
extern void SwitchFullScreen (void); extern void SwitchFullScreen (void);
extern BYTE GUIWFVID[];
extern unsigned char cvidmode; extern unsigned char cvidmode;
DWORD SMode=0;
DWORD DSMode=0;
DWORD prevHQ3XMode=-1;
extern BYTE GUIWFVID[];
extern BYTE GUISMODE[];
extern BYTE GUIDSMODE[];
extern BYTE GUIHQ3X[];
/* JOYSTICK AND KEYBOARD INPUT */ /* JOYSTICK AND KEYBOARD INPUT */
SDL_Joystick *JoystickInput[5]; SDL_Joystick *JoystickInput[5];
@@ -123,10 +130,10 @@ extern int Game60hzcall(void);
extern void SoundProcess(); extern void SoundProcess();
void *blur_temp=0; void *blur_temp=0;
void *blur_buffer=0; void *blur_buffer=0;
_int64 copymaskRB = 0x001FF800001FF800; _int64 copymaskRB = 0x001FF800001FF800LL;
_int64 copymaskG = 0x0000FC000000FC00; _int64 copymaskG = 0x0000FC000000FC00LL;
_int64 copymagic = 0x0008010000080100; _int64 copymagic = 0x0008010000080100LL;
_int64 coef = 0x0066009a0066009a; _int64 coef = 0x0066009a0066009aLL;
#ifdef __OPENGL__ #ifdef __OPENGL__
extern void gl_clearwin(void); extern void gl_clearwin(void);
#endif #endif