From addb385cc80f54d0c9f99cd5a9890b86704c8044 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Fri, 18 Jul 2003 04:31:57 +0000
Subject: [PATCH] Builds now, but hq3x is still not fully implemented.

---
 zsnes/src/Makefile.in        |  4 ++--
 zsnes/src/linux/sdlintrf.asm |  3 +++
 zsnes/src/linux/sdllink.c    | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index 6f1edd22..0497e0ae 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -26,7 +26,7 @@ ZIPDIR=zip
 
 CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.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\
 	${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}/m716text.o ${VIDEODIR}/2xsaiw.o\
 	${VIDEODIR}/procvid.o ${VIDEODIR}/sw_draw.o\
-        $${VIDEODIR}/hq3x16.o ${VIDEODIR}/hq3x32.o
+        ${VIDEODIR}/hq3x16.o ${VIDEODIR}/hq3x32.o
 
 WINOBJ=${WINDIR}/copyvwin.o \
 	${WINDIR}/sdlintrf.o ${WINDIR}/sdllink.o \
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index b8220bc6..9c226498 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -934,6 +934,9 @@ NEWSYM GUIRATIO, db 0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0
 NEWSYM GUIBIFIL, db 0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1       ; binlinear = 1, nearest = 0
 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 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
 
diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index f8c8fc88..d6a674d8 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -63,8 +63,15 @@ static const int BitDepth = 16;
 DWORD FirstVid = 1;
 
 extern void SwitchFullScreen (void);
-extern BYTE GUIWFVID[];
 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 */
 SDL_Joystick *JoystickInput[5];
@@ -123,10 +130,10 @@ extern int Game60hzcall(void);
 extern void SoundProcess();
 void *blur_temp=0;
 void *blur_buffer=0;
-_int64 copymaskRB = 0x001FF800001FF800;
-_int64 copymaskG = 0x0000FC000000FC00;
-_int64 copymagic = 0x0008010000080100;
-_int64 coef = 0x0066009a0066009a;
+_int64 copymaskRB = 0x001FF800001FF800LL;
+_int64 copymaskG = 0x0000FC000000FC00LL;
+_int64 copymagic = 0x0008010000080100LL;
+_int64 coef = 0x0066009a0066009aLL;
 #ifdef __OPENGL__
 extern void gl_clearwin(void);
 #endif