Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

60 files changed, 18770 insertions, 18836 deletions

diff --git a/plugins/bladesio1/settings.c b/plugins/bladesio1/settings.c
index b560bf2b..f7628440 100644
--- a/plugins/bladesio1/settings.c
+++ b/plugins/bladesio1/settings.c
@@ -38,7 +38,8 @@ void settingsRead()
     file = fopen( configName, "rb" );
     if( file )
     {
-        fread( &settings, 1, sizeof(settings), file );
+        if(fread( &settings, sizeof(settings), 1, file ) != 1)
+		    perror(configName);
         fclose( file );
     }
     else
@@ -56,7 +57,8 @@ void settingsWrite()
 	file = fopen( configName, "wb" );
 	if( file )
     {
-        fwrite( &settings, 1, sizeof(settings), file );
+        if(fwrite( &settings, sizeof(settings), 1, file ) != 1)
+		    perror(configName);
         fclose( file );
     }
 }
diff --git a/plugins/bladesio1/sio1.h b/plugins/bladesio1/sio1.h
index 973adb28..727e48ea 100644
--- a/plugins/bladesio1/sio1.h
+++ b/plugins/bladesio1/sio1.h
@@ -24,17 +24,7 @@
 
 /******************************************************************************/
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define  _(x) gettext(x)
-#define N_(x) (x)
-#else
-#define  _(x) (x)
-#define N_(x) (x)
-#endif
-
-#define CALLBACK
+#include "psemu_plugin_defs.h"
 
 extern Settings settings;
 
diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c
index 9399f501..cf0a539c 100644
--- a/plugins/dfcdrom/cdr.c
+++ b/plugins/dfcdrom/cdr.c
@@ -468,7 +468,7 @@ long CDRgetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned
 
 #ifndef _MACOSX
 
-void ExecCfg(char *arg) {
+static void ExecCfg(char *arg) {
 	char cfg[256];
 	struct stat buf;
 
diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index 88291dca..928683d3 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -26,16 +26,6 @@
 
 #include "config.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -151,24 +141,6 @@ typedef struct _MMC_READ_CD {
 #define itob(i)		((i)/10*16 + (i)%10)	/* u_char to BCD */
 #define btoi(b)		((b)/16*10 + (b)%16)	/* BCD to u_char */
 
-struct CdrStat {
-	unsigned long Type;
-	unsigned long Status;
-	unsigned char Time[3];		// current playing time
-};
-
-struct SubQ {
-	char res0[12];
-	unsigned char ControlAndADR;
-	unsigned char TrackNumber;
-	unsigned char IndexNumber;
-	unsigned char TrackRelativeAddress[3];
-	unsigned char Filler;
-	unsigned char AbsoluteAddress[3];
-	unsigned char CRC[2];
-	char res1[72];
-};
-
 typedef union {
 	struct cdrom_msf msf;
 	unsigned char buf[CD_FRAMESIZE_RAW];
@@ -210,6 +182,7 @@ long GetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned cha
 long ReadSector(crdata *cr);
 long PlayCDDA(unsigned char *sector);
 long StopCDDA();
+#include "psemu_plugin_defs.h"
 long GetStatus(int playing, struct CdrStat *stat);
 unsigned char *ReadSub(const unsigned char *time);
 
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 3d3b89b7..454a4e2d 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -27,7 +27,7 @@
 GtkWidget *MainWindow;
 
 // function to check if the device is a cdrom
-int is_cdrom(const char *device) {
+static int is_cdrom(const char *device) {
 	struct stat st;
 	int fd = -1;
 
@@ -78,7 +78,7 @@ int is_cdrom(const char *device) {
 // Are there any other common entry to add to the list? (especially scsi, I
 // deliberately ignored old non standard cdroms... )
 // If you come up with a better method let me know!!
-void fill_drives_list(GtkWidget *widget) {
+static void fill_drives_list(GtkWidget *widget) {
 	int i;
 	GtkListStore *store;
 	GtkTreeIter iter;
diff --git a/plugins/dfcdrom/cfg.c b/plugins/dfcdrom/cfg.c
index 2bbc8447..6985eda6 100644
--- a/plugins/dfcdrom/cfg.c
+++ b/plugins/dfcdrom/cfg.c
@@ -67,12 +67,14 @@ void LoadConf() {
 	f = fopen("dfcdrom.cfg", "r");
 	if (f == NULL) return;
 
-	fscanf(f, "CdromDev = %s\n", CdromDev);
-	fscanf(f, "ReadMode = %ld\n", &ReadMode);
-	fscanf(f, "UseSubQ = %ld\n", &UseSubQ);
-	fscanf(f, "CacheSize = %ld\n", &CacheSize);
-	fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed);
-	fscanf(f, "SpinDown = %ld\n", &SpinDown);
+	if(fscanf(f, "CdromDev = %s\n", CdromDev) != 1 ||
+	   fscanf(f, "ReadMode = %ld\n", &ReadMode) != 1 ||
+	   fscanf(f, "UseSubQ = %ld\n", &UseSubQ) != 1 ||
+	   fscanf(f, "CacheSize = %ld\n", &CacheSize) != 1 ||
+	   fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed) != 1 ||
+	   fscanf(f, "SpinDown = %ld\n", &SpinDown) != 1) {
+	  perror("syntax error in dfcdrom.cfg");
+	}
 	fclose(f);
 
 	if (ReadMode >= READ_MODES) ReadMode = THREADED;
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index ddfa3554..f56ed5ac 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -194,7 +194,7 @@ static void UpdateKeyList() {
 			total = DKEY_TOTAL - 3;
 		}
 
-		widget = gtk_builder_get_object(xml, widgetname[i]);
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname[i]));
 
 		store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -232,7 +232,7 @@ static void UpdateKey() {
 		index = GetSelectedKeyIndex(i);
 		if (index == -1) continue;
 
-		widget = gtk_builder_get_object(xml, widgetname[i]);
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname[i]));
 		gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter);
 
 		if (index < DKEY_TOTAL) {
@@ -273,7 +273,7 @@ static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data
 
 		// If a row was selected, and the row is not blank, we can now enable
 		// some of the disabled widgets
-		if ((int)user_data == 0) {
+		if ((int)(long)user_data == 0) {
 			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange1")), TRUE);
 			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset1")), TRUE);
 		} else {
@@ -281,7 +281,7 @@ static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data
 			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset2")), TRUE);
 		}
 	} else {
-		if ((int)user_data == 0) {
+		if ((int)(long)user_data == 0) {
 			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnchange1")), FALSE);
 			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, "btnreset1")), FALSE);
 		} else {
@@ -292,13 +292,13 @@ static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data
 }
 
 static void OnDeviceChanged(GtkWidget *widget, gpointer user_data) {
-	int n = (int)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
+	int n = (int)(long)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 	current--;
 	g.cfg.PadDef[n].DevNum = current;
 }
 
 static void OnTypeChanged(GtkWidget *widget, gpointer user_data) {
-	int n = (int)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
+	int n = (int)(long)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 	g.cfg.PadDef[n].Type = (current == 0 ? PSE_PAD_TYPE_STANDARD : PSE_PAD_TYPE_ANALOGPAD);
 
 	UpdateKeyList();
@@ -487,7 +487,7 @@ end:
 }
 
 static void OnChangeClicked(GtkWidget *widget, gpointer user_data) {
-	int pad = (int)user_data;
+	int pad = (int)(long)user_data;
 	int index = GetSelectedKeyIndex(pad);
 
 	if (index == -1) return;
@@ -503,7 +503,7 @@ static void OnChangeClicked(GtkWidget *widget, gpointer user_data) {
 }
 
 static void OnResetClicked(GtkWidget *widget, gpointer user_data) {
-	int pad = (int)user_data;
+	int pad = (int)(long)user_data;
 	int index = GetSelectedKeyIndex(pad);
 
 	if (index == -1) return;
@@ -532,7 +532,7 @@ static void PopulateDevList() {
 	char buf[256];
 
 	for (i = 0; i < 2; i++) {
-		widget = gtk_builder_get_object(xml, widgetname[i]);
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname[i]));
 
 		renderer = gtk_cell_renderer_text_new();
 		gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, FALSE);
@@ -582,10 +582,10 @@ long PADconfigure() {
 		return -1;
 	}
 
-	MainWindow = gtk_builder_get_object(xml, "CfgWnd");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(xml, "CfgWnd"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Gamepad/Keyboard Input Configuration"));
 
-	widget = gtk_builder_get_object(xml, "treeview1");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "treeview1"));
 
 	// column for key
 	renderer = gtk_cell_renderer_text_new();
@@ -605,7 +605,7 @@ long PADconfigure() {
 	g_signal_connect_data(G_OBJECT(treesel), "changed",
 		G_CALLBACK(TreeSelectionChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "treeview2");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "treeview2"));
 
 	// column for key
 	renderer = gtk_cell_renderer_text_new();
@@ -625,58 +625,58 @@ long PADconfigure() {
 	g_signal_connect_data(G_OBJECT(treesel), "changed",
 		G_CALLBACK(TreeSelectionChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "CfgWnd");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "CfgWnd"));
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "btnclose");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnclose"));
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	PopulateDevList();
 	UpdateKeyList();
 
-	widget = gtk_builder_get_object(xml, "checkmt");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkmt"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);
 	g_signal_connect_data(GTK_OBJECT(widget), "toggled",
 		G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "combodev1");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combodev1"));
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
 		G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "combodev2");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combodev2"));
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
 		G_CALLBACK(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "combotype1");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combotype1"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[0].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
 		G_CALLBACK(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "combotype2");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combotype2"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[1].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
 		G_CALLBACK(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "btnchange1");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnchange1"));
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "btnreset1");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnreset1"));
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "btnchange2");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnchange2"));
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(xml, "btnreset2");
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnreset2"));
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index e3029340..c6089f12 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -24,15 +24,15 @@ char *PSEgetLibName(void) {
 	return _("Gamepad/Keyboard Input");
 }
 
-uint32_t PSEgetLibType(void) {
+unsigned long CALLBACK PSEgetLibType(void) {
 	return PSE_LT_PAD;
 }
 
-uint32_t PSEgetLibVersion(void) {
+unsigned long CALLBACK PSEgetLibVersion(void) {
 	return (1 << 16) | (1 << 8);
 }
 
-void PADsetMode(const int pad, const int mode) {
+static void PADsetMode(const int pad, const int mode) {
 	g.PadState[pad].PadMode = mode;
 	g.PadState[pad].PadID = mode ? 0x73 : 0x41;
 
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index 0fbabbcd..ae30c391 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -50,16 +50,6 @@ typedef void *Display;
 
 #include "psemu_plugin_defs.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 enum {
 	DKEY_SELECT = 0,
 	DKEY_L3,
@@ -173,23 +163,7 @@ void CheckAnalog();
 int AnalogKeyPressed(uint16_t Key);
 int AnalogKeyReleased(uint16_t Key);
 
-// pad.c functions...
-char *PSEgetLibName(void);
-uint32_t PSEgetLibType(void);
-uint32_t PSEgetLibVersion(void);
-long PADinit(long flags);
-long PADshutdown(void);
-long PADopen(unsigned long *Disp);
-long PADclose(void);
-long PADquery(void);
-unsigned char PADstartPoll(int pad);
-unsigned char PADpoll(unsigned char value);
-long PADreadPort1(PadDataS *pad);
-long PADreadPort2(PadDataS *pad);
-long PADkeypressed(void);
-long PADconfigure(void);
-void PADabout(void);
-long PADtest(void);
+#include "psemu_plugin_defs.h"
 
 #ifdef __cplusplus
 }
diff --git a/plugins/dfnet/cfg.c b/plugins/dfnet/cfg.c
index 921efbe3..69d25b12 100644
--- a/plugins/dfnet/cfg.c
+++ b/plugins/dfnet/cfg.c
@@ -18,7 +18,8 @@ void SaveConf() {
 
 	f = fopen(CFG_FILENAME, "w");
 	if (f == NULL) return;
-	fwrite(&conf, 1, sizeof(conf), f);
+	if(fwrite(&conf, sizeof(conf), 1, f) != 1)
+		perror(CFG_FILENAME);
 	fclose(f);
 }
 
@@ -33,6 +34,7 @@ void LoadConf() {
 		return;
 	}
 
-	fread(&conf, 1, sizeof(conf), f);
+	if(fread(&conf, sizeof(conf), 1, f) != 1)
+		perror(CFG_FILENAME);
 	fclose(f);
 }
diff --git a/plugins/dfnet/dfnet.c b/plugins/dfnet/dfnet.c
index d76a7574..22fbbe4e 100644
--- a/plugins/dfnet/dfnet.c
+++ b/plugins/dfnet/dfnet.c
@@ -12,9 +12,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
-extern int errno;
 
 #include "dfnet.h"
+#include "psemu_plugin_defs.h"
 
 const unsigned char version  = 2;    // NET library v2
 const unsigned char revision = 0;
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index 62f38425..4d8ae149 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -18,22 +18,8 @@
 #include <netdb.h>
 #include <unistd.h>
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
-typedef void* HWND;
-
 struct timeval tm;
 
-#define CALLBACK
-
 long timeGetTime();
 
 #include "psemu_plugin_defs.h"
@@ -42,9 +28,9 @@ typedef struct {
 	int PlayerNum;
 	unsigned short PortNum;
 	char ipAddress[32];
-} Config;
+} NetConfig;
 
-Config conf;
+NetConfig conf;
 
 void LoadConf();
 void SaveConf();
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index b1438995..fed9d70b 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -14,8 +14,9 @@
 #include <signal.h>
 
 #include "cfg.c"
+#include "psemu_plugin_defs.h"
 
-void cfgSysMessage(const char *fmt, ...) {
+static void cfgSysMessage(const char *fmt, ...) {
 	GtkWidget *MsgDlg;
 	va_list list;
 	char msg[512];
@@ -34,7 +35,7 @@ void cfgSysMessage(const char *fmt, ...) {
 	gtk_widget_destroy(MsgDlg);
 }
 
-void CFGconfigure() {
+static void CFGconfigure() {
 	cfgSysMessage(_("Nothing to configure"));
 }
 
@@ -45,7 +46,7 @@ void CFGconfigure() {
 
 #define MAXINTERFACES 16
 
-void sockGetIP(char *IPAddress) {
+static void sockGetIP(char *IPAddress) {
 	int fd, intrface;
 	struct ifreq buf[MAXINTERFACES];
 	struct ifconf ifc;
@@ -86,7 +87,7 @@ void sockGetIP(char *IPAddress) {
 
 #endif
 
-void OnCopyIP(GtkWidget *widget, gpointer user_data) {
+static void OnCopyIP(GtkWidget *widget, gpointer user_data) {
 	char str[256];
 
 	sockGetIP(str);
@@ -94,7 +95,7 @@ void OnCopyIP(GtkWidget *widget, gpointer user_data) {
 	cfgSysMessage(_("IP %s"), str);
 }
 
-long CFGopen() {
+static long CFGopen() {
 	GtkBuilder *builder;
 	GtkWidget *widget, *MainWindow;
 	char buf[256];
@@ -108,36 +109,36 @@ long CFGopen() {
 		return 0;
 	}
 
-	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "dlgStart"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
 
-	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btnCopyIP"));
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(builder, "tbServerIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
 
-	widget = gtk_builder_get_object(builder, "tbPort");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 	sprintf(buf, "%d", conf.PortNum);
 	gtk_entry_set_text(GTK_ENTRY(widget), buf);
 
 	if (conf.PlayerNum == 1) {
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	} else {
-		widget = gtk_builder_get_object(builder, "rbClient");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbClient"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	}
 
 	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = gtk_builder_get_object(builder, "tbServerIP");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "tbPort");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
 			conf.PlayerNum = 1;
 		} else {
@@ -154,11 +155,11 @@ long CFGopen() {
 	return 0;
 }
 
-void OnWaitDialog_Abort() {
+static void OnWaitDialog_Abort() {
 	kill(getppid(), SIGUSR2);
 }
 
-void CFGwait() {
+static void CFGwait() {
 	GtkWidget *WaitDlg;
 
 	WaitDlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
@@ -173,11 +174,11 @@ void CFGwait() {
 	OnWaitDialog_Abort();
 }
 
-long CFGpause() {
+static long CFGpause() {
 	return 0;
 }
 
-void CFGabout() {
+static void CFGabout() {
 	const char *authors[]= {"linuzappz <linuzappz@hotmail.com>", "Wei Mingzhi <whistler_wmz@users.sf.net>", NULL};
 	GtkWidget *widget;
 
@@ -191,7 +192,7 @@ void CFGabout() {
 	gtk_widget_destroy(widget);
 }
 
-long CFGmessage(char *args[], int num) {
+static long CFGmessage(char *args[], int num) {
 	char msg[512];
 
 	memset(msg, 0, sizeof(msg));
diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c
index 390a5fc3..6b082899 100644
--- a/plugins/dfnet/unix.c
+++ b/plugins/dfnet/unix.c
@@ -15,11 +15,11 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/wait.h>
-extern int errno;
 
 #include "dfnet.h"
+#include "psemu_plugin_defs.h"
 
-int ExecCfg(const char *arg, int f) {
+static int ExecCfg(const char *arg, int f) {
 	char cfg[512];
 
 	strcpy(cfg, "cfg/cfgDFNet");
@@ -27,7 +27,7 @@ int ExecCfg(const char *arg, int f) {
 	strcat(cfg, arg);
 
 	if (f) {
-		if (fork() == 0) { system(cfg); exit(0); }
+		if (fork() == 0) { exit(system(cfg)); }
 		return 0;
 	}
 
@@ -82,8 +82,9 @@ int sockPing() {
 		   (tvn.tv_usec - tv.tv_usec) / 1000;
 }
 
-void CALLBACK NETconfigure() {
+long CALLBACK NETconfigure() {
 	ExecCfg("configure", 1);
+	return 0;
 }
 
 void CALLBACK NETabout() {
@@ -92,7 +93,7 @@ void CALLBACK NETabout() {
 
 pid_t cfgpid = 0;
 
-void OnWaitDlg_Abort(int num) {
+static void OnWaitDlg_Abort(int num) {
 	WaitCancel = 1;
 	cfgpid = 0;
 }
diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 094d5d6a..ca62b32e 100644
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I../../include
+AM_CPPFLAGS = -I../../include -I../../libpcsxcore
 
 bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index f75a5127..d0f7808e 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -1,763 +1,764 @@
-/***************************************************************************

-                          adsr.c  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_ADSR

-

-// will be included from spu.c

-#ifdef _IN_SPU

-

-////////////////////////////////////////////////////////////////////////

-// ADSR func

-////////////////////////////////////////////////////////////////////////

-

-/*

-ADSR

-- Dr. Hell (Xebra PS1 emu)

-- Accurate (!)

-- http://drhell.web.fc2.com

-

-

-Envelope increase

-0-47: (7 - (RATE & 3)) <<(11 - (RATE>> 2))

-48+:  7 - (RATE & 3) / (1 <<((RATE>> 2) - 11))

-

-Envelope decrease

-0-47: (-8 + (RATE & 3)) <<(11 - (RATE>> 2))

-48+:  -8 + (RATE & 3) / (1 <<((RATE>> 2) - 11))

-

-

-Exponential increase

-0000-5FFF = (rate + 0)

-6000+     = (rate + 8)

-

-Exponential decrease

-(molecules (decrease) * level)>> 15

-

------------------------------------

-

-Fraction (release rate)

-1<<((4*32>>2)-11) = 1<<21

-

-

-Increase

-40 = (7-0)<<(11-10) = 7<<1 = 14

-41 = (7-1)<<(11-10) = 6<<1 = 12

-42 = (7-2)<<(11-10) = 5<<1 = 10

-43 = (7-3)<<(11-10) = 4<<1 = 8

-

-44 = (7-0)<<(11-11) = 7<<0 = 7

-45 = (7-1)<<(11-11) = 6<<0 = 6

-46 = (7-2)<<(11-11) = 5<<0 = 5

-47 = (7-3)<<(11-11) = 4<<0 = 4

---

-48 = (7-0) / 1<<(12-11) = 7 / 2

-49 = (7-1) / 1<<(12-11) = 6 / 2

-50 = (7-2) / 1<<(12-11) = 5 / 2

-51 = (7-3) / 1<<(12-11) = 4 / 2

-

-52 = (7-0) / 1<<(13-11) = 7 / 4

-56 = (7-0) / 1<<(14-11) = 7 / 8

-60 = (7-0) / 1<<(15-11) = 7 / 16

-

-

-Decrease

-40 = (-8+0)<<(11-10) = -8<<1 = -16

-41 = (-8+1)<<(11-10) = -7<<1 = -14

-42 = (-8+2)<<(11-10) = -6<<1 = -12

-43 = (-8+3)<<(11-10) = -5<<1 = -10

-

-44 = (-8+0)<<(11-11) = -8<<0 = -8

-45 = (-8+1)<<(11-11) = -7<<0 = -7

-46 = (-8+2)<<(11-11) = -6<<0 = -6

-47 = (-8+3)<<(11-11) = -5<<0 = -5

---

-48 = (-8+0) / 1<<(12-11) = -8 / 2

-49 = (-8+1) / 1<<(12-11) = -7 / 2

-50 = (-8+2) / 1<<(12-11) = -6 / 2

-51 = (-8+3) / 1<<(12-11) = -5 / 2

-*/

-

-

-static int RateTableAdd[128];

-static int RateTableAdd_f[128];

-static int RateTableSub[128];

-static int RateTableSub_f[128];

-static const int RateTable_denom = 1 << (( (4*32)>>2) - 11);

-

-void InitADSR(void)                                    // INIT ADSR

-{

- int lcv;

-

- memset(RateTableAdd,0,sizeof(int)*128);

- memset(RateTableAdd_f,0,sizeof(int)*128);

- memset(RateTableSub,0,sizeof(int)*128);

- memset(RateTableSub_f,0,sizeof(int)*128);

-

-

- // Optimize table - Dr. Hell ADSR math

- for( lcv=0; lcv<48; lcv++ ) {

-	 RateTableAdd[lcv] = (7 - (lcv&3)) << (11 - (lcv >> 2));

-	 RateTableSub[lcv] = (-8 + (lcv&3)) << (11 - (lcv >> 2));

-

-	 RateTableAdd_f[lcv] = 0;

-	 RateTableSub_f[lcv] = 0;

- }

-

- for( lcv=48; lcv<128; lcv++ ) {

-	 int denom;

-

-	 denom = 1 << ((lcv>>2) - 11);

-

-	 // whole

-	 RateTableAdd[lcv] = (7 - (lcv&3)) / denom;

-	 RateTableSub[lcv] = (-8 + (lcv&3)) / denom;

-

-	 // fraction

-	 RateTableAdd_f[lcv] = (7 - (lcv&3)) % denom;

-	 RateTableSub_f[lcv] = (-8 + (lcv&3)) % denom;

-

-	 RateTableAdd_f[lcv] *= RateTable_denom / denom;

-	 RateTableSub_f[lcv] *= RateTable_denom / denom;

-

-	 // goofy compiler - mod

-	 if( RateTableSub_f[lcv] > 0 ) RateTableSub_f[lcv] = -RateTableSub_f[lcv];

- }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE void StartADSR(int ch)                          // MIX ADSR

-{

- s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars

- s_chan[ch].ADSRX.State=0;

- s_chan[ch].ADSRX.EnvelopeVol=0;

- s_chan[ch].ADSRX.EnvelopeVol_f=0;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE int MixADSR(int ch)                             // MIX ADSR

-{    

- int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;

- int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;

-

-

- // dead volume - voice on

- if( s_chan[ch].iSilent == 2 ) {

-	 if( s_chan[ch].bStop ) s_chan[ch].bOn = 0;

-	 return 0;

- }

-

-

- if(s_chan[ch].bStop)                                  // should be stopped:

-  {                                                    // do release

-	 if(s_chan[ch].ADSRX.ReleaseModeExp)

-     EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ] * EnvelopeVol ) >> 15;

-   else

-     EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ];

-

-	 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.ReleaseRate * 4 ];

-	 if( EnvelopeVol_f < 0 ) {

-		 EnvelopeVol_f += RateTable_denom;

-		 EnvelopeVol--;

-	 }

-

-   if(EnvelopeVol<0) 

-    {

-     EnvelopeVol=0;

-		 EnvelopeVol_f=0;

-     // don't stop if this chan can still cause irqs

-     if(!(spuCtrl&0x40) || (s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq))

-       s_chan[ch].bOn=0;

-		}

-

-   

-   s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;

-	 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;

-   s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;

-   return EnvelopeVol>>5;

-  }

- else                                                  // not stopped yet?

-  {

-   if(s_chan[ch].ADSRX.State==0)                       // -> attack

-    {

-     if(s_chan[ch].ADSRX.AttackModeExp)

-      {

-       if(EnvelopeVol>=0x6000) {

-				EnvelopeVol+=RateTableAdd[s_chan[ch].ADSRX.AttackRate + 8];

-				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 8];

-			 }

-			 else {

-				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];

-				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];

-			 }

-      }

-		 else {

-			EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];

-			EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];

-		 }

-

-		 if( EnvelopeVol_f >= RateTable_denom ) {

-			 EnvelopeVol_f -= RateTable_denom;

-			 EnvelopeVol++;

-		 }

-

-     if(EnvelopeVol>=0x8000) 

-      {

-       EnvelopeVol=0x7FFF;

-			 EnvelopeVol_f=RateTable_denom;

-       s_chan[ch].ADSRX.State=1;

-		 }

-

-		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;

-		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;

-		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;

-     return EnvelopeVol>>5;

-    }

-   //--------------------------------------------------//

-   if(s_chan[ch].ADSRX.State==1)                       // -> decay

-    {

-		 EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.DecayRate * 4 ] * EnvelopeVol ) >> 15;

-		 

-		 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.DecayRate * 4 ];

-		 if( EnvelopeVol_f < 0 ) {

-			 EnvelopeVol_f += RateTable_denom;

-			 EnvelopeVol--;

-		 }

-

-     if(EnvelopeVol<0) {

-			 EnvelopeVol=0;

-			 EnvelopeVol_f=0;

-		 }

-

-		 // FF7 cursor - use Neill's 4-bit accuracy

-		 if( ((EnvelopeVol>>11)&0xf) <= s_chan[ch].ADSRX.SustainLevel)

-      {

-       s_chan[ch].ADSRX.State=2;

-		 }

-

-

-		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;

-		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;

-		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;

-     return EnvelopeVol>>5;

-    }

-   //--------------------------------------------------//

-   if(s_chan[ch].ADSRX.State==2)                       // -> sustain

-    {

-     if(s_chan[ch].ADSRX.SustainIncrease)

-      {

-       if(s_chan[ch].ADSRX.SustainModeExp)

-        {

-				 if(EnvelopeVol>=0x6000) {

-					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 8];

-					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 8];

-				 }

-				 else {

-					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];

-					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];

-				 }

-				}

-			 else {

-				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];

-				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];

-			 }

-

-			 if( EnvelopeVol_f >= RateTable_denom ) {

-				 EnvelopeVol_f -= RateTable_denom;

-				 EnvelopeVol++;

-			 }

-

-       if(EnvelopeVol >= 0x8000) 

-        {

-         EnvelopeVol=0x7FFF;

-				 EnvelopeVol_f=RateTable_denom;

-        }

-      }

-     else

-      {

-       if(s_chan[ch].ADSRX.SustainModeExp)

-				EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.SustainRate ] * EnvelopeVol ) >> 15;

-			 else

-				EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.SustainRate ];

-			 

-			 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.SustainRate ];

-			 if( EnvelopeVol_f < 0 ) {

-				 EnvelopeVol_f += RateTable_denom;

-				 EnvelopeVol--;

-			 }

-

-

-       if(EnvelopeVol<0) {

-         EnvelopeVol=0;

-				 EnvelopeVol_f=0;

-        }

-      }

-

-

-		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;

-		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;

-		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;

-     return EnvelopeVol>>5;

-    }

-  }

- return 0;

-}

-

-#endif

-

-/*

-James Higgs ADSR investigations:

-

-PSX SPU Envelope Timings

-~~~~~~~~~~~~~~~~~~~~~~~~

-

-First, here is an extract from doomed's SPU doc, which explains the basics

-of the SPU "volume envelope": 

-

-*** doomed doc extract start ***

-

---------------------------------------------------------------------------

-Voices.

---------------------------------------------------------------------------

-The SPU has 24 hardware voices. These voices can be used to reproduce sample

-data, noise or can be used as frequency modulator on the next voice.

-Each voice has it's own programmable ADSR envelope filter. The main volume

-can be programmed independently for left and right output.

-

-The ADSR envelope filter works as follows:

-Ar = Attack rate, which specifies the speed at which the volume increases

-     from zero to it's maximum value, as soon as the note on is given. The

-     slope can be set to lineair or exponential.

-Dr = Decay rate specifies the speed at which the volume decreases to the

-     sustain level. Decay is always decreasing exponentially.

-Sl = Sustain level, base level from which sustain starts.

-Sr = Sustain rate is the rate at which the volume of the sustained note

-     increases or decreases. This can be either lineair or exponential.

-Rr = Release rate is the rate at which the volume of the note decreases

-     as soon as the note off is given.

-

-     lvl |

-       ^ |     /\Dr     __

-     Sl _| _  / _ \__---  \

-         |   /       ---__ \ Rr

-         |  /Ar       Sr  \ \

-         | /                \\

-         |/___________________\________

-                                  ->time

-

-The overal volume can also be set to sweep up or down lineairly or

-exponentially from it's current value. This can be done seperately

-for left and right.

-

-Relevant SPU registers:

--------------------------------------------------------------

-$1f801xx8         Attack/Decay/Sustain level

-bit  |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|

-desc.|Am|         Ar         |Dr         |Sl         |

-

-Am       0        Attack mode Linear

-         1                    Exponential

-

-Ar       0-7f     attack rate

-Dr       0-f      decay rate

-Sl       0-f      sustain level

--------------------------------------------------------------

-$1f801xxa         Sustain rate, Release Rate.

-bit  |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|

-desc.|Sm|Sd| 0|   Sr               |Rm|Rr            |

-

-Sm       0        sustain rate mode linear

-         1                          exponential

-Sd       0        sustain rate mode increase

-         1                          decrease

-Sr       0-7f     Sustain Rate

-Rm       0        Linear decrease

-         1        Exponential decrease

-Rr       0-1f     Release Rate

-

-Note: decay mode is always Expontial decrease, and thus cannot

-be set.

--------------------------------------------------------------

-$1f801xxc         Current ADSR volume

-bit  |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|

-desc.|ADSRvol                                        |

-

-ADSRvol           Returns the current envelope volume when

-                  read.

--- James' Note: return range: 0 -> 32767

-

-*** doomed doc extract end *** 

-

-By using a small PSX proggie to visualise the envelope as it was played,

-the following results for envelope timing were obtained:

-

-1. Attack rate value (linear mode)

-

-   Attack value range: 0 -> 127

-

-   Value  | 48 | 52 | 56 | 60 | 64 | 68 | 72 |    | 80 |

-   -----------------------------------------------------------------

-   Frames | 11 | 21 | 42 | 84 | 169| 338| 676|    |2890|

-

-   Note: frames is no. of PAL frames to reach full volume (100%

-   amplitude)

-

-   Hmm, noticing that the time taken to reach full volume doubles

-   every time we add 4 to our attack value, we know the equation is

-   of form:

-             frames = k * 2 ^ (value / 4)

-

-   (You may ponder about envelope generator hardware at this point,

-   or maybe not... :)

-

-   By substituting some stuff and running some checks, we get:

-

-       k = 0.00257              (close enuf)

-

-   therefore,

-             frames = 0.00257 * 2 ^ (value / 4)

-   If you just happen to be writing an emulator, then you can probably

-   use an equation like:

-

-       %volume_increase_per_tick = 1 / frames

-

-

-   ------------------------------------

-   Pete:

-   ms=((1<<(value>>2))*514)/10000

-   ------------------------------------

-

-2. Decay rate value (only has log mode)

-

-   Decay value range: 0 -> 15

-

-   Value  |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 |

-   ------------------------------------------------

-   frames |    |    |    |    |  6 | 12 | 24 | 47 |

-

-   Note: frames here is no. of PAL frames to decay to 50% volume.

-

-   formula: frames = k * 2 ^ (value)

-

-   Substituting, we get: k = 0.00146

-

-   Further info on logarithmic nature:

-   frames to decay to sustain level 3  =  3 * frames to decay to 

-   sustain level 9

-

-   Also no. of frames to 25% volume = roughly 1.85 * no. of frames to

-   50% volume.

-

-   Frag it - just use linear approx.

-

-   ------------------------------------

-   Pete:

-   ms=((1<<value)*292)/10000

-   ------------------------------------

-

-

-3. Sustain rate value (linear mode)

-

-   Sustain rate range: 0 -> 127

-

-   Value  | 48 | 52 | 56 | 60 | 64 | 68 | 72 |

-   -------------------------------------------

-   frames |  9 | 19 | 37 | 74 | 147| 293| 587|

-

-   Here, frames = no. of PAL frames for volume amplitude to go from 100%

-   to 0% (or vice-versa).

-

-   Same formula as for attack value, just a different value for k:

-

-   k = 0.00225

-

-   ie: frames = 0.00225 * 2 ^ (value / 4)

-

-   For emulation purposes:

-

-   %volume_increase_or_decrease_per_tick = 1 / frames

-

-   ------------------------------------

-   Pete:

-   ms=((1<<(value>>2))*450)/10000

-   ------------------------------------

-

-

-4. Release rate (linear mode)

-

-   Release rate range: 0 -> 31

-

-   Value  | 13 | 14 | 15 | 16 | 17 |

-   ---------------------------------------------------------------

-   frames | 18 | 36 | 73 | 146| 292|

-

-   Here, frames = no. of PAL frames to decay from 100% vol to 0% vol

-   after "note-off" is triggered.

-

-   Formula: frames = k * 2 ^ (value)

-

-   And so: k = 0.00223

-

-   ------------------------------------

-   Pete:

-   ms=((1<<value)*446)/10000

-   ------------------------------------

-

-

-Other notes:   

-

-Log stuff not figured out. You may get some clues from the "Decay rate"

-stuff above. For emu purposes it may not be important - use linear

-approx.

-

-To get timings in millisecs, multiply frames by 20.

-

-

-

-- James Higgs 17/6/2000

-james7780@yahoo.com

-

-//---------------------------------------------------------------

-

-OLD adsr mixing according to james' rules... has to be called

-every one millisecond

-

-

- long v,v2,lT,l1,l2,l3;

-

- if(s_chan[ch].bStop)                                  // psx wants to stop? -> release phase

-  {

-   if(s_chan[ch].ADSR.ReleaseVal!=0)                   // -> release not 0: do release (if 0: stop right now)

-    {

-     if(!s_chan[ch].ADSR.ReleaseVol)                   // --> release just started? set up the release stuff

-      {

-       s_chan[ch].ADSR.ReleaseStartTime=s_chan[ch].ADSR.lTime;

-       s_chan[ch].ADSR.ReleaseVol=s_chan[ch].ADSR.lVolume;

-       s_chan[ch].ADSR.ReleaseTime =                   // --> calc how long does it take to reach the wanted sus level

-         (s_chan[ch].ADSR.ReleaseTime*

-          s_chan[ch].ADSR.ReleaseVol)/1024;

-      }

-                                                       // -> NO release exp mode used (yet)

-     v=s_chan[ch].ADSR.ReleaseVol;                     // -> get last volume

-     lT=s_chan[ch].ADSR.lTime-                         // -> how much time is past?

-        s_chan[ch].ADSR.ReleaseStartTime;

-     l1=s_chan[ch].ADSR.ReleaseTime;

-                                                       

-     if(lT<l1)                                         // -> we still have to release

-      {

-       v=v-((v*lT)/l1);                                // --> calc new volume

-      }

-     else                                              // -> release is over: now really stop that sample

-      {v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}

-    }

-   else                                                // -> release IS 0: release at once

-    {

-     v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;

-    }

-  }

- else                                               

-  {//--------------------------------------------------// not in release phase:

-   v=1024;

-   lT=s_chan[ch].ADSR.lTime;

-   l1=s_chan[ch].ADSR.AttackTime;

-                                                       

-   if(lT<l1)                                           // attack

-    {                                                  // no exp mode used (yet)

-//     if(s_chan[ch].ADSR.AttackModeExp)

-//      {

-//       v=(v*lT)/l1;

-//      }

-//     else

-      {

-       v=(v*lT)/l1;

-      }

-     if(v==0) v=1;

-    }

-   else                                                // decay

-    {                                                  // should be exp, but who cares? ;)

-     l2=s_chan[ch].ADSR.DecayTime;

-     v2=s_chan[ch].ADSR.SustainLevel;

-

-     lT-=l1;

-     if(lT<l2)

-      {

-       v-=(((v-v2)*lT)/l2);

-      }

-     else                                              // sustain

-      {                                                // no exp mode used (yet)

-       l3=s_chan[ch].ADSR.SustainTime;

-       lT-=l2;

-       if(s_chan[ch].ADSR.SustainModeDec>0)

-        {

-         if(l3!=0) v2+=((v-v2)*lT)/l3;

-         else      v2=v;

-        }

-       else

-        {

-         if(l3!=0) v2-=(v2*lT)/l3;

-         else      v2=v;

-        }

-

-       if(v2>v)  v2=v;

-       if(v2<=0) {v2=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}

-

-       v=v2;

-      }

-    }

-  }

-

- //----------------------------------------------------// 

- // ok, done for this channel, so increase time

-

- s_chan[ch].ADSR.lTime+=1;                             // 1 = 1.020408f ms;      

-

- if(v>1024)     v=1024;                                // adjust volume

- if(v<0)        v=0;                                  

- s_chan[ch].ADSR.lVolume=v;                            // store act volume

-

- return v;                                             // return the volume factor

-*/

-

-

-//-----------------------------------------------------------------------------

-//-----------------------------------------------------------------------------

-//-----------------------------------------------------------------------------

-

-

-/*

------------------------------------------------------------------------------

-Neill Corlett

-Playstation SPU envelope timing notes

------------------------------------------------------------------------------

-

-This is preliminary.  This may be wrong.  But the model described herein fits

-all of my experimental data, and it's just simple enough to sound right.

-

-ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.

-The value returned by channel reg 0xC is (envelope_level>>16).

-

-Each sample, an increment or decrement value will be added to or

-subtracted from this envelope level.

-

-Create the rate log table.  The values double every 4 entries.

-   entry #0 = 4

-

-    4, 5, 6, 7,

-    8,10,12,14,

-   16,20,24,28, ...

-

-   entry #40 = 4096...

-   entry #44 = 8192...

-   entry #48 = 16384...

-   entry #52 = 32768...

-   entry #56 = 65536...

-

-increments and decrements are in terms of ratelogtable[n]

-n may exceed the table bounds (plan on n being between -32 and 127).

-table values are all clipped between 0x00000000 and 0x3FFFFFFF

-

-when you "voice on", the envelope is always fully reset.

-(yes, it may click. the real thing does this too.)

-

-envelope level begins at zero.

-

-each state happens for at least 1 cycle

-(transitions are not instantaneous)

-this may result in some oddness: if the decay rate is uberfast, it will cut

-the envelope from full down to half in one sample, potentially skipping over

-the sustain level

-

-ATTACK

-------

-- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and

-  proceed to DECAY.

-

-Linear attack mode:

-- line extends upward to 0x7FFFFFFF

-- increment per sample is ratelogtable[(Ar^0x7F)-0x10]

-

-Logarithmic attack mode:

-if envelope_level < 0x60000000:

-  - line extends upward to 0x60000000

-  - increment per sample is ratelogtable[(Ar^0x7F)-0x10]

-else:

-  - line extends upward to 0x7FFFFFFF

-  - increment per sample is ratelogtable[(Ar^0x7F)-0x18]

-

-DECAY

------

-- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.

-  Do not clip to the sustain level.

-- current line ends at (envelope_level & 0x07FFFFFF)

-- decrement per sample depends on (envelope_level>>28)&0x7

-  0: ratelogtable[(4*(Dr^0x1F))-0x18+0]

-  1: ratelogtable[(4*(Dr^0x1F))-0x18+4]

-  2: ratelogtable[(4*(Dr^0x1F))-0x18+6]

-  3: ratelogtable[(4*(Dr^0x1F))-0x18+8]

-  4: ratelogtable[(4*(Dr^0x1F))-0x18+9]

-  5: ratelogtable[(4*(Dr^0x1F))-0x18+10]

-  6: ratelogtable[(4*(Dr^0x1F))-0x18+11]

-  7: ratelogtable[(4*(Dr^0x1F))-0x18+12]

-  (note that this is the same as the release rate formula, except that

-   decay rates 10-1F aren't possible... those would be slower in theory)

-

-SUSTAIN

--------

-- no terminating condition except for voice off

-- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.

-- Sd=1 (decrease) behavior:

-Linear sustain decrease:

-- line extends to 0x00000000

-- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]

-Logarithmic sustain decrease:

-- current line ends at (envelope_level & 0x07FFFFFF)

-- decrement per sample depends on (envelope_level>>28)&0x7

-  0: ratelogtable[(Sr^0x7F)-0x1B+0]

-  1: ratelogtable[(Sr^0x7F)-0x1B+4]

-  2: ratelogtable[(Sr^0x7F)-0x1B+6]

-  3: ratelogtable[(Sr^0x7F)-0x1B+8]

-  4: ratelogtable[(Sr^0x7F)-0x1B+9]

-  5: ratelogtable[(Sr^0x7F)-0x1B+10]

-  6: ratelogtable[(Sr^0x7F)-0x1B+11]

-  7: ratelogtable[(Sr^0x7F)-0x1B+12]

-

-RELEASE

--------

-- if the envelope level has overflowed to negative, clip to 0 and QUIT.

-

-Linear release mode:

-- line extends to 0x00000000

-- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]

-

-Logarithmic release mode:

-- line extends to (envelope_level & 0x0FFFFFFF)

-- decrement per sample depends on (envelope_level>>28)&0x7

-  0: ratelogtable[(4*(Rr^0x1F))-0x18+0]

-  1: ratelogtable[(4*(Rr^0x1F))-0x18+4]

-  2: ratelogtable[(4*(Rr^0x1F))-0x18+6]

-  3: ratelogtable[(4*(Rr^0x1F))-0x18+8]

-  4: ratelogtable[(4*(Rr^0x1F))-0x18+9]

-  5: ratelogtable[(4*(Rr^0x1F))-0x18+10]

-  6: ratelogtable[(4*(Rr^0x1F))-0x18+11]

-  7: ratelogtable[(4*(Rr^0x1F))-0x18+12]

-

------------------------------------------------------------------------------

-*/

-

+/***************************************************************************
+                          adsr.c  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+#include "adsr.h"
+
+#define _IN_ADSR
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// ADSR func
+////////////////////////////////////////////////////////////////////////
+
+/*
+ADSR
+- Dr. Hell (Xebra PS1 emu)
+- Accurate (!)
+- http://drhell.web.fc2.com
+
+
+Envelope increase
+0-47: (7 - (RATE & 3)) <<(11 - (RATE>> 2))
+48+:  7 - (RATE & 3) / (1 <<((RATE>> 2) - 11))
+
+Envelope decrease
+0-47: (-8 + (RATE & 3)) <<(11 - (RATE>> 2))
+48+:  -8 + (RATE & 3) / (1 <<((RATE>> 2) - 11))
+
+
+Exponential increase
+0000-5FFF = (rate + 0)
+6000+     = (rate + 8)
+
+Exponential decrease
+(molecules (decrease) * level)>> 15
+
+-----------------------------------
+
+Fraction (release rate)
+1<<((4*32>>2)-11) = 1<<21
+
+
+Increase
+40 = (7-0)<<(11-10) = 7<<1 = 14
+41 = (7-1)<<(11-10) = 6<<1 = 12
+42 = (7-2)<<(11-10) = 5<<1 = 10
+43 = (7-3)<<(11-10) = 4<<1 = 8
+
+44 = (7-0)<<(11-11) = 7<<0 = 7
+45 = (7-1)<<(11-11) = 6<<0 = 6
+46 = (7-2)<<(11-11) = 5<<0 = 5
+47 = (7-3)<<(11-11) = 4<<0 = 4
+--
+48 = (7-0) / 1<<(12-11) = 7 / 2
+49 = (7-1) / 1<<(12-11) = 6 / 2
+50 = (7-2) / 1<<(12-11) = 5 / 2
+51 = (7-3) / 1<<(12-11) = 4 / 2
+
+52 = (7-0) / 1<<(13-11) = 7 / 4
+56 = (7-0) / 1<<(14-11) = 7 / 8
+60 = (7-0) / 1<<(15-11) = 7 / 16
+
+
+Decrease
+40 = (-8+0)<<(11-10) = -8<<1 = -16
+41 = (-8+1)<<(11-10) = -7<<1 = -14
+42 = (-8+2)<<(11-10) = -6<<1 = -12
+43 = (-8+3)<<(11-10) = -5<<1 = -10
+
+44 = (-8+0)<<(11-11) = -8<<0 = -8
+45 = (-8+1)<<(11-11) = -7<<0 = -7
+46 = (-8+2)<<(11-11) = -6<<0 = -6
+47 = (-8+3)<<(11-11) = -5<<0 = -5
+--
+48 = (-8+0) / 1<<(12-11) = -8 / 2
+49 = (-8+1) / 1<<(12-11) = -7 / 2
+50 = (-8+2) / 1<<(12-11) = -6 / 2
+51 = (-8+3) / 1<<(12-11) = -5 / 2
+*/
+
+
+static int RateTableAdd[128];
+static int RateTableAdd_f[128];
+static int RateTableSub[128];
+static int RateTableSub_f[128];
+static const int RateTable_denom = 1 << (( (4*32)>>2) - 11);
+
+void InitADSR(void)                                    // INIT ADSR
+{
+ int lcv;
+
+ memset(RateTableAdd,0,sizeof(int)*128);
+ memset(RateTableAdd_f,0,sizeof(int)*128);
+ memset(RateTableSub,0,sizeof(int)*128);
+ memset(RateTableSub_f,0,sizeof(int)*128);
+
+
+ // Optimize table - Dr. Hell ADSR math
+ for( lcv=0; lcv<48; lcv++ ) {
+	 RateTableAdd[lcv] = (7 - (lcv&3)) << (11 - (lcv >> 2));
+	 RateTableSub[lcv] = (-8 + (lcv&3)) << (11 - (lcv >> 2));
+
+	 RateTableAdd_f[lcv] = 0;
+	 RateTableSub_f[lcv] = 0;
+ }
+
+ for( lcv=48; lcv<128; lcv++ ) {
+	 int denom;
+
+	 denom = 1 << ((lcv>>2) - 11);
+
+	 // whole
+	 RateTableAdd[lcv] = (7 - (lcv&3)) / denom;
+	 RateTableSub[lcv] = (-8 + (lcv&3)) / denom;
+
+	 // fraction
+	 RateTableAdd_f[lcv] = (7 - (lcv&3)) % denom;
+	 RateTableSub_f[lcv] = (-8 + (lcv&3)) % denom;
+
+	 RateTableAdd_f[lcv] *= RateTable_denom / denom;
+	 RateTableSub_f[lcv] *= RateTable_denom / denom;
+
+	 // goofy compiler - mod
+	 if( RateTableSub_f[lcv] > 0 ) RateTableSub_f[lcv] = -RateTableSub_f[lcv];
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StartADSR(int ch)                          // MIX ADSR
+{
+ s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars
+ s_chan[ch].ADSRX.State=0;
+ s_chan[ch].ADSRX.EnvelopeVol=0;
+ s_chan[ch].ADSRX.EnvelopeVol_f=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE int MixADSR(int ch)                             // MIX ADSR
+{    
+ int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;
+ int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;
+
+
+ // dead volume - voice on
+ if( s_chan[ch].iSilent == 2 ) {
+	 if( s_chan[ch].bStop ) s_chan[ch].bOn = 0;
+	 return 0;
+ }
+
+
+ if(s_chan[ch].bStop)                                  // should be stopped:
+  {                                                    // do release
+	 if(s_chan[ch].ADSRX.ReleaseModeExp)
+     EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ] * EnvelopeVol ) >> 15;
+   else
+     EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ];
+
+	 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.ReleaseRate * 4 ];
+	 if( EnvelopeVol_f < 0 ) {
+		 EnvelopeVol_f += RateTable_denom;
+		 EnvelopeVol--;
+	 }
+
+   if(EnvelopeVol<0) 
+    {
+     EnvelopeVol=0;
+		 EnvelopeVol_f=0;
+     // don't stop if this chan can still cause irqs
+     if(!(spuCtrl&0x40) || (s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq))
+       s_chan[ch].bOn=0;
+		}
+
+   
+   s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+	 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+   s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+   return EnvelopeVol>>5;
+  }
+ else                                                  // not stopped yet?
+  {
+   if(s_chan[ch].ADSRX.State==0)                       // -> attack
+    {
+     if(s_chan[ch].ADSRX.AttackModeExp)
+      {
+       if(EnvelopeVol>=0x6000) {
+				EnvelopeVol+=RateTableAdd[s_chan[ch].ADSRX.AttackRate + 8];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 8];
+			 }
+			 else {
+				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];
+			 }
+      }
+		 else {
+			EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];
+			EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];
+		 }
+
+		 if( EnvelopeVol_f >= RateTable_denom ) {
+			 EnvelopeVol_f -= RateTable_denom;
+			 EnvelopeVol++;
+		 }
+
+     if(EnvelopeVol>=0x8000) 
+      {
+       EnvelopeVol=0x7FFF;
+			 EnvelopeVol_f=RateTable_denom;
+       s_chan[ch].ADSRX.State=1;
+		 }
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+     return EnvelopeVol>>5;
+    }
+   //--------------------------------------------------//
+   if(s_chan[ch].ADSRX.State==1)                       // -> decay
+    {
+		 EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.DecayRate * 4 ] * EnvelopeVol ) >> 15;
+		 
+		 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.DecayRate * 4 ];
+		 if( EnvelopeVol_f < 0 ) {
+			 EnvelopeVol_f += RateTable_denom;
+			 EnvelopeVol--;
+		 }
+
+     if(EnvelopeVol<0) {
+			 EnvelopeVol=0;
+			 EnvelopeVol_f=0;
+		 }
+
+		 // FF7 cursor - use Neill's 4-bit accuracy
+		 if( ((EnvelopeVol>>11)&0xf) <= s_chan[ch].ADSRX.SustainLevel)
+      {
+       s_chan[ch].ADSRX.State=2;
+		 }
+
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+     return EnvelopeVol>>5;
+    }
+   //--------------------------------------------------//
+   if(s_chan[ch].ADSRX.State==2)                       // -> sustain
+    {
+     if(s_chan[ch].ADSRX.SustainIncrease)
+      {
+       if(s_chan[ch].ADSRX.SustainModeExp)
+        {
+				 if(EnvelopeVol>=0x6000) {
+					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 8];
+					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 8];
+				 }
+				 else {
+					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];
+					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];
+				 }
+				}
+			 else {
+				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];
+			 }
+
+			 if( EnvelopeVol_f >= RateTable_denom ) {
+				 EnvelopeVol_f -= RateTable_denom;
+				 EnvelopeVol++;
+			 }
+
+       if(EnvelopeVol >= 0x8000) 
+        {
+         EnvelopeVol=0x7FFF;
+				 EnvelopeVol_f=RateTable_denom;
+        }
+      }
+     else
+      {
+       if(s_chan[ch].ADSRX.SustainModeExp)
+				EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.SustainRate ] * EnvelopeVol ) >> 15;
+			 else
+				EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.SustainRate ];
+			 
+			 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.SustainRate ];
+			 if( EnvelopeVol_f < 0 ) {
+				 EnvelopeVol_f += RateTable_denom;
+				 EnvelopeVol--;
+			 }
+
+
+       if(EnvelopeVol<0) {
+         EnvelopeVol=0;
+				 EnvelopeVol_f=0;
+        }
+      }
+
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+     return EnvelopeVol>>5;
+    }
+  }
+ return 0;
+}
+
+#endif
+
+/*
+James Higgs ADSR investigations:
+
+PSX SPU Envelope Timings
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, here is an extract from doomed's SPU doc, which explains the basics
+of the SPU "volume envelope": 
+
+*** doomed doc extract start ***
+
+--------------------------------------------------------------------------
+Voices.
+--------------------------------------------------------------------------
+The SPU has 24 hardware voices. These voices can be used to reproduce sample
+data, noise or can be used as frequency modulator on the next voice.
+Each voice has it's own programmable ADSR envelope filter. The main volume
+can be programmed independently for left and right output.
+
+The ADSR envelope filter works as follows:
+Ar = Attack rate, which specifies the speed at which the volume increases
+     from zero to it's maximum value, as soon as the note on is given. The
+     slope can be set to lineair or exponential.
+Dr = Decay rate specifies the speed at which the volume decreases to the
+     sustain level. Decay is always decreasing exponentially.
+Sl = Sustain level, base level from which sustain starts.
+Sr = Sustain rate is the rate at which the volume of the sustained note
+     increases or decreases. This can be either lineair or exponential.
+Rr = Release rate is the rate at which the volume of the note decreases
+     as soon as the note off is given.
+
+     lvl |
+       ^ |     /\Dr     __
+     Sl _| _  / _ \__---  \
+         |   /       ---__ \ Rr
+         |  /Ar       Sr  \ \
+         | /                \\
+         |/___________________\________
+                                  ->time
+
+The overal volume can also be set to sweep up or down lineairly or
+exponentially from it's current value. This can be done seperately
+for left and right.
+
+Relevant SPU registers:
+-------------------------------------------------------------
+$1f801xx8         Attack/Decay/Sustain level
+bit  |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|
+desc.|Am|         Ar         |Dr         |Sl         |
+
+Am       0        Attack mode Linear
+         1                    Exponential
+
+Ar       0-7f     attack rate
+Dr       0-f      decay rate
+Sl       0-f      sustain level
+-------------------------------------------------------------
+$1f801xxa         Sustain rate, Release Rate.
+bit  |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|
+desc.|Sm|Sd| 0|   Sr               |Rm|Rr            |
+
+Sm       0        sustain rate mode linear
+         1                          exponential
+Sd       0        sustain rate mode increase
+         1                          decrease
+Sr       0-7f     Sustain Rate
+Rm       0        Linear decrease
+         1        Exponential decrease
+Rr       0-1f     Release Rate
+
+Note: decay mode is always Expontial decrease, and thus cannot
+be set.
+-------------------------------------------------------------
+$1f801xxc         Current ADSR volume
+bit  |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
+desc.|ADSRvol                                        |
+
+ADSRvol           Returns the current envelope volume when
+                  read.
+-- James' Note: return range: 0 -> 32767
+
+*** doomed doc extract end *** 
+
+By using a small PSX proggie to visualise the envelope as it was played,
+the following results for envelope timing were obtained:
+
+1. Attack rate value (linear mode)
+
+   Attack value range: 0 -> 127
+
+   Value  | 48 | 52 | 56 | 60 | 64 | 68 | 72 |    | 80 |
+   -----------------------------------------------------------------
+   Frames | 11 | 21 | 42 | 84 | 169| 338| 676|    |2890|
+
+   Note: frames is no. of PAL frames to reach full volume (100%
+   amplitude)
+
+   Hmm, noticing that the time taken to reach full volume doubles
+   every time we add 4 to our attack value, we know the equation is
+   of form:
+             frames = k * 2 ^ (value / 4)
+
+   (You may ponder about envelope generator hardware at this point,
+   or maybe not... :)
+
+   By substituting some stuff and running some checks, we get:
+
+       k = 0.00257              (close enuf)
+
+   therefore,
+             frames = 0.00257 * 2 ^ (value / 4)
+   If you just happen to be writing an emulator, then you can probably
+   use an equation like:
+
+       %volume_increase_per_tick = 1 / frames
+
+
+   ------------------------------------
+   Pete:
+   ms=((1<<(value>>2))*514)/10000
+   ------------------------------------
+
+2. Decay rate value (only has log mode)
+
+   Decay value range: 0 -> 15
+
+   Value  |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 |
+   ------------------------------------------------
+   frames |    |    |    |    |  6 | 12 | 24 | 47 |
+
+   Note: frames here is no. of PAL frames to decay to 50% volume.
+
+   formula: frames = k * 2 ^ (value)
+
+   Substituting, we get: k = 0.00146
+
+   Further info on logarithmic nature:
+   frames to decay to sustain level 3  =  3 * frames to decay to 
+   sustain level 9
+
+   Also no. of frames to 25% volume = roughly 1.85 * no. of frames to
+   50% volume.
+
+   Frag it - just use linear approx.
+
+   ------------------------------------
+   Pete:
+   ms=((1<<value)*292)/10000
+   ------------------------------------
+
+
+3. Sustain rate value (linear mode)
+
+   Sustain rate range: 0 -> 127
+
+   Value  | 48 | 52 | 56 | 60 | 64 | 68 | 72 |
+   -------------------------------------------
+   frames |  9 | 19 | 37 | 74 | 147| 293| 587|
+
+   Here, frames = no. of PAL frames for volume amplitude to go from 100%
+   to 0% (or vice-versa).
+
+   Same formula as for attack value, just a different value for k:
+
+   k = 0.00225
+
+   ie: frames = 0.00225 * 2 ^ (value / 4)
+
+   For emulation purposes:
+
+   %volume_increase_or_decrease_per_tick = 1 / frames
+
+   ------------------------------------
+   Pete:
+   ms=((1<<(value>>2))*450)/10000
+   ------------------------------------
+
+
+4. Release rate (linear mode)
+
+   Release rate range: 0 -> 31
+
+   Value  | 13 | 14 | 15 | 16 | 17 |
+   ---------------------------------------------------------------
+   frames | 18 | 36 | 73 | 146| 292|
+
+   Here, frames = no. of PAL frames to decay from 100% vol to 0% vol
+   after "note-off" is triggered.
+
+   Formula: frames = k * 2 ^ (value)
+
+   And so: k = 0.00223
+
+   ------------------------------------
+   Pete:
+   ms=((1<<value)*446)/10000
+   ------------------------------------
+
+
+Other notes:   
+
+Log stuff not figured out. You may get some clues from the "Decay rate"
+stuff above. For emu purposes it may not be important - use linear
+approx.
+
+To get timings in millisecs, multiply frames by 20.
+
+
+
+- James Higgs 17/6/2000
+james7780@yahoo.com
+
+//---------------------------------------------------------------
+
+OLD adsr mixing according to james' rules... has to be called
+every one millisecond
+
+
+ long v,v2,lT,l1,l2,l3;
+
+ if(s_chan[ch].bStop)                                  // psx wants to stop? -> release phase
+  {
+   if(s_chan[ch].ADSR.ReleaseVal!=0)                   // -> release not 0: do release (if 0: stop right now)
+    {
+     if(!s_chan[ch].ADSR.ReleaseVol)                   // --> release just started? set up the release stuff
+      {
+       s_chan[ch].ADSR.ReleaseStartTime=s_chan[ch].ADSR.lTime;
+       s_chan[ch].ADSR.ReleaseVol=s_chan[ch].ADSR.lVolume;
+       s_chan[ch].ADSR.ReleaseTime =                   // --> calc how long does it take to reach the wanted sus level
+         (s_chan[ch].ADSR.ReleaseTime*
+          s_chan[ch].ADSR.ReleaseVol)/1024;
+      }
+                                                       // -> NO release exp mode used (yet)
+     v=s_chan[ch].ADSR.ReleaseVol;                     // -> get last volume
+     lT=s_chan[ch].ADSR.lTime-                         // -> how much time is past?
+        s_chan[ch].ADSR.ReleaseStartTime;
+     l1=s_chan[ch].ADSR.ReleaseTime;
+                                                       
+     if(lT<l1)                                         // -> we still have to release
+      {
+       v=v-((v*lT)/l1);                                // --> calc new volume
+      }
+     else                                              // -> release is over: now really stop that sample
+      {v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
+    }
+   else                                                // -> release IS 0: release at once
+    {
+     v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;
+    }
+  }
+ else                                               
+  {//--------------------------------------------------// not in release phase:
+   v=1024;
+   lT=s_chan[ch].ADSR.lTime;
+   l1=s_chan[ch].ADSR.AttackTime;
+                                                       
+   if(lT<l1)                                           // attack
+    {                                                  // no exp mode used (yet)
+//     if(s_chan[ch].ADSR.AttackModeExp)
+//      {
+//       v=(v*lT)/l1;
+//      }
+//     else
+      {
+       v=(v*lT)/l1;
+      }
+     if(v==0) v=1;
+    }
+   else                                                // decay
+    {                                                  // should be exp, but who cares? ;)
+     l2=s_chan[ch].ADSR.DecayTime;
+     v2=s_chan[ch].ADSR.SustainLevel;
+
+     lT-=l1;
+     if(lT<l2)
+      {
+       v-=(((v-v2)*lT)/l2);
+      }
+     else                                              // sustain
+      {                                                // no exp mode used (yet)
+       l3=s_chan[ch].ADSR.SustainTime;
+       lT-=l2;
+       if(s_chan[ch].ADSR.SustainModeDec>0)
+        {
+         if(l3!=0) v2+=((v-v2)*lT)/l3;
+         else      v2=v;
+        }
+       else
+        {
+         if(l3!=0) v2-=(v2*lT)/l3;
+         else      v2=v;
+        }
+
+       if(v2>v)  v2=v;
+       if(v2<=0) {v2=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
+
+       v=v2;
+      }
+    }
+  }
+
+ //----------------------------------------------------// 
+ // ok, done for this channel, so increase time
+
+ s_chan[ch].ADSR.lTime+=1;                             // 1 = 1.020408f ms;      
+
+ if(v>1024)     v=1024;                                // adjust volume
+ if(v<0)        v=0;                                  
+ s_chan[ch].ADSR.lVolume=v;                            // store act volume
+
+ return v;                                             // return the volume factor
+*/
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+
+/*
+-----------------------------------------------------------------------------
+Neill Corlett
+Playstation SPU envelope timing notes
+-----------------------------------------------------------------------------
+
+This is preliminary.  This may be wrong.  But the model described herein fits
+all of my experimental data, and it's just simple enough to sound right.
+
+ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.
+The value returned by channel reg 0xC is (envelope_level>>16).
+
+Each sample, an increment or decrement value will be added to or
+subtracted from this envelope level.
+
+Create the rate log table.  The values double every 4 entries.
+   entry #0 = 4
+
+    4, 5, 6, 7,
+    8,10,12,14,
+   16,20,24,28, ...
+
+   entry #40 = 4096...
+   entry #44 = 8192...
+   entry #48 = 16384...
+   entry #52 = 32768...
+   entry #56 = 65536...
+
+increments and decrements are in terms of ratelogtable[n]
+n may exceed the table bounds (plan on n being between -32 and 127).
+table values are all clipped between 0x00000000 and 0x3FFFFFFF
+
+when you "voice on", the envelope is always fully reset.
+(yes, it may click. the real thing does this too.)
+
+envelope level begins at zero.
+
+each state happens for at least 1 cycle
+(transitions are not instantaneous)
+this may result in some oddness: if the decay rate is uberfast, it will cut
+the envelope from full down to half in one sample, potentially skipping over
+the sustain level
+
+ATTACK
+------
+- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and
+  proceed to DECAY.
+
+Linear attack mode:
+- line extends upward to 0x7FFFFFFF
+- increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+
+Logarithmic attack mode:
+if envelope_level < 0x60000000:
+  - line extends upward to 0x60000000
+  - increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+else:
+  - line extends upward to 0x7FFFFFFF
+  - increment per sample is ratelogtable[(Ar^0x7F)-0x18]
+
+DECAY
+-----
+- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.
+  Do not clip to the sustain level.
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+  0: ratelogtable[(4*(Dr^0x1F))-0x18+0]
+  1: ratelogtable[(4*(Dr^0x1F))-0x18+4]
+  2: ratelogtable[(4*(Dr^0x1F))-0x18+6]
+  3: ratelogtable[(4*(Dr^0x1F))-0x18+8]
+  4: ratelogtable[(4*(Dr^0x1F))-0x18+9]
+  5: ratelogtable[(4*(Dr^0x1F))-0x18+10]
+  6: ratelogtable[(4*(Dr^0x1F))-0x18+11]
+  7: ratelogtable[(4*(Dr^0x1F))-0x18+12]
+  (note that this is the same as the release rate formula, except that
+   decay rates 10-1F aren't possible... those would be slower in theory)
+
+SUSTAIN
+-------
+- no terminating condition except for voice off
+- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.
+- Sd=1 (decrease) behavior:
+Linear sustain decrease:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]
+Logarithmic sustain decrease:
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+  0: ratelogtable[(Sr^0x7F)-0x1B+0]
+  1: ratelogtable[(Sr^0x7F)-0x1B+4]
+  2: ratelogtable[(Sr^0x7F)-0x1B+6]
+  3: ratelogtable[(Sr^0x7F)-0x1B+8]
+  4: ratelogtable[(Sr^0x7F)-0x1B+9]
+  5: ratelogtable[(Sr^0x7F)-0x1B+10]
+  6: ratelogtable[(Sr^0x7F)-0x1B+11]
+  7: ratelogtable[(Sr^0x7F)-0x1B+12]
+
+RELEASE
+-------
+- if the envelope level has overflowed to negative, clip to 0 and QUIT.
+
+Linear release mode:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]
+
+Logarithmic release mode:
+- line extends to (envelope_level & 0x0FFFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+  0: ratelogtable[(4*(Rr^0x1F))-0x18+0]
+  1: ratelogtable[(4*(Rr^0x1F))-0x18+4]
+  2: ratelogtable[(4*(Rr^0x1F))-0x18+6]
+  3: ratelogtable[(4*(Rr^0x1F))-0x18+8]
+  4: ratelogtable[(4*(Rr^0x1F))-0x18+9]
+  5: ratelogtable[(4*(Rr^0x1F))-0x18+10]
+  6: ratelogtable[(4*(Rr^0x1F))-0x18+11]
+  7: ratelogtable[(4*(Rr^0x1F))-0x18+12]
+
+-----------------------------------------------------------------------------
+*/
+
diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h
index ff2af1ff..e15031dc 100644
--- a/plugins/dfsound/adsr.h
+++ b/plugins/dfsound/adsr.h
@@ -1,19 +1,20 @@
-/***************************************************************************

-                           adsr.h  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-INLINE void StartADSR(int ch);

-INLINE int  MixADSR(int ch);

+/***************************************************************************
+                           adsr.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+INLINE void StartADSR(int ch);
+INLINE int  MixADSR(int ch);
+void InitADSR(void);
diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c
index 9414eee5..2bf42c9c 100644
--- a/plugins/dfsound/cfg.c
+++ b/plugins/dfsound/cfg.c
@@ -1,173 +1,177 @@
-/***************************************************************************

-                            cfg.c  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_CFG

-

-#include "externals.h"

-

-////////////////////////////////////////////////////////////////////////

-// LINUX CONFIG/ABOUT HANDLING

-////////////////////////////////////////////////////////////////////////

-

-#include <unistd.h>

-

-////////////////////////////////////////////////////////////////////////

-// START EXTERNAL CFG TOOL

-////////////////////////////////////////////////////////////////////////

-

-void StartCfgTool(char * pCmdLine)

-{

- FILE * cf;

- char filename[255];

-

- strcpy(filename,"cfgDFSound");

- cf=fopen(filename,"rb");

- if(cf!=NULL)

-  {

-   fclose(cf);

-   if(fork()==0)

-    {

-     execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);

-     exit(0);

-    }

-  }

- else

-  {

-   strcpy(filename,"cfg/cfgDFSound");

-   cf=fopen(filename,"rb");

-   if(cf!=NULL)

-    {

-     fclose(cf);

-     if(fork()==0)

-      {

-       chdir("cfg");

-       execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);

-       exit(0);

-      }

-    }

-   else

-    {

-     sprintf(filename,"%s/cfgDFSound",getenv("HOME"));

-     cf=fopen(filename,"rb");

-     if(cf!=NULL)

-      {

-       fclose(cf);

-       if(fork()==0)

-       {

-        chdir(getenv("HOME"));

-        execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);

-        exit(0);

-       }

-      }

-     else printf("Sound error: cfgDFSound not found!\n");

-    }

-  }

-}

-

-/////////////////////////////////////////////////////////

-// READ LINUX CONFIG FILE

-/////////////////////////////////////////////////////////

-

-void ReadConfigFile(void)

-{

- FILE *in;char t[256];int len;

- char * pB, * p;

-

- strcpy(t,"dfsound.cfg");

- in = fopen(t,"rb"); 

- if(!in) 

-  {

-   strcpy(t,"cfg/dfsound.cfg");

-   in = fopen(t,"rb"); 

-   if(!in) 

-    {

-     sprintf(t,"%s/dfsound.cfg",getenv("HOME")); 

-     in = fopen(t,"rb"); 

-     if(!in) return;

-    }

-  }

-

- pB = (char *)malloc(32767);

- memset(pB,0,32767);

-

- len = fread(pB, 1, 32767, in);

- fclose(in);

-

- strcpy(t,"\nVolume");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}

- if(p) iVolume=4-atoi(p+len);

- if(iVolume<1) iVolume=1;

- if(iVolume>5) iVolume=5;

-

- strcpy(t,"\nXAPitch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}

- if(p) iXAPitch=atoi(p+len);

- if(iXAPitch<0) iXAPitch=0;

- if(iXAPitch>1) iXAPitch=1;

-

- strcpy(t,"\nHighCompMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iUseTimer=atoi(p+len); 

- if(iUseTimer<0) iUseTimer=0; 

- // note: timer mode 1 (win time events) is not supported

- // in linux. But timer mode 2 (spuupdate) is safe to use.

- if(iUseTimer)   iUseTimer=2; 

-

- strcpy(t,"\nSPUIRQWait");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iSPUIRQWait=atoi(p+len); 

- if(iSPUIRQWait<0) iSPUIRQWait=0; 

- if(iSPUIRQWait>1) iSPUIRQWait=1; 

-

- strcpy(t,"\nUseReverb");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iUseReverb=atoi(p+len); 

- if(iUseReverb<0) iUseReverb=0; 

- if(iUseReverb>2) iUseReverb=2; 

-

- strcpy(t,"\nUseInterpolation");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iUseInterpolation=atoi(p+len); 

- if(iUseInterpolation<0) iUseInterpolation=0; 

- if(iUseInterpolation>3) iUseInterpolation=3; 

-

- strcpy(t,"\nDisStereo");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iDisStereo=atoi(p+len); 

- if(iDisStereo<0) iDisStereo=0; 

- if(iDisStereo>1) iDisStereo=1; 

-
- strcpy(t,"\nFreqResponse");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 

- if(p)  iFreqResponse=atoi(p+len); 

- if(iFreqResponse<0) iFreqResponse=0; 

- if(iFreqResponse>1) iFreqResponse=1; 

-

- free(pB);

-}

-

-/////////////////////////////////////////////////////////

-// READ CONFIG called by spu funcs

-/////////////////////////////////////////////////////////

-

-void ReadConfig(void)

-{

- iVolume=2;

- iXAPitch=0;

- iSPUIRQWait=1;

- iUseTimer=2;

- iUseReverb=2;

- iUseInterpolation=2;

- iDisStereo=0;

- iFreqResponse=0;

-

- ReadConfigFile();

-}

+/***************************************************************************
+                            cfg.c  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_CFG
+
+#include "cfg.h"
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// LINUX CONFIG/ABOUT HANDLING
+////////////////////////////////////////////////////////////////////////
+
+#include <unistd.h>
+
+////////////////////////////////////////////////////////////////////////
+// START EXTERNAL CFG TOOL
+////////////////////////////////////////////////////////////////////////
+
+void StartCfgTool(char * pCmdLine)
+{
+ FILE * cf;
+ char filename[255];
+
+ strcpy(filename,"cfgDFSound");
+ cf=fopen(filename,"rb");
+ if(cf!=NULL)
+  {
+   fclose(cf);
+   if(fork()==0)
+    {
+     execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
+     exit(0);
+    }
+  }
+ else
+  {
+   strcpy(filename,"cfg/cfgDFSound");
+   cf=fopen(filename,"rb");
+   if(cf!=NULL)
+    {
+     fclose(cf);
+     if(fork()==0)
+      {
+       if(chdir("cfg") != 0)
+	  perror("cfg");
+       execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
+       exit(0);
+      }
+    }
+   else
+    {
+     sprintf(filename,"%s/cfgDFSound",getenv("HOME"));
+     cf=fopen(filename,"rb");
+     if(cf!=NULL)
+      {
+       fclose(cf);
+       if(fork()==0)
+       {
+	if(chdir(getenv("HOME")) != 0)
+	   perror("HOME");
+        execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
+        exit(0);
+       }
+      }
+     else printf("Sound error: cfgDFSound not found!\n");
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////
+// READ LINUX CONFIG FILE
+/////////////////////////////////////////////////////////
+
+static void ReadConfigFile(void)
+{
+ FILE *in;char t[256];int len;
+ char * pB, * p;
+
+ strcpy(t,"dfsound.cfg");
+ in = fopen(t,"rb"); 
+ if(!in) 
+  {
+   strcpy(t,"cfg/dfsound.cfg");
+   in = fopen(t,"rb"); 
+   if(!in) 
+    {
+     sprintf(t,"%s/dfsound.cfg",getenv("HOME")); 
+     in = fopen(t,"rb"); 
+     if(!in) return;
+    }
+  }
+
+ pB = (char *)malloc(32767);
+ memset(pB,0,32767);
+
+ len = fread(pB, 1, 32767, in);
+ fclose(in);
+
+ strcpy(t,"\nVolume");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iVolume=4-atoi(p+len);
+ if(iVolume<1) iVolume=1;
+ if(iVolume>5) iVolume=5;
+
+ strcpy(t,"\nXAPitch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iXAPitch=atoi(p+len);
+ if(iXAPitch<0) iXAPitch=0;
+ if(iXAPitch>1) iXAPitch=1;
+
+ strcpy(t,"\nHighCompMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iUseTimer=atoi(p+len); 
+ if(iUseTimer<0) iUseTimer=0; 
+ // note: timer mode 1 (win time events) is not supported
+ // in linux. But timer mode 2 (spuupdate) is safe to use.
+ if(iUseTimer)   iUseTimer=2; 
+
+ strcpy(t,"\nSPUIRQWait");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iSPUIRQWait=atoi(p+len); 
+ if(iSPUIRQWait<0) iSPUIRQWait=0; 
+ if(iSPUIRQWait>1) iSPUIRQWait=1; 
+
+ strcpy(t,"\nUseReverb");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iUseReverb=atoi(p+len); 
+ if(iUseReverb<0) iUseReverb=0; 
+ if(iUseReverb>2) iUseReverb=2; 
+
+ strcpy(t,"\nUseInterpolation");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iUseInterpolation=atoi(p+len); 
+ if(iUseInterpolation<0) iUseInterpolation=0; 
+ if(iUseInterpolation>3) iUseInterpolation=3; 
+
+ strcpy(t,"\nDisStereo");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iDisStereo=atoi(p+len); 
+ if(iDisStereo<0) iDisStereo=0; 
+ if(iDisStereo>1) iDisStereo=1; 
+
+ strcpy(t,"\nFreqResponse");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p)  iFreqResponse=atoi(p+len); 
+ if(iFreqResponse<0) iFreqResponse=0; 
+ if(iFreqResponse>1) iFreqResponse=1; 
+
+ free(pB);
+}
+
+/////////////////////////////////////////////////////////
+// READ CONFIG called by spu funcs
+/////////////////////////////////////////////////////////
+
+void ReadConfig(void)
+{
+ iVolume=2;
+ iXAPitch=0;
+ iSPUIRQWait=1;
+ iUseTimer=2;
+ iUseReverb=2;
+ iUseInterpolation=2;
+ iDisStereo=0;
+ iFreqResponse=0;
+
+ ReadConfigFile();
+}
diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index b8a5c43d..011205b8 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -1,359 +1,361 @@
-/***************************************************************************

-                         externals.h  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include <stdint.h>

-

-/////////////////////////////////////////////////////////

-// generic defines

-/////////////////////////////////////////////////////////

-

-#define PSE_LT_SPU                  4

-#define PSE_SPU_ERR_SUCCESS         0

-#define PSE_SPU_ERR                 -60

-#define PSE_SPU_ERR_NOTCONFIGURED   PSE_SPU_ERR - 1

-#define PSE_SPU_ERR_INIT            PSE_SPU_ERR - 2

-#ifndef max

-#define max(a,b)            (((a) > (b)) ? (a) : (b))

-#define min(a,b)            (((a) < (b)) ? (a) : (b))

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// spu defines

-////////////////////////////////////////////////////////////////////////

-

-// sound buffer sizes

-// 400 ms complete sound buffer

-#define SOUNDSIZE   70560

-// 137 ms test buffer... if less than that is buffered, a new upload will happen

-#define TESTSIZE    24192

-

-// num of channels

-#define MAXCHAN     24

-

-

-// ~ 1 ms of data - somewhat slower than Eternal

-//#define NSSIZE 45

-//#define INTERVAL_TIME 1000

-

-// ~ 0.5 ms of data - roughly Eternal maybe

-//#define NSSIZE 23

-//#define INTERVAL_TIME 2000

-

-// ~ 0.25 ms of data - seems a little bad..?

-//#define NSSIZE 12

-//#define INTERVAL_TIME 4000

-

-#define NSSIZE 10

-#define APU_CYCLES_UPDATE NSSIZE

-

-

-// update times

-#if 0

-// PEOPS DSound 1.09a - good sound cards

-#define LATENCY 10

-#elif defined (_WINDOWS)

-// work on most cards

-#define LATENCY 25

-#else

-// work on most cards

-#define LATENCY 25

-#endif

-

-

-// make sure this is bigger than cpu action - no glitchy

-#define INTERVAL_TIME 4500

-

-

-#define CPU_CLOCK 33868800

-

-///////////////////////////////////////////////////////////

-// struct defines

-///////////////////////////////////////////////////////////

-

-// ADSR INFOS PER CHANNEL

-typedef struct

-{

- int            AttackModeExp;

- long           AttackTime;

- long           DecayTime;

- long           SustainLevel;

- int            SustainModeExp;

- long           SustainModeDec;

- long           SustainTime;

- int            ReleaseModeExp;

- unsigned long  ReleaseVal;

- long           ReleaseTime;

- long           ReleaseStartTime;

- long           ReleaseVol;

- long           lTime;

- long           lVolume;

-} ADSRInfo;

-

-typedef struct

-{

- int            State;

- int            AttackModeExp;

- int            AttackRate;

- int            DecayRate;

- int            SustainLevel;

- int            SustainModeExp;

- int            SustainIncrease;

- int            SustainRate;

- int            ReleaseModeExp;

- int            ReleaseRate;

- int            EnvelopeVol;

- int            EnvelopeVol_f;			// fraction

- long           lVolume;

- long           lDummy1;

- long           lDummy2;

-} ADSRInfoEx;

-

-///////////////////////////////////////////////////////////

-

-// Tmp Flags

-

-// used for debug channel muting

-#define FLAG_MUTE  1

-

-// used for simple interpolation

-#define FLAG_IPOL0 2

-#define FLAG_IPOL1 4

-

-///////////////////////////////////////////////////////////

-

-// MAIN CHANNEL STRUCT

-typedef struct

-{

- // no mutexes used anymore... don't need them to sync access

- //HANDLE            hMutex;

-

- int               bNew;                               // start flag

-

- int               iSBPos;                             // mixing stuff

- int               spos;

- int               sinc;

- int               SB[32+32];                          // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)

- int               sval;

-

- unsigned char *   pStart;                             // start ptr into sound mem

- unsigned char *   pCurr;                              // current pos in sound mem

- unsigned char *   pLoop;                              // loop ptr in sound mem

-

- int               bOn;                                // is channel active (sample playing?)

- int               bStop;                              // is channel stopped (sample _can_ still be playing, ADSR Release phase)

- int               bReverb;                            // can we do reverb on this channel? must have ctrl register bit, to get active

- int               iActFreq;                           // current psx pitch

- int               iUsedFreq;                          // current pc pitch

- int               iLeftVolume;                        // left volume

- int               iLeftVolRaw;                        // left psx volume value

- int               bIgnoreLoop;                        // ignore loop bit, if an external loop address is used

- int               iMute;                              // mute mode (debug)

- int               iSilent;                            // voice on - sound on/off

- int               iRightVolume;                       // right volume

- int               iRightVolRaw;                       // right psx volume value

- int               iRawPitch;                          // raw pitch (0...3fff)

- int               iIrqDone;                           // debug irq done flag

- int               s_1;                                // last decoding infos

- int               s_2;

- int               bRVBActive;                         // reverb active flag

- int               iRVBOffset;                         // reverb offset

- int               iRVBRepeat;                         // reverb repeat

- int               bNoise;                             // noise active flag

- int               bFMod;                              // freq mod (0=off, 1=sound channel, 2=freq channel)

- int               iRVBNum;                            // another reverb helper

- int               iOldNoise;                          // old noise val for this channel

- ADSRInfo          ADSR;                               // active ADSR settings

- ADSRInfoEx        ADSRX;                              // next ADSR settings (will be moved to active on sample start)

-} SPUCHAN;

-

-///////////////////////////////////////////////////////////

-

-typedef struct

-{

- int StartAddr;      // reverb area start addr in samples

- int CurrAddr;       // reverb area curr addr in samples

-

- int VolLeft;

- int VolRight;

- int iLastRVBLeft;

- int iLastRVBRight;

- int iRVBLeft;

- int iRVBRight;

-

- int FB_SRC_A;       // (offset)

- int FB_SRC_B;       // (offset)

- int IIR_ALPHA;      // (coef.)

- int ACC_COEF_A;     // (coef.)

- int ACC_COEF_B;     // (coef.)

- int ACC_COEF_C;     // (coef.)

- int ACC_COEF_D;     // (coef.)

- int IIR_COEF;       // (coef.)

- int FB_ALPHA;       // (coef.)

- int FB_X;           // (coef.)

- int IIR_DEST_A0;    // (offset)

- int IIR_DEST_A1;    // (offset)

- int ACC_SRC_A0;     // (offset)

- int ACC_SRC_A1;     // (offset)

- int ACC_SRC_B0;     // (offset)

- int ACC_SRC_B1;     // (offset)

- int IIR_SRC_A0;     // (offset)

- int IIR_SRC_A1;     // (offset)

- int IIR_DEST_B0;    // (offset)

- int IIR_DEST_B1;    // (offset)

- int ACC_SRC_C0;     // (offset)

- int ACC_SRC_C1;     // (offset)

- int ACC_SRC_D0;     // (offset)

- int ACC_SRC_D1;     // (offset)

- int IIR_SRC_B1;     // (offset)

- int IIR_SRC_B0;     // (offset)

- int MIX_DEST_A0;    // (offset)

- int MIX_DEST_A1;    // (offset)

- int MIX_DEST_B0;    // (offset)

- int MIX_DEST_B1;    // (offset)

- int IN_COEF_L;      // (coef.)

- int IN_COEF_R;      // (coef.)

-} REVERBInfo;

-

-#ifdef _WINDOWS

-extern HINSTANCE hInst;

-#define WM_MUTE (WM_USER+543)

-#endif

-

-///////////////////////////////////////////////////////////

-// SPU.C globals

-///////////////////////////////////////////////////////////

-

-#ifndef _IN_SPU

-

-// psx buffers / addresses

-

-extern unsigned short  regArea[];

-extern unsigned short  spuMem[];

-extern unsigned char * spuMemC;

-extern unsigned char * pSpuIrq;

-extern unsigned char * pSpuBuffer;

-

-// user settings

-

-extern int        iVolume;

-extern int        iXAPitch;

-extern int        iUseTimer;

-extern int        iSPUIRQWait;

-extern int        iDebugMode;

-extern int        iRecordMode;

-extern int        iUseReverb;

-extern int        iUseInterpolation;

-extern int        iDisStereo;

-extern int				iFreqResponse;

-// MISC

-

-extern int iSpuAsyncWait;

-

-extern SPUCHAN s_chan[];

-extern REVERBInfo rvb;

-

-extern unsigned long dwNoiseVal;

-extern unsigned long dwNoiseClock;

-extern unsigned long dwNoiseCount;

-extern unsigned short spuCtrl;

-extern unsigned short spuStat;

-extern unsigned short spuIrq;

-extern unsigned long  spuAddr;

-extern int      bEndThread;

-extern int      bThreadEnded;

-extern int      bSpuInit;

-extern uint32_t dwNewChannel;

-

-extern int      SSumR[];

-extern int      SSumL[];

-extern int      iCycle;

-extern short *  pS;

-

-#ifdef _WINDOWS

-extern HWND    hWMain;                               // window handle

-extern HWND    hWDebug;

-#endif

-

-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);

-

-#endif

-

-///////////////////////////////////////////////////////////

-// DSOUND.C globals

-///////////////////////////////////////////////////////////

-

-#ifndef _IN_DSOUND

-

-#ifdef _WINDOWS

-extern unsigned long LastWrite;

-extern unsigned long LastPlay;

-#endif

-

-#endif

-

-///////////////////////////////////////////////////////////

-// RECORD.C globals

-///////////////////////////////////////////////////////////

-

-#ifndef _IN_RECORD

-

-#ifdef _WINDOWS

-extern int iDoRecord;

-#endif

-

-#endif

-

-///////////////////////////////////////////////////////////

-// XA.C globals

-///////////////////////////////////////////////////////////

-

-#ifndef _IN_XA

-

-extern xa_decode_t   * xapGlobal;

-

-extern uint32_t * XAFeed;

-extern uint32_t * XAPlay;

-extern uint32_t * XAStart;

-extern uint32_t * XAEnd;

-

-extern uint32_t   XARepeat;

-extern uint32_t   XALastVal;

-

-extern uint32_t * CDDAFeed;

-extern uint32_t * CDDAPlay;

-extern uint32_t * CDDAStart;

-extern uint32_t * CDDAEnd;

-

-extern int           iLeftXAVol;

-extern int           iRightXAVol;

-

-#endif

-

-///////////////////////////////////////////////////////////

-// REVERB.C globals

-///////////////////////////////////////////////////////////

-

-#ifndef _IN_REVERB

-

-extern int *          sRVBPlay;

-extern int *          sRVBEnd;

-extern int *          sRVBStart;

-extern int            iReverbOff;

-extern int            iReverbRepeat;

-extern int            iReverbNum;

-

-#endif

+/***************************************************************************
+                         externals.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <stdint.h>
+
+#include "psemu_plugin_defs.h"
+
+/////////////////////////////////////////////////////////
+// generic defines
+/////////////////////////////////////////////////////////
+
+#define PSE_LT_SPU                  4
+#define PSE_SPU_ERR_SUCCESS         0
+#define PSE_SPU_ERR                 -60
+#define PSE_SPU_ERR_NOTCONFIGURED   PSE_SPU_ERR - 1
+#define PSE_SPU_ERR_INIT            PSE_SPU_ERR - 2
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// spu defines
+////////////////////////////////////////////////////////////////////////
+
+// sound buffer sizes
+// 400 ms complete sound buffer
+#define SOUNDSIZE   70560
+// 137 ms test buffer... if less than that is buffered, a new upload will happen
+#define TESTSIZE    24192
+
+// num of channels
+#define MAXCHAN     24
+
+
+// ~ 1 ms of data - somewhat slower than Eternal
+//#define NSSIZE 45
+//#define INTERVAL_TIME 1000
+
+// ~ 0.5 ms of data - roughly Eternal maybe
+//#define NSSIZE 23
+//#define INTERVAL_TIME 2000
+
+// ~ 0.25 ms of data - seems a little bad..?
+//#define NSSIZE 12
+//#define INTERVAL_TIME 4000
+
+#define NSSIZE 10
+#define APU_CYCLES_UPDATE NSSIZE
+
+
+// update times
+#if 0
+// PEOPS DSound 1.09a - good sound cards
+#define LATENCY 10
+#elif defined (_WINDOWS)
+// work on most cards
+#define LATENCY 25
+#else
+// work on most cards
+#define LATENCY 25
+#endif
+
+
+// make sure this is bigger than cpu action - no glitchy
+#define INTERVAL_TIME 4500
+
+
+#define CPU_CLOCK 33868800
+
+///////////////////////////////////////////////////////////
+// struct defines
+///////////////////////////////////////////////////////////
+
+// ADSR INFOS PER CHANNEL
+typedef struct
+{
+ int            AttackModeExp;
+ long           AttackTime;
+ long           DecayTime;
+ long           SustainLevel;
+ int            SustainModeExp;
+ long           SustainModeDec;
+ long           SustainTime;
+ int            ReleaseModeExp;
+ unsigned long  ReleaseVal;
+ long           ReleaseTime;
+ long           ReleaseStartTime;
+ long           ReleaseVol;
+ long           lTime;
+ long           lVolume;
+} ADSRInfo;
+
+typedef struct
+{
+ int            State;
+ int            AttackModeExp;
+ int            AttackRate;
+ int            DecayRate;
+ int            SustainLevel;
+ int            SustainModeExp;
+ int            SustainIncrease;
+ int            SustainRate;
+ int            ReleaseModeExp;
+ int            ReleaseRate;
+ int            EnvelopeVol;
+ int            EnvelopeVol_f;			// fraction
+ long           lVolume;
+ long           lDummy1;
+ long           lDummy2;
+} ADSRInfoEx;
+
+///////////////////////////////////////////////////////////
+
+// Tmp Flags
+
+// used for debug channel muting
+#define FLAG_MUTE  1
+
+// used for simple interpolation
+#define FLAG_IPOL0 2
+#define FLAG_IPOL1 4
+
+///////////////////////////////////////////////////////////
+
+// MAIN CHANNEL STRUCT
+typedef struct
+{
+ // no mutexes used anymore... don't need them to sync access
+ //HANDLE            hMutex;
+
+ int               bNew;                               // start flag
+
+ int               iSBPos;                             // mixing stuff
+ int               spos;
+ int               sinc;
+ int               SB[32+32];                          // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)
+ int               sval;
+
+ unsigned char *   pStart;                             // start ptr into sound mem
+ unsigned char *   pCurr;                              // current pos in sound mem
+ unsigned char *   pLoop;                              // loop ptr in sound mem
+
+ int               bOn;                                // is channel active (sample playing?)
+ int               bStop;                              // is channel stopped (sample _can_ still be playing, ADSR Release phase)
+ int               bReverb;                            // can we do reverb on this channel? must have ctrl register bit, to get active
+ int               iActFreq;                           // current psx pitch
+ int               iUsedFreq;                          // current pc pitch
+ int               iLeftVolume;                        // left volume
+ int               iLeftVolRaw;                        // left psx volume value
+ int               bIgnoreLoop;                        // ignore loop bit, if an external loop address is used
+ int               iMute;                              // mute mode (debug)
+ int               iSilent;                            // voice on - sound on/off
+ int               iRightVolume;                       // right volume
+ int               iRightVolRaw;                       // right psx volume value
+ int               iRawPitch;                          // raw pitch (0...3fff)
+ int               iIrqDone;                           // debug irq done flag
+ int               s_1;                                // last decoding infos
+ int               s_2;
+ int               bRVBActive;                         // reverb active flag
+ int               iRVBOffset;                         // reverb offset
+ int               iRVBRepeat;                         // reverb repeat
+ int               bNoise;                             // noise active flag
+ int               bFMod;                              // freq mod (0=off, 1=sound channel, 2=freq channel)
+ int               iRVBNum;                            // another reverb helper
+ int               iOldNoise;                          // old noise val for this channel
+ ADSRInfo          ADSR;                               // active ADSR settings
+ ADSRInfoEx        ADSRX;                              // next ADSR settings (will be moved to active on sample start)
+} SPUCHAN;
+
+///////////////////////////////////////////////////////////
+
+typedef struct
+{
+ int StartAddr;      // reverb area start addr in samples
+ int CurrAddr;       // reverb area curr addr in samples
+
+ int VolLeft;
+ int VolRight;
+ int iLastRVBLeft;
+ int iLastRVBRight;
+ int iRVBLeft;
+ int iRVBRight;
+
+ int FB_SRC_A;       // (offset)
+ int FB_SRC_B;       // (offset)
+ int IIR_ALPHA;      // (coef.)
+ int ACC_COEF_A;     // (coef.)
+ int ACC_COEF_B;     // (coef.)
+ int ACC_COEF_C;     // (coef.)
+ int ACC_COEF_D;     // (coef.)
+ int IIR_COEF;       // (coef.)
+ int FB_ALPHA;       // (coef.)
+ int FB_X;           // (coef.)
+ int IIR_DEST_A0;    // (offset)
+ int IIR_DEST_A1;    // (offset)
+ int ACC_SRC_A0;     // (offset)
+ int ACC_SRC_A1;     // (offset)
+ int ACC_SRC_B0;     // (offset)
+ int ACC_SRC_B1;     // (offset)
+ int IIR_SRC_A0;     // (offset)
+ int IIR_SRC_A1;     // (offset)
+ int IIR_DEST_B0;    // (offset)
+ int IIR_DEST_B1;    // (offset)
+ int ACC_SRC_C0;     // (offset)
+ int ACC_SRC_C1;     // (offset)
+ int ACC_SRC_D0;     // (offset)
+ int ACC_SRC_D1;     // (offset)
+ int IIR_SRC_B1;     // (offset)
+ int IIR_SRC_B0;     // (offset)
+ int MIX_DEST_A0;    // (offset)
+ int MIX_DEST_A1;    // (offset)
+ int MIX_DEST_B0;    // (offset)
+ int MIX_DEST_B1;    // (offset)
+ int IN_COEF_L;      // (coef.)
+ int IN_COEF_R;      // (coef.)
+} REVERBInfo;
+
+#ifdef _WINDOWS
+extern HINSTANCE hInst;
+#define WM_MUTE (WM_USER+543)
+#endif
+
+///////////////////////////////////////////////////////////
+// SPU.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_SPU
+
+// psx buffers / addresses
+
+extern unsigned short  regArea[];
+extern unsigned short  spuMem[];
+extern unsigned char * spuMemC;
+extern unsigned char * pSpuIrq;
+extern unsigned char * pSpuBuffer;
+
+// user settings
+
+extern int        iVolume;
+extern int        iXAPitch;
+extern int        iUseTimer;
+extern int        iSPUIRQWait;
+extern int        iDebugMode;
+extern int        iRecordMode;
+extern int        iUseReverb;
+extern int        iUseInterpolation;
+extern int        iDisStereo;
+extern int				iFreqResponse;
+// MISC
+
+extern int iSpuAsyncWait;
+
+extern SPUCHAN s_chan[];
+extern REVERBInfo rvb;
+
+extern unsigned long dwNoiseVal;
+extern unsigned long dwNoiseClock;
+extern unsigned long dwNoiseCount;
+extern unsigned short spuCtrl;
+extern unsigned short spuStat;
+extern unsigned short spuIrq;
+extern unsigned long  spuAddr;
+extern int      bEndThread;
+extern int      bThreadEnded;
+extern int      bSpuInit;
+extern uint32_t dwNewChannel;
+
+extern int      SSumR[];
+extern int      SSumL[];
+extern int      iCycle;
+extern short *  pS;
+
+#ifdef _WINDOWS
+extern HWND    hWMain;                               // window handle
+extern HWND    hWDebug;
+#endif
+
+extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+
+#endif
+
+///////////////////////////////////////////////////////////
+// DSOUND.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_DSOUND
+
+#ifdef _WINDOWS
+extern unsigned long LastWrite;
+extern unsigned long LastPlay;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// RECORD.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_RECORD
+
+#ifdef _WINDOWS
+extern int iDoRecord;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// XA.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_XA
+
+extern xa_decode_t   * xapGlobal;
+
+extern uint32_t * XAFeed;
+extern uint32_t * XAPlay;
+extern uint32_t * XAStart;
+extern uint32_t * XAEnd;
+
+extern uint32_t   XARepeat;
+extern uint32_t   XALastVal;
+
+extern uint32_t * CDDAFeed;
+extern uint32_t * CDDAPlay;
+extern uint32_t * CDDAStart;
+extern uint32_t * CDDAEnd;
+
+extern int           iLeftXAVol;
+extern int           iRightXAVol;
+
+#endif
+
+///////////////////////////////////////////////////////////
+// REVERB.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_REVERB
+
+extern int *          sRVBPlay;
+extern int *          sRVBEnd;
+extern int *          sRVBStart;
+extern int            iReverbOff;
+extern int            iReverbRepeat;
+extern int            iReverbNum;
+
+#endif
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 156fd693..f724568f 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -1,235 +1,223 @@
-/***************************************************************************

-                          freeze.c  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_FREEZE

-

-#include "externals.h"

-#include "registers.h"

-#include "spu.h"

-#include "regs.h"

-

-////////////////////////////////////////////////////////////////////////

-// freeze structs

-////////////////////////////////////////////////////////////////////////

-

-typedef struct

-{

- char          szSPUName[8];

- uint32_t ulFreezeVersion;

- uint32_t ulFreezeSize;

- unsigned char cSPUPort[0x200];

- unsigned char cSPURam[0x80000];

- xa_decode_t   xaS;     

-} SPUFreeze_t;

-

-typedef struct

-{

- unsigned short  spuIrq;

- uint32_t   pSpuIrq;

- uint32_t   spuAddr;

- uint32_t   dummy1;

- uint32_t   dummy2;

- uint32_t   dummy3;

-

- SPUCHAN  s_chan[MAXCHAN];   

-

-} SPUOSSFreeze_t;

-

-////////////////////////////////////////////////////////////////////////

-

-void LoadStateV5(SPUFreeze_t * pF);                    // newest version

-void LoadStateUnknown(SPUFreeze_t * pF);               // unknown format

-

-extern int lastch;

-

-////////////////////////////////////////////////////////////////////////

-// SPUFREEZE: called by main emu on savestate load/save

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)

-{

- int i;SPUOSSFreeze_t * pFO;

-

- if(!pF) return 0;                                     // first check

-

- if(!bSpuInit) return 0;

-

- if(ulFreezeMode)                                      // info or save?

-  {//--------------------------------------------------//

-   if(ulFreezeMode==1)                                 

-    memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));

-

-   strcpy(pF->szSPUName,"PBOSS");

-   pF->ulFreezeVersion=5;

-   pF->ulFreezeSize=sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t);

-

-   if(ulFreezeMode==2) return 1;                       // info mode? ok, bye

-                                                       // save mode:

-   RemoveTimer();                                      // stop timer

-

-   memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos

-   memcpy(pF->cSPUPort,regArea,0x200);

-

-   if(xapGlobal && XAPlay!=XAFeed)                     // some xa

-    {

-     pF->xaS=*xapGlobal;     

-    }

-   else 

-   memset(&pF->xaS,0,sizeof(xa_decode_t));             // or clean xa

-

-   pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff

-

-   pFO->spuIrq=spuIrq;

-   if(pSpuIrq)  pFO->pSpuIrq  = (unsigned long)pSpuIrq-(unsigned long)spuMemC;

-

-   pFO->spuAddr=spuAddr;

-   if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;

-

-   for(i=0;i<MAXCHAN;i++)

-    {

-     memcpy((void *)&pFO->s_chan[i],(void *)&s_chan[i],sizeof(SPUCHAN));

-     if(pFO->s_chan[i].pStart)

-      pFO->s_chan[i].pStart-=(unsigned long)spuMemC;

-     if(pFO->s_chan[i].pCurr)

-      pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;

-     if(pFO->s_chan[i].pLoop)

-      pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;

-    }

-

-   SetupTimer();                                       // sound processing on again

-

-   return 1;

-   //--------------------------------------------------//

-  }

-                                                       

- if(ulFreezeMode!=0) return 0;                         // bad mode? bye

-

-#ifdef _WINDOWS

- if(iDebugMode && IsWindow(hWDebug))                   // clean debug mute infos

-  SendMessage(hWDebug,WM_MUTE,0,0);

- if(IsBadReadPtr(pF,sizeof(SPUFreeze_t)))              // check bad emu stuff

-  return 0;

-#endif

-

- RemoveTimer();                                        // we stop processing while doing the save!

-

- memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram

- memcpy(regArea,pF->cSPUPort,0x200);

-

- if(pF->xaS.nsamples<=4032)                            // start xa again

-  SPUplayADPCMchannel(&pF->xaS);

-

- xapGlobal=0;

-

- if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)

-   LoadStateV5(pF);

- else LoadStateUnknown(pF);

-

- lastch = -1;

-

- // repair some globals

- for(i=0;i<=62;i+=2)

-  SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);

- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);

- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);

- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);

-

- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));

- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);

- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);

- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);

-

- // fix to prevent new interpolations from crashing

- for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;

-

- SetupTimer();                                         // start sound processing again

-

- // stop load crackling

- //cpu_cycles = 0;

- //iCycle = 0;

-

- // fix movie lag

- CDDAEnd   = CDDAStart + 44100;

- CDDAPlay  = CDDAStart;

- CDDAFeed  = CDDAStart;

-

- XAPlay  = XAStart;

- XAFeed  = XAStart;

- XAEnd   = XAStart + 44100;

-

- return 1;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void LoadStateV5(SPUFreeze_t * pF)

-{

- int i;SPUOSSFreeze_t * pFO;

-

- pFO=(SPUOSSFreeze_t *)(pF+1);

-

- spuIrq = pFO->spuIrq;

- if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;

-

- if(pFO->spuAddr)

-  {

-   spuAddr = pFO->spuAddr;

-   if (spuAddr == 0xbaadf00d) spuAddr = 0;

-  }

-

- for(i=0;i<MAXCHAN;i++)

-  {

-   memcpy((void *)&s_chan[i],(void *)&pFO->s_chan[i],sizeof(SPUCHAN));

-

-   s_chan[i].pStart+=(unsigned long)spuMemC;

-   s_chan[i].pCurr+=(unsigned long)spuMemC;

-   s_chan[i].pLoop+=(unsigned long)spuMemC;

-   s_chan[i].iMute=0;

-   s_chan[i].iIrqDone=0;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void LoadStateUnknown(SPUFreeze_t * pF)

-{

- int i;

-

- for(i=0;i<MAXCHAN;i++)

-  {

-   s_chan[i].bOn=0;

-   s_chan[i].bNew=0;

-   s_chan[i].bStop=0;

-   s_chan[i].ADSR.lVolume=0;

-   s_chan[i].pLoop=(unsigned char *)((int)spuMemC+4096);

-   s_chan[i].pStart=(unsigned char *)((int)spuMemC+4096);

-   s_chan[i].iMute=0;

-   s_chan[i].iIrqDone=0;

-  }

-

- dwNewChannel=0;

- pSpuIrq=0;

-

- for(i=0;i<0xc0;i++)

-  {

-   SPUwriteRegister(0x1f801c00+i*2,regArea[i]);

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

+/***************************************************************************
+                          freeze.c  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_FREEZE
+
+#include "externals.h"
+#include "registers.h"
+#include "spu.h"
+#include "regs.h"
+
+////////////////////////////////////////////////////////////////////////
+// freeze structs
+////////////////////////////////////////////////////////////////////////
+
+typedef struct
+{
+ unsigned short  spuIrq;
+ uint32_t   pSpuIrq;
+ uint32_t   spuAddr;
+ uint32_t   dummy1;
+ uint32_t   dummy2;
+ uint32_t   dummy3;
+
+ SPUCHAN  s_chan[MAXCHAN];   
+
+} SPUOSSFreeze_t;
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateV5(SPUFreeze_t * pF);                    // newest version
+void LoadStateUnknown(SPUFreeze_t * pF);               // unknown format
+
+////////////////////////////////////////////////////////////////////////
+// SPUFREEZE: called by main emu on savestate load/save
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
+{
+ int i;SPUOSSFreeze_t * pFO;
+
+ if(!pF) return 0;                                     // first check
+
+ if(!bSpuInit) return 0;
+
+ if(ulFreezeMode)                                      // info or save?
+  {//--------------------------------------------------//
+   if(ulFreezeMode==1)                                 
+    memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));
+
+   strcpy(pF->PluginName,"PBOSS");
+   pF->PluginVersion=5;
+   pF->Size=sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t);
+
+   if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
+                                                       // save mode:
+   RemoveTimer();                                      // stop timer
+
+   memcpy(pF->SPURam,spuMem,0x80000);                 // copy common infos
+   memcpy(pF->SPUPorts,regArea,0x200);
+
+   if(xapGlobal && XAPlay!=XAFeed)                     // some xa
+    {
+     pF->xa=*xapGlobal;     
+    }
+   else 
+   memset(&pF->xa,0,sizeof(xa_decode_t));             // or clean xa
+
+   pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff
+
+   pFO->spuIrq=spuIrq;
+   if(pSpuIrq)  pFO->pSpuIrq  = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
+
+   pFO->spuAddr=spuAddr;
+   if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
+
+   for(i=0;i<MAXCHAN;i++)
+    {
+     memcpy((void *)&pFO->s_chan[i],(void *)&s_chan[i],sizeof(SPUCHAN));
+     if(pFO->s_chan[i].pStart)
+      pFO->s_chan[i].pStart-=(unsigned long)spuMemC;
+     if(pFO->s_chan[i].pCurr)
+      pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
+     if(pFO->s_chan[i].pLoop)
+      pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
+    }
+
+   SetupTimer();                                       // sound processing on again
+
+   return 1;
+   //--------------------------------------------------//
+  }
+                                                       
+ if(ulFreezeMode!=0) return 0;                         // bad mode? bye
+
+#ifdef _WINDOWS
+ if(iDebugMode && IsWindow(hWDebug))                   // clean debug mute infos
+  SendMessage(hWDebug,WM_MUTE,0,0);
+ if(IsBadReadPtr(pF,sizeof(SPUFreeze_t)))              // check bad emu stuff
+  return 0;
+#endif
+
+ RemoveTimer();                                        // we stop processing while doing the save!
+
+ memcpy(spuMem,pF->SPURam,0x80000);                   // get ram
+ memcpy(regArea,pF->SPUPorts,0x200);
+
+ if(pF->xa.nsamples<=4032)                            // start xa again
+  SPUplayADPCMchannel(&pF->xa);
+
+ xapGlobal=0;
+
+ if(!strcmp(pF->PluginName,"PBOSS") && pF->PluginVersion==5)
+   LoadStateV5(pF);
+ else LoadStateUnknown(pF);
+
+ lastch = -1;
+
+ // repair some globals
+ for(i=0;i<=62;i+=2)
+  SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
+ SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);
+ SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);
+ SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);
+
+ SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));
+ SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);
+ SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);
+ SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);
+
+ // fix to prevent new interpolations from crashing
+ for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
+
+ SetupTimer();                                         // start sound processing again
+
+ // stop load crackling
+ //cpu_cycles = 0;
+ //iCycle = 0;
+
+ // fix movie lag
+ CDDAEnd   = CDDAStart + 44100;
+ CDDAPlay  = CDDAStart;
+ CDDAFeed  = CDDAStart;
+
+ XAPlay  = XAStart;
+ XAFeed  = XAStart;
+ XAEnd   = XAStart + 44100;
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateV5(SPUFreeze_t * pF)
+{
+ int i;SPUOSSFreeze_t * pFO;
+
+ pFO=(SPUOSSFreeze_t *)(pF+1);
+
+ spuIrq = pFO->spuIrq;
+ if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;
+
+ if(pFO->spuAddr)
+  {
+   spuAddr = pFO->spuAddr;
+   if (spuAddr == 0xbaadf00d) spuAddr = 0;
+  }
+
+ for(i=0;i<MAXCHAN;i++)
+  {
+   memcpy((void *)&s_chan[i],(void *)&pFO->s_chan[i],sizeof(SPUCHAN));
+
+   s_chan[i].pStart+=(unsigned long)spuMemC;
+   s_chan[i].pCurr+=(unsigned long)spuMemC;
+   s_chan[i].pLoop+=(unsigned long)spuMemC;
+   s_chan[i].iMute=0;
+   s_chan[i].iIrqDone=0;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateUnknown(SPUFreeze_t * pF)
+{
+ int i;
+
+ for(i=0;i<MAXCHAN;i++)
+  {
+   s_chan[i].bOn=0;
+   s_chan[i].bNew=0;
+   s_chan[i].bStop=0;
+   s_chan[i].ADSR.lVolume=0;
+   s_chan[i].pLoop=(unsigned char *)((unsigned long)spuMemC+4096);
+   s_chan[i].pStart=(unsigned char *)((unsigned long)spuMemC+4096);
+   s_chan[i].iMute=0;
+   s_chan[i].iIrqDone=0;
+  }
+
+ dwNewChannel=0;
+ pSpuIrq=0;
+
+ for(i=0;i<0xc0;i++)
+  {
+   SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
diff --git a/plugins/dfsound/nullsnd.c b/plugins/dfsound/nullsnd.c
index bf079094..87046642 100644
--- a/plugins/dfsound/nullsnd.c
+++ b/plugins/dfsound/nullsnd.c
@@ -2,6 +2,8 @@
 #define _IN_OSS
 #include "externals.h"
 
+#include "dsoundoss.h"
+
 // SETUP SOUND
 void SetupSound(void)
 {
diff --git a/plugins/dfsound/oss.c b/plugins/dfsound/oss.c
index f4dd215d..d39412d9 100644
--- a/plugins/dfsound/oss.c
+++ b/plugins/dfsound/oss.c
@@ -21,6 +21,8 @@
 
 #include "externals.h"
 
+#include <errno.h>
+
 ////////////////////////////////////////////////////////////////////////
 // oss globals
 ////////////////////////////////////////////////////////////////////////
@@ -31,7 +33,6 @@
 #define OSS_SPEED_44100     44100
 
 static int oss_audio_fd = -1;
-extern int errno;
 
 ////////////////////////////////////////////////////////////////////////
 // SETUP SOUND
diff --git a/plugins/dfsound/pulseaudio.c b/plugins/dfsound/pulseaudio.c
index 60051557..2185d149 100644
--- a/plugins/dfsound/pulseaudio.c
+++ b/plugins/dfsound/pulseaudio.c
@@ -26,6 +26,8 @@ comment              : Much of this was taken from simple.c, in the pulseaudio
 #include "externals.h"
 #include <pulse/pulseaudio.h>
 
+#include "dsoundoss.h"
+
 ////////////////////////////////////////////////////////////////////////
 // pulseaudio structs
 ////////////////////////////////////////////////////////////////////////
diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index 92e31fcb..dfab03a4 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -1,462 +1,463 @@
-/***************************************************************************

-                          reverb.c  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_REVERB

-

-// will be included from spu.c

-#ifdef _IN_SPU

-

-////////////////////////////////////////////////////////////////////////

-// globals

-////////////////////////////////////////////////////////////////////////

-

-// REVERB info and timing vars...

-

-int *          sRVBPlay      = 0;

-int *          sRVBEnd       = 0;

-int *          sRVBStart     = 0;

-int            iReverbOff    = -1;                          // some delay factor for reverb

-int            iReverbRepeat = 0;

-int            iReverbNum    = 1;    

-

-////////////////////////////////////////////////////////////////////////

-// SET REVERB

-////////////////////////////////////////////////////////////////////////

-

-void SetREVERB(unsigned short val)

-{

- switch(val)

-  {

-   case 0x0000: iReverbOff=-1;  break;                                         // off

-   case 0x007D: iReverbOff=32;  iReverbNum=2; iReverbRepeat=128;  break;       // ok room

-

-   case 0x0033: iReverbOff=32;  iReverbNum=2; iReverbRepeat=64;   break;       // studio small

-   case 0x00B1: iReverbOff=48;  iReverbNum=2; iReverbRepeat=96;   break;       // ok studio medium

-   case 0x00E3: iReverbOff=64;  iReverbNum=2; iReverbRepeat=128;  break;       // ok studio large ok

-

-   case 0x01A5: iReverbOff=128; iReverbNum=4; iReverbRepeat=32;   break;       // ok hall

-   case 0x033D: iReverbOff=256; iReverbNum=4; iReverbRepeat=64;   break;       // space echo

-   case 0x0001: iReverbOff=184; iReverbNum=3; iReverbRepeat=128;  break;       // echo/delay

-   case 0x0017: iReverbOff=128; iReverbNum=2; iReverbRepeat=128;  break;       // half echo

-   default:     iReverbOff=32;  iReverbNum=1; iReverbRepeat=0;    break;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// START REVERB

-////////////////////////////////////////////////////////////////////////

-

-INLINE void StartREVERB(int ch)

-{

- if(s_chan[ch].bReverb && (spuCtrl&0x80))              // reverb possible?

-  {

-   if(iUseReverb==2) s_chan[ch].bRVBActive=1;

-   else

-   if(iUseReverb==1 && iReverbOff>0)                   // -> fake reverb used?

-    {

-     s_chan[ch].bRVBActive=1;                            // -> activate it

-     s_chan[ch].iRVBOffset=iReverbOff*45;

-     s_chan[ch].iRVBRepeat=iReverbRepeat*45;

-     s_chan[ch].iRVBNum   =iReverbNum;

-    }

-  }

- else s_chan[ch].bRVBActive=0;                         // else -> no reverb

-}

-

-////////////////////////////////////////////////////////////////////////

-// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf

-////////////////////////////////////////////////////////////////////////

-

-INLINE void InitREVERB(void)

-{

- if(iUseReverb==2)

-  {memset(sRVBStart,0,NSSIZE*2*4);}

-}

-

-////////////////////////////////////////////////////////////////////////

-// STORE REVERB

-////////////////////////////////////////////////////////////////////////

-

-INLINE void StoreREVERB(int ch,int ns)

-{

- if(iUseReverb==0) return;

- else

- if(iUseReverb==2) // -------------------------------- // Neil's reverb

-  {

-   const int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x4000;

-   const int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x4000;

-

-   ns<<=1;

-

-   *(sRVBStart+ns)  +=iRxl;                            // -> we mix all active reverb channels into an extra buffer

-   *(sRVBStart+ns+1)+=iRxr;

-  }

- else // --------------------------------------------- // Pete's easy fake reverb

-  {

-   int * pN;int iRn,iRr=0;

-

-   // we use the half channel volume (/0x8000) for the first reverb effects, quarter for next and so on

-

-   int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x8000;

-   int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x8000;

- 

-   for(iRn=1;iRn<=s_chan[ch].iRVBNum;iRn++,iRr+=s_chan[ch].iRVBRepeat,iRxl/=2,iRxr/=2)

-    {

-     pN=sRVBPlay+((s_chan[ch].iRVBOffset+iRr+ns)<<1);

-     if(pN>=sRVBEnd) pN=sRVBStart+(pN-sRVBEnd);

-

-     (*pN)+=iRxl;

-     pN++;

-     (*pN)+=iRxr;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE int g_buffer(int iOff)                          // get_buffer content helper: takes care about wraps

-{

- short * p=(short *)spuMem;

- iOff=(iOff*4)+rvb.CurrAddr;

- while(iOff>0x3FFFF)       iOff=rvb.StartAddr+(iOff-0x40000);

- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);

- return (int)*(p+iOff);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE void s_buffer(int iOff,int iVal)                // set_buffer content helper: takes care about wraps and clipping

-{

- short * p=(short *)spuMem;

- iOff=(iOff*4)+rvb.CurrAddr;

- while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);

- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);

- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;

- *(p+iOff)=(short)iVal;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping

-{

- short * p=(short *)spuMem;

- iOff=(iOff*4)+rvb.CurrAddr+1;

- while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);

- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);

- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;

- *(p+iOff)=(short)iVal;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE int MixREVERBLeft(int ns)

-{

- if(iUseReverb==0) return 0;

- else

- if(iUseReverb==2)

-  {

-   static int iCnt=0;                                  // this func will be called with 44.1 khz

-

-   if(!rvb.StartAddr)                                  // reverb is off

-    {

-     rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;

-     return 0;

-    }

-

-   iCnt++;                                    

-

-   if(iCnt&1)                                          // we work on every second left value: downsample to 22 khz

-    {

-     if(spuCtrl&0x80)                                  // -> reverb on? oki

-      {

-       int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;

-

-       const int INPUT_SAMPLE_L=*(sRVBStart+(ns<<1));                         

-       const int INPUT_SAMPLE_R=*(sRVBStart+(ns<<1)+1);                     

-

-       const int IIR_INPUT_A0 = (g_buffer(rvb.IIR_SRC_A0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;

-       const int IIR_INPUT_A1 = (g_buffer(rvb.IIR_SRC_A1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;

-       const int IIR_INPUT_B0 = (g_buffer(rvb.IIR_SRC_B0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;

-       const int IIR_INPUT_B1 = (g_buffer(rvb.IIR_SRC_B1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;

-

-       const int IIR_A0 = (IIR_INPUT_A0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A0) * (32768L - rvb.IIR_ALPHA))/32768L;

-       const int IIR_A1 = (IIR_INPUT_A1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A1) * (32768L - rvb.IIR_ALPHA))/32768L;

-       const int IIR_B0 = (IIR_INPUT_B0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B0) * (32768L - rvb.IIR_ALPHA))/32768L;

-       const int IIR_B1 = (IIR_INPUT_B1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B1) * (32768L - rvb.IIR_ALPHA))/32768L;

-

-       s_buffer1(rvb.IIR_DEST_A0, IIR_A0);

-       s_buffer1(rvb.IIR_DEST_A1, IIR_A1);

-       s_buffer1(rvb.IIR_DEST_B0, IIR_B0);

-       s_buffer1(rvb.IIR_DEST_B1, IIR_B1);

- 

-       ACC0 = (g_buffer(rvb.ACC_SRC_A0) * rvb.ACC_COEF_A)/32768L +

-              (g_buffer(rvb.ACC_SRC_B0) * rvb.ACC_COEF_B)/32768L +

-              (g_buffer(rvb.ACC_SRC_C0) * rvb.ACC_COEF_C)/32768L +

-              (g_buffer(rvb.ACC_SRC_D0) * rvb.ACC_COEF_D)/32768L;

-       ACC1 = (g_buffer(rvb.ACC_SRC_A1) * rvb.ACC_COEF_A)/32768L +

-              (g_buffer(rvb.ACC_SRC_B1) * rvb.ACC_COEF_B)/32768L +

-              (g_buffer(rvb.ACC_SRC_C1) * rvb.ACC_COEF_C)/32768L +

-              (g_buffer(rvb.ACC_SRC_D1) * rvb.ACC_COEF_D)/32768L;

-

-       FB_A0 = g_buffer(rvb.MIX_DEST_A0 - rvb.FB_SRC_A);

-       FB_A1 = g_buffer(rvb.MIX_DEST_A1 - rvb.FB_SRC_A);

-       FB_B0 = g_buffer(rvb.MIX_DEST_B0 - rvb.FB_SRC_B);

-       FB_B1 = g_buffer(rvb.MIX_DEST_B1 - rvb.FB_SRC_B);

-

-       s_buffer(rvb.MIX_DEST_A0, ACC0 - (FB_A0 * rvb.FB_ALPHA)/32768L);

-       s_buffer(rvb.MIX_DEST_A1, ACC1 - (FB_A1 * rvb.FB_ALPHA)/32768L);

-       

-       s_buffer(rvb.MIX_DEST_B0, (rvb.FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * rvb.FB_X)/32768L);

-       s_buffer(rvb.MIX_DEST_B1, (rvb.FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * rvb.FB_X)/32768L);

- 

-       rvb.iLastRVBLeft  = rvb.iRVBLeft;

-       rvb.iLastRVBRight = rvb.iRVBRight;

-

-       rvb.iRVBLeft  = (g_buffer(rvb.MIX_DEST_A0)+g_buffer(rvb.MIX_DEST_B0))/3;

-       rvb.iRVBRight = (g_buffer(rvb.MIX_DEST_A1)+g_buffer(rvb.MIX_DEST_B1))/3;

-

-       rvb.iRVBLeft  = (rvb.iRVBLeft  * rvb.VolLeft)  / 0x4000;

-       rvb.iRVBRight = (rvb.iRVBRight * rvb.VolRight) / 0x4000;

-

-       rvb.CurrAddr++;

-       if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;

-

-       return rvb.iLastRVBLeft+(rvb.iRVBLeft-rvb.iLastRVBLeft)/2;

-      }

-     else                                              // -> reverb off

-      {

-       rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;

-      }

-

-     rvb.CurrAddr++;

-     if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;

-    }

-

-   return rvb.iLastRVBLeft;

-  }

- else                                                  // easy fake reverb:

-  {

-   const int iRV=*sRVBPlay;                            // -> simply take the reverb mix buf value

-   *sRVBPlay++=0;                                      // -> init it after

-   if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart;           // -> and take care about wrap arounds

-   return iRV;                                         // -> return reverb mix buf val

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-INLINE int MixREVERBRight(void)

-{

- if(iUseReverb==0) return 0;

- else

- if(iUseReverb==2)                                     // Neill's reverb:

-  {

-   int i=rvb.iLastRVBRight+(rvb.iRVBRight-rvb.iLastRVBRight)/2;

-   rvb.iLastRVBRight=rvb.iRVBRight;

-   return i;                                           // -> just return the last right reverb val (little bit scaled by the previous right val)

-  }

- else                                                  // easy fake reverb:

-  {

-   const int iRV=*sRVBPlay;                            // -> simply take the reverb mix buf value

-   *sRVBPlay++=0;                                      // -> init it after

-   if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart;           // -> and take care about wrap arounds

-   return iRV;                                         // -> return reverb mix buf val

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-#endif

-

-/*

------------------------------------------------------------------------------

-PSX reverb hardware notes

-by Neill Corlett

------------------------------------------------------------------------------

-

-Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway

-yadda yadda.

-

------------------------------------------------------------------------------

-

-Basics

-------

-

-- The reverb buffer is 22khz 16-bit mono PCM.

-- It starts at the reverb address given by 1DA2, extends to

-  the end of sound RAM, and wraps back to the 1DA2 address.

-

-Setting the address at 1DA2 resets the current reverb work address.

-

-This work address ALWAYS increments every 1/22050 sec., regardless of

-whether reverb is enabled (bit 7 of 1DAA set).

-

-And the contents of the reverb buffer ALWAYS play, scaled by the

-"reverberation depth left/right" volumes (1D84/1D86).

-(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)

-

------------------------------------------------------------------------------

-

-Register names

---------------

-

-These are probably not their real names.

-These are probably not even correct names.

-We will use them anyway, because we can.

-

-1DC0: FB_SRC_A       (offset)

-1DC2: FB_SRC_B       (offset)

-1DC4: IIR_ALPHA      (coef.)

-1DC6: ACC_COEF_A     (coef.)

-1DC8: ACC_COEF_B     (coef.)

-1DCA: ACC_COEF_C     (coef.)

-1DCC: ACC_COEF_D     (coef.)

-1DCE: IIR_COEF       (coef.)

-1DD0: FB_ALPHA       (coef.)

-1DD2: FB_X           (coef.)

-1DD4: IIR_DEST_A0    (offset)

-1DD6: IIR_DEST_A1    (offset)

-1DD8: ACC_SRC_A0     (offset)

-1DDA: ACC_SRC_A1     (offset)

-1DDC: ACC_SRC_B0     (offset)

-1DDE: ACC_SRC_B1     (offset)

-1DE0: IIR_SRC_A0     (offset)

-1DE2: IIR_SRC_A1     (offset)

-1DE4: IIR_DEST_B0    (offset)

-1DE6: IIR_DEST_B1    (offset)

-1DE8: ACC_SRC_C0     (offset)

-1DEA: ACC_SRC_C1     (offset)

-1DEC: ACC_SRC_D0     (offset)

-1DEE: ACC_SRC_D1     (offset)

-1DF0: IIR_SRC_B1     (offset)

-1DF2: IIR_SRC_B0     (offset)

-1DF4: MIX_DEST_A0    (offset)

-1DF6: MIX_DEST_A1    (offset)

-1DF8: MIX_DEST_B0    (offset)

-1DFA: MIX_DEST_B1    (offset)

-1DFC: IN_COEF_L      (coef.)

-1DFE: IN_COEF_R      (coef.)

-

-The coefficients are signed fractional values.

--32768 would be -1.0

- 32768 would be  1.0 (if it were possible... the highest is of course 32767)

-

-The offsets are (byte/8) offsets into the reverb buffer.

-i.e. you multiply them by 8, you get byte offsets.

-You can also think of them as (samples/4) offsets.

-They appear to be signed.  They can be negative.

-None of the documented presets make them negative, though.

-

-Yes, 1DF0 and 1DF2 appear to be backwards.  Not a typo.

-

------------------------------------------------------------------------------

-

-What it does

-------------

-

-We take all reverb sources:

-- regular channels that have the reverb bit on

-- cd and external sources, if their reverb bits are on

-and mix them into one stereo 44100hz signal.

-

-Lowpass/downsample that to 22050hz.  The PSX uses a proper bandlimiting

-algorithm here, but I haven't figured out the hysterically exact specifics.

-I use an 8-tap filter with these coefficients, which are nice but probably

-not the real ones:

-

-0.037828187894

-0.157538631280

-0.321159685278

-0.449322115345

-0.449322115345

-0.321159685278

-0.157538631280

-0.037828187894

-

-So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.

-

-* IN MY EMULATION, I divide these by 2 to make it clip less.

-  (and of course the L/R output coefficients are adjusted to compensate)

-  The real thing appears to not do this.

-

-At every 22050hz tick:

-- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb

-  steady-state algorithm described below

-- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer

-  (This part may not be exactly right and I guessed at the coefs. TODO: check later.)

-  L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])

-  R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])

-- Advance the current buffer position by 1 sample

-

-The wet out L and R are then upsampled to 44100hz and played at the

-"reverberation depth left/right" (1D84/1D86) volume, independent of the main

-volume.

-

------------------------------------------------------------------------------

-

-Reverb steady-state

--------------------

-

-The reverb steady-state algorithm is fairly clever, and of course by

-"clever" I mean "batshit insane".

-

-buffer[x] is relative to the current buffer position, not the beginning of

-the buffer.  Note that all buffer offsets must wrap around so they're

-contained within the reverb work area.

-

-Clipping is performed at the end... maybe also sooner, but definitely at

-the end.

-

-IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;

-IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;

-IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;

-IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;

-

-IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);

-IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);

-IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);

-IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);

-

-buffer[IIR_DEST_A0 + 1sample] = IIR_A0;

-buffer[IIR_DEST_A1 + 1sample] = IIR_A1;

-buffer[IIR_DEST_B0 + 1sample] = IIR_B0;

-buffer[IIR_DEST_B1 + 1sample] = IIR_B1;

-

-ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +

-       buffer[ACC_SRC_B0] * ACC_COEF_B +

-       buffer[ACC_SRC_C0] * ACC_COEF_C +

-       buffer[ACC_SRC_D0] * ACC_COEF_D;

-ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +

-       buffer[ACC_SRC_B1] * ACC_COEF_B +

-       buffer[ACC_SRC_C1] * ACC_COEF_C +

-       buffer[ACC_SRC_D1] * ACC_COEF_D;

-

-FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];

-FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];

-FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];

-FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];

-

-buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;

-buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;

-buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;

-buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;

-

------------------------------------------------------------------------------

-*/

-

+/***************************************************************************
+                          reverb.c  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+#include "reverb.h"
+
+#define _IN_REVERB
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+
+// REVERB info and timing vars...
+
+int *          sRVBPlay      = 0;
+int *          sRVBEnd       = 0;
+int *          sRVBStart     = 0;
+int            iReverbOff    = -1;                          // some delay factor for reverb
+int            iReverbRepeat = 0;
+int            iReverbNum    = 1;    
+
+////////////////////////////////////////////////////////////////////////
+// SET REVERB
+////////////////////////////////////////////////////////////////////////
+
+void SetREVERB(unsigned short val)
+{
+ switch(val)
+  {
+   case 0x0000: iReverbOff=-1;  break;                                         // off
+   case 0x007D: iReverbOff=32;  iReverbNum=2; iReverbRepeat=128;  break;       // ok room
+
+   case 0x0033: iReverbOff=32;  iReverbNum=2; iReverbRepeat=64;   break;       // studio small
+   case 0x00B1: iReverbOff=48;  iReverbNum=2; iReverbRepeat=96;   break;       // ok studio medium
+   case 0x00E3: iReverbOff=64;  iReverbNum=2; iReverbRepeat=128;  break;       // ok studio large ok
+
+   case 0x01A5: iReverbOff=128; iReverbNum=4; iReverbRepeat=32;   break;       // ok hall
+   case 0x033D: iReverbOff=256; iReverbNum=4; iReverbRepeat=64;   break;       // space echo
+   case 0x0001: iReverbOff=184; iReverbNum=3; iReverbRepeat=128;  break;       // echo/delay
+   case 0x0017: iReverbOff=128; iReverbNum=2; iReverbRepeat=128;  break;       // half echo
+   default:     iReverbOff=32;  iReverbNum=1; iReverbRepeat=0;    break;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// START REVERB
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StartREVERB(int ch)
+{
+ if(s_chan[ch].bReverb && (spuCtrl&0x80))              // reverb possible?
+  {
+   if(iUseReverb==2) s_chan[ch].bRVBActive=1;
+   else
+   if(iUseReverb==1 && iReverbOff>0)                   // -> fake reverb used?
+    {
+     s_chan[ch].bRVBActive=1;                            // -> activate it
+     s_chan[ch].iRVBOffset=iReverbOff*45;
+     s_chan[ch].iRVBRepeat=iReverbRepeat*45;
+     s_chan[ch].iRVBNum   =iReverbNum;
+    }
+  }
+ else s_chan[ch].bRVBActive=0;                         // else -> no reverb
+}
+
+////////////////////////////////////////////////////////////////////////
+// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void InitREVERB(void)
+{
+ if(iUseReverb==2)
+  {memset(sRVBStart,0,NSSIZE*2*4);}
+}
+
+////////////////////////////////////////////////////////////////////////
+// STORE REVERB
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StoreREVERB(int ch,int ns)
+{
+ if(iUseReverb==0) return;
+ else
+ if(iUseReverb==2) // -------------------------------- // Neil's reverb
+  {
+   const int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x4000;
+   const int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x4000;
+
+   ns<<=1;
+
+   *(sRVBStart+ns)  +=iRxl;                            // -> we mix all active reverb channels into an extra buffer
+   *(sRVBStart+ns+1)+=iRxr;
+  }
+ else // --------------------------------------------- // Pete's easy fake reverb
+  {
+   int * pN;int iRn,iRr=0;
+
+   // we use the half channel volume (/0x8000) for the first reverb effects, quarter for next and so on
+
+   int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x8000;
+   int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x8000;
+ 
+   for(iRn=1;iRn<=s_chan[ch].iRVBNum;iRn++,iRr+=s_chan[ch].iRVBRepeat,iRxl/=2,iRxr/=2)
+    {
+     pN=sRVBPlay+((s_chan[ch].iRVBOffset+iRr+ns)<<1);
+     if(pN>=sRVBEnd) pN=sRVBStart+(pN-sRVBEnd);
+
+     (*pN)+=iRxl;
+     pN++;
+     (*pN)+=iRxr;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int g_buffer(int iOff)                          // get_buffer content helper: takes care about wraps
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr;
+ while(iOff>0x3FFFF)       iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ return (int)*(p+iOff);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer(int iOff,int iVal)                // set_buffer content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr;
+ while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr+1;
+ while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixREVERBLeft(int ns)
+{
+ if(iUseReverb==0) return 0;
+ else
+ if(iUseReverb==2)
+  {
+   static int iCnt=0;                                  // this func will be called with 44.1 khz
+
+   if(!rvb.StartAddr)                                  // reverb is off
+    {
+     rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
+     return 0;
+    }
+
+   iCnt++;                                    
+
+   if(iCnt&1)                                          // we work on every second left value: downsample to 22 khz
+    {
+     if(spuCtrl&0x80)                                  // -> reverb on? oki
+      {
+       int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
+
+       const int INPUT_SAMPLE_L=*(sRVBStart+(ns<<1));                         
+       const int INPUT_SAMPLE_R=*(sRVBStart+(ns<<1)+1);                     
+
+       const int IIR_INPUT_A0 = (g_buffer(rvb.IIR_SRC_A0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
+       const int IIR_INPUT_A1 = (g_buffer(rvb.IIR_SRC_A1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
+       const int IIR_INPUT_B0 = (g_buffer(rvb.IIR_SRC_B0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
+       const int IIR_INPUT_B1 = (g_buffer(rvb.IIR_SRC_B1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
+
+       const int IIR_A0 = (IIR_INPUT_A0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A0) * (32768L - rvb.IIR_ALPHA))/32768L;
+       const int IIR_A1 = (IIR_INPUT_A1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A1) * (32768L - rvb.IIR_ALPHA))/32768L;
+       const int IIR_B0 = (IIR_INPUT_B0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B0) * (32768L - rvb.IIR_ALPHA))/32768L;
+       const int IIR_B1 = (IIR_INPUT_B1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B1) * (32768L - rvb.IIR_ALPHA))/32768L;
+
+       s_buffer1(rvb.IIR_DEST_A0, IIR_A0);
+       s_buffer1(rvb.IIR_DEST_A1, IIR_A1);
+       s_buffer1(rvb.IIR_DEST_B0, IIR_B0);
+       s_buffer1(rvb.IIR_DEST_B1, IIR_B1);
+ 
+       ACC0 = (g_buffer(rvb.ACC_SRC_A0) * rvb.ACC_COEF_A)/32768L +
+              (g_buffer(rvb.ACC_SRC_B0) * rvb.ACC_COEF_B)/32768L +
+              (g_buffer(rvb.ACC_SRC_C0) * rvb.ACC_COEF_C)/32768L +
+              (g_buffer(rvb.ACC_SRC_D0) * rvb.ACC_COEF_D)/32768L;
+       ACC1 = (g_buffer(rvb.ACC_SRC_A1) * rvb.ACC_COEF_A)/32768L +
+              (g_buffer(rvb.ACC_SRC_B1) * rvb.ACC_COEF_B)/32768L +
+              (g_buffer(rvb.ACC_SRC_C1) * rvb.ACC_COEF_C)/32768L +
+              (g_buffer(rvb.ACC_SRC_D1) * rvb.ACC_COEF_D)/32768L;
+
+       FB_A0 = g_buffer(rvb.MIX_DEST_A0 - rvb.FB_SRC_A);
+       FB_A1 = g_buffer(rvb.MIX_DEST_A1 - rvb.FB_SRC_A);
+       FB_B0 = g_buffer(rvb.MIX_DEST_B0 - rvb.FB_SRC_B);
+       FB_B1 = g_buffer(rvb.MIX_DEST_B1 - rvb.FB_SRC_B);
+
+       s_buffer(rvb.MIX_DEST_A0, ACC0 - (FB_A0 * rvb.FB_ALPHA)/32768L);
+       s_buffer(rvb.MIX_DEST_A1, ACC1 - (FB_A1 * rvb.FB_ALPHA)/32768L);
+       
+       s_buffer(rvb.MIX_DEST_B0, (rvb.FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * rvb.FB_X)/32768L);
+       s_buffer(rvb.MIX_DEST_B1, (rvb.FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * rvb.FB_X)/32768L);
+ 
+       rvb.iLastRVBLeft  = rvb.iRVBLeft;
+       rvb.iLastRVBRight = rvb.iRVBRight;
+
+       rvb.iRVBLeft  = (g_buffer(rvb.MIX_DEST_A0)+g_buffer(rvb.MIX_DEST_B0))/3;
+       rvb.iRVBRight = (g_buffer(rvb.MIX_DEST_A1)+g_buffer(rvb.MIX_DEST_B1))/3;
+
+       rvb.iRVBLeft  = (rvb.iRVBLeft  * rvb.VolLeft)  / 0x4000;
+       rvb.iRVBRight = (rvb.iRVBRight * rvb.VolRight) / 0x4000;
+
+       rvb.CurrAddr++;
+       if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
+
+       return rvb.iLastRVBLeft+(rvb.iRVBLeft-rvb.iLastRVBLeft)/2;
+      }
+     else                                              // -> reverb off
+      {
+       rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
+      }
+
+     rvb.CurrAddr++;
+     if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
+    }
+
+   return rvb.iLastRVBLeft;
+  }
+ else                                                  // easy fake reverb:
+  {
+   const int iRV=*sRVBPlay;                            // -> simply take the reverb mix buf value
+   *sRVBPlay++=0;                                      // -> init it after
+   if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart;           // -> and take care about wrap arounds
+   return iRV;                                         // -> return reverb mix buf val
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixREVERBRight(void)
+{
+ if(iUseReverb==0) return 0;
+ else
+ if(iUseReverb==2)                                     // Neill's reverb:
+  {
+   int i=rvb.iLastRVBRight+(rvb.iRVBRight-rvb.iLastRVBRight)/2;
+   rvb.iLastRVBRight=rvb.iRVBRight;
+   return i;                                           // -> just return the last right reverb val (little bit scaled by the previous right val)
+  }
+ else                                                  // easy fake reverb:
+  {
+   const int iRV=*sRVBPlay;                            // -> simply take the reverb mix buf value
+   *sRVBPlay++=0;                                      // -> init it after
+   if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart;           // -> and take care about wrap arounds
+   return iRV;                                         // -> return reverb mix buf val
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
+
+/*
+-----------------------------------------------------------------------------
+PSX reverb hardware notes
+by Neill Corlett
+-----------------------------------------------------------------------------
+
+Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway
+yadda yadda.
+
+-----------------------------------------------------------------------------
+
+Basics
+------
+
+- The reverb buffer is 22khz 16-bit mono PCM.
+- It starts at the reverb address given by 1DA2, extends to
+  the end of sound RAM, and wraps back to the 1DA2 address.
+
+Setting the address at 1DA2 resets the current reverb work address.
+
+This work address ALWAYS increments every 1/22050 sec., regardless of
+whether reverb is enabled (bit 7 of 1DAA set).
+
+And the contents of the reverb buffer ALWAYS play, scaled by the
+"reverberation depth left/right" volumes (1D84/1D86).
+(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)
+
+-----------------------------------------------------------------------------
+
+Register names
+--------------
+
+These are probably not their real names.
+These are probably not even correct names.
+We will use them anyway, because we can.
+
+1DC0: FB_SRC_A       (offset)
+1DC2: FB_SRC_B       (offset)
+1DC4: IIR_ALPHA      (coef.)
+1DC6: ACC_COEF_A     (coef.)
+1DC8: ACC_COEF_B     (coef.)
+1DCA: ACC_COEF_C     (coef.)
+1DCC: ACC_COEF_D     (coef.)
+1DCE: IIR_COEF       (coef.)
+1DD0: FB_ALPHA       (coef.)
+1DD2: FB_X           (coef.)
+1DD4: IIR_DEST_A0    (offset)
+1DD6: IIR_DEST_A1    (offset)
+1DD8: ACC_SRC_A0     (offset)
+1DDA: ACC_SRC_A1     (offset)
+1DDC: ACC_SRC_B0     (offset)
+1DDE: ACC_SRC_B1     (offset)
+1DE0: IIR_SRC_A0     (offset)
+1DE2: IIR_SRC_A1     (offset)
+1DE4: IIR_DEST_B0    (offset)
+1DE6: IIR_DEST_B1    (offset)
+1DE8: ACC_SRC_C0     (offset)
+1DEA: ACC_SRC_C1     (offset)
+1DEC: ACC_SRC_D0     (offset)
+1DEE: ACC_SRC_D1     (offset)
+1DF0: IIR_SRC_B1     (offset)
+1DF2: IIR_SRC_B0     (offset)
+1DF4: MIX_DEST_A0    (offset)
+1DF6: MIX_DEST_A1    (offset)
+1DF8: MIX_DEST_B0    (offset)
+1DFA: MIX_DEST_B1    (offset)
+1DFC: IN_COEF_L      (coef.)
+1DFE: IN_COEF_R      (coef.)
+
+The coefficients are signed fractional values.
+-32768 would be -1.0
+ 32768 would be  1.0 (if it were possible... the highest is of course 32767)
+
+The offsets are (byte/8) offsets into the reverb buffer.
+i.e. you multiply them by 8, you get byte offsets.
+You can also think of them as (samples/4) offsets.
+They appear to be signed.  They can be negative.
+None of the documented presets make them negative, though.
+
+Yes, 1DF0 and 1DF2 appear to be backwards.  Not a typo.
+
+-----------------------------------------------------------------------------
+
+What it does
+------------
+
+We take all reverb sources:
+- regular channels that have the reverb bit on
+- cd and external sources, if their reverb bits are on
+and mix them into one stereo 44100hz signal.
+
+Lowpass/downsample that to 22050hz.  The PSX uses a proper bandlimiting
+algorithm here, but I haven't figured out the hysterically exact specifics.
+I use an 8-tap filter with these coefficients, which are nice but probably
+not the real ones:
+
+0.037828187894
+0.157538631280
+0.321159685278
+0.449322115345
+0.449322115345
+0.321159685278
+0.157538631280
+0.037828187894
+
+So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.
+
+* IN MY EMULATION, I divide these by 2 to make it clip less.
+  (and of course the L/R output coefficients are adjusted to compensate)
+  The real thing appears to not do this.
+
+At every 22050hz tick:
+- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb
+  steady-state algorithm described below
+- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer
+  (This part may not be exactly right and I guessed at the coefs. TODO: check later.)
+  L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])
+  R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])
+- Advance the current buffer position by 1 sample
+
+The wet out L and R are then upsampled to 44100hz and played at the
+"reverberation depth left/right" (1D84/1D86) volume, independent of the main
+volume.
+
+-----------------------------------------------------------------------------
+
+Reverb steady-state
+-------------------
+
+The reverb steady-state algorithm is fairly clever, and of course by
+"clever" I mean "batshit insane".
+
+buffer[x] is relative to the current buffer position, not the beginning of
+the buffer.  Note that all buffer offsets must wrap around so they're
+contained within the reverb work area.
+
+Clipping is performed at the end... maybe also sooner, but definitely at
+the end.
+
+IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+
+IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);
+IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);
+IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);
+IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);
+
+buffer[IIR_DEST_A0 + 1sample] = IIR_A0;
+buffer[IIR_DEST_A1 + 1sample] = IIR_A1;
+buffer[IIR_DEST_B0 + 1sample] = IIR_B0;
+buffer[IIR_DEST_B1 + 1sample] = IIR_B1;
+
+ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +
+       buffer[ACC_SRC_B0] * ACC_COEF_B +
+       buffer[ACC_SRC_C0] * ACC_COEF_C +
+       buffer[ACC_SRC_D0] * ACC_COEF_D;
+ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +
+       buffer[ACC_SRC_B1] * ACC_COEF_B +
+       buffer[ACC_SRC_C1] * ACC_COEF_C +
+       buffer[ACC_SRC_D1] * ACC_COEF_D;
+
+FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];
+FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];
+FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];
+FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];
+
+buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;
+buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;
+buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;
+buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;
+
+-----------------------------------------------------------------------------
+*/
+
diff --git a/plugins/dfsound/sdl.c b/plugins/dfsound/sdl.c
index 06acd686..f3cf92d2 100644
--- a/plugins/dfsound/sdl.c
+++ b/plugins/dfsound/sdl.c
@@ -18,6 +18,8 @@
 
 #include "stdafx.h"
 
+#include "dsoundoss.h"
+
 #include "externals.h"
 #include <SDL.h>
 
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f263cb8f..36e916a1 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -23,22 +23,13 @@
 #include "cfg.h"
 #include "dsoundoss.h"
 #include "regs.h"
+#include "spu.h"
 
 #ifdef _WINDOWS
 #include "debug.h"
 #include "record.h"
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 #if defined (_WINDOWS)
 static char * libraryName     = N_("DirectSound Driver");
 #elif defined (USEMACOSX)
@@ -54,8 +45,9 @@ static char * libraryName     = N_("PulseAudio Sound");
 #else
 static char * libraryName     = N_("NULL Sound");
 #endif
-
+#if 0
 static char * libraryInfo     = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n");
+#endif
 
 // globals
 
@@ -183,7 +175,7 @@ static int iSecureStart=0; // secure start counter
 //
 
 
-INLINE void InterpolateUp(int ch)
+static INLINE void InterpolateUp(int ch)
 {
  if(s_chan[ch].SB[32]==1)                              // flag == 1? calc step and set flag... and don't change the value in this pass
   {
@@ -231,7 +223,7 @@ INLINE void InterpolateUp(int ch)
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
 //
 
-INLINE void InterpolateDown(int ch)
+static INLINE void InterpolateDown(int ch)
 {
  if(s_chan[ch].sinc>=0x20000L)                                 // we would skip at least one val?
   {
@@ -257,7 +249,7 @@ INLINE void InterpolateDown(int ch)
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartSound(int ch)
+static INLINE void StartSound(int ch)
 {
  StartADSR(ch);
  StartREVERB(ch);
@@ -287,7 +279,7 @@ INLINE void StartSound(int ch)
 // ALL KIND OF HELPERS
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void VoiceChangeFrequency(int ch)
+static INLINE void VoiceChangeFrequency(int ch)
 {
  s_chan[ch].iUsedFreq=s_chan[ch].iActFreq;             // -> take it and calc steps
  s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
@@ -297,7 +289,7 @@ INLINE void VoiceChangeFrequency(int ch)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void FModChangeFrequency(int ch,int ns)
+static INLINE void FModChangeFrequency(int ch,int ns)
 {
  int NP=s_chan[ch].iRawPitch;
 
@@ -361,7 +353,7 @@ unsigned short NoiseFreqAdd[5] = {
 	0, 84, 140, 180, 210
 };
 
-INLINE void NoiseClock()
+static INLINE void NoiseClock()
 {
 	unsigned int level;
 
@@ -387,7 +379,7 @@ INLINE void NoiseClock()
 	}
 }
 
-INLINE int iGetNoiseVal(int ch)
+static INLINE int iGetNoiseVal(int ch)
 {
  int fa;
 
@@ -408,7 +400,7 @@ INLINE int iGetNoiseVal(int ch)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StoreInterpolationVal(int ch,int fa)
+static INLINE void StoreInterpolationVal(int ch,int fa)
 {
 	/*
 	// fmod channel = sound output
@@ -446,7 +438,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int iGetInterpolationVal(int ch)
+static INLINE int iGetInterpolationVal(int ch)
 {
  int fa;
 
@@ -1012,7 +1004,7 @@ DWORD WINAPI MAINThreadEx(LPVOID lpParameter)
 //  1 time every 'cycle' cycles... harhar
 
 long cpu_cycles;
-void CALLBACK SPUasync(unsigned long cycle)
+void CALLBACK SPUasync(uint32_t cycle)
 {
 	cpu_cycles += cycle;
 
@@ -1065,10 +1057,12 @@ void CALLBACK SPUasync(unsigned long cycle)
 // leave that func in the linux port, until epsxe linux is using
 // the async function as well
 
+#if 0
 void CALLBACK SPUupdate(void)
 {
  SPUasync(0);
 }
+#endif
 
 // XA AUDIO
 
@@ -1158,7 +1152,7 @@ void RemoveTimer(void)
 }
 
 // SETUPSTREAMS: init most of the spu buffers
-void SetupStreams(void)
+static void SetupStreams(void)
 { 
  int i;
 
@@ -1201,7 +1195,7 @@ void SetupStreams(void)
 }
 
 // REMOVESTREAMS: free most buffer
-void RemoveStreams(void)
+static void RemoveStreams(void)
 { 
  free(pSpuBuffer);                                     // free mixing buffer
  pSpuBuffer = NULL;
@@ -1355,10 +1349,12 @@ void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
  irqCallback = callback;
 }
 
+#if 0
 void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
 {
  cddavCallback = CDDAVcallback;
 }
+#endif
 
 // COMMON PLUGIN INFO FUNCS
 char * CALLBACK PSEgetLibName(void)
@@ -1376,7 +1372,9 @@ unsigned long CALLBACK PSEgetLibVersion(void)
  return (1 << 16) | (1 << 8);
 }
 
+#if 0
 char * SPUgetLibInfos(void)
 {
  return _(libraryInfo);
 }
+#endif
diff --git a/plugins/dfsound/spu.h b/plugins/dfsound/spu.h
index 8912684b..8d492485 100644
--- a/plugins/dfsound/spu.h
+++ b/plugins/dfsound/spu.h
@@ -1,21 +1,22 @@
-/***************************************************************************

-                            spu.h  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-void SetupTimer(void);

-void RemoveTimer(void);

-void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);

-void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);
\ No newline at end of file
+/***************************************************************************
+                            spu.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void SetupTimer(void);
+void RemoveTimer(void);
+void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
+void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);
+extern int lastch;
\ No newline at end of file
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index ce2efbaf..8bea2b58 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -22,7 +22,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 /*	This function checks for the value being outside the accepted range,
 	and returns the appropriate boundary value */
-int set_limit (char *p, int len, int lower, int upper)
+static int set_limit (char *p, int len, int lower, int upper)
 {
 	int val = 0;
 
@@ -37,13 +37,13 @@ int set_limit (char *p, int len, int lower, int upper)
     return val;
 }
 
-void on_about_clicked (GtkWidget *widget, gpointer user_data)
+static void on_about_clicked (GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy (widget);
 	exit (0);
 }
 
-void OnConfigClose(GtkWidget *widget, gpointer user_data)
+static void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
 	GladeXML *xml = (GladeXML *)user_data;
 
diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h
index 3f28ceb9..5ba6c625 100644
--- a/plugins/dfsound/stdafx.h
+++ b/plugins/dfsound/stdafx.h
@@ -14,26 +14,26 @@
  *   additional informations.                                              *
  *                                                                         *
  ***************************************************************************/
-

-#ifdef _WINDOWS

-

-#define WIN32_LEAN_AND_MEAN

-#define STRICT

-#include <windows.h>

-#include <windowsx.h>

-#include "mmsystem.h"

-#include <process.h>

-#include <stdlib.h>

-

-#ifndef INLINE

-#define INLINE __inline

-#endif

-

-#include "resource.h"

-

-#pragma warning (disable:4996)

-

-#else

+
+#ifdef _WINDOWS
+
+#define WIN32_LEAN_AND_MEAN
+#define STRICT
+#include <windows.h>
+#include <windowsx.h>
+#include "mmsystem.h"
+#include <process.h>
+#include <stdlib.h>
+
+#ifndef INLINE
+#define INLINE __inline
+#endif
+
+#include "resource.h"
+
+#pragma warning (disable:4996)
+
+#else
 
 #ifndef _MACOSX
 #include "config.h"
@@ -62,7 +62,5 @@
 #ifndef INLINE
 #define INLINE inline
 #endif
-

-#endif

 
-#include "psemuxa.h"
+#endif
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 32614a29..a0ba86e8 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -15,7 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "stdafx.h"

+#include "stdafx.h"
+
+#include "xa.h"
 
 #define _IN_XA
 #include <stdint.h>
@@ -45,6 +47,7 @@ uint32_t * CDDAEnd   = NULL;
 int             iLeftXAVol  = 0x8000;
 int             iRightXAVol = 0x8000;
 
+#if 0
 static int gauss_ptr = 0;
 static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -52,132 +55,133 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 #define gvall(x) gauss_window[(gauss_ptr+x)&3]
 #define gvalr0 gauss_window[4+gauss_ptr]
 #define gvalr(x) gauss_window[4+((gauss_ptr+x)&3)]
-

-long cdxa_dbuf_ptr;

+#endif
+
+long cdxa_dbuf_ptr;
 
 ////////////////////////////////////////////////////////////////////////
 // MIX XA & CDDA
 ////////////////////////////////////////////////////////////////////////
 
-static int lastxa_lc, lastxa_rc;

-static int lastcd_lc, lastcd_rc;

-

+static int lastxa_lc, lastxa_rc;
+static int lastcd_lc, lastcd_rc;
+
 INLINE void MixXA(void)
 {
- int ns;

- int lc,rc;

- unsigned long cdda_l;

-

- lc = 0;

- rc = 0;

-

- for(ns=0;ns<NSSIZE && XAPlay!=XAFeed;ns++)

-  {

-	 XALastVal=*XAPlay++;

-   if(XAPlay==XAEnd) XAPlay=XAStart;

-

-	 lc = (short)(XALastVal&0xffff);

-	 rc = (short)((XALastVal>>16) & 0xffff);

-

-	 if( lc < -32768 ) lc = -32768;

-	 if( rc < -32768 ) rc = -32768;

-	 if( lc > 32767 ) lc = 32767;

-	 if( rc > 32767 ) rc = 32767;

-

-	 SSumL[ns]+=lc;

-	 SSumR[ns]+=rc;

-

-	 // improve crackle - buffer under

-	 // - not update fast enough

-	 lastxa_lc = lc;

-	 lastxa_rc = rc;

-

-

-#if 0

-	 if( cdxa_dbuf_ptr >= 0x400 )

-		 cdxa_dbuf_ptr = 0;

-	 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lc;

-	 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = rc;

-	 cdxa_dbuf_ptr += 2;

-#endif

-  }

-

- if(XAPlay==XAFeed && XARepeat)

-  {

-   //XARepeat--;

-   for(;ns<NSSIZE;ns++)

-    {

-		 SSumL[ns]+=lastxa_rc;

-		 SSumR[ns]+=lastxa_rc;

-

-#if 0

-		 // Tales of Phantasia - voice meter

-		 if( cdxa_dbuf_ptr >= 0x400 )

-			 cdxa_dbuf_ptr = 0;

-		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lastxa_rc;

-		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = lastxa_rc;

-		 cdxa_dbuf_ptr += 2;

-#endif

-    }

-  }

+ int ns;
+ int lc,rc;
+ unsigned long cdda_l;
+
+ lc = 0;
+ rc = 0;
+
+ for(ns=0;ns<NSSIZE && XAPlay!=XAFeed;ns++)
+  {
+	 XALastVal=*XAPlay++;
+   if(XAPlay==XAEnd) XAPlay=XAStart;
+
+	 lc = (short)(XALastVal&0xffff);
+	 rc = (short)((XALastVal>>16) & 0xffff);
+
+	 if( lc < -32768 ) lc = -32768;
+	 if( rc < -32768 ) rc = -32768;
+	 if( lc > 32767 ) lc = 32767;
+	 if( rc > 32767 ) rc = 32767;
+
+	 SSumL[ns]+=lc;
+	 SSumR[ns]+=rc;
+
+	 // improve crackle - buffer under
+	 // - not update fast enough
+	 lastxa_lc = lc;
+	 lastxa_rc = rc;
+
+
+#if 0
+	 if( cdxa_dbuf_ptr >= 0x400 )
+		 cdxa_dbuf_ptr = 0;
+	 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lc;
+	 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = rc;
+	 cdxa_dbuf_ptr += 2;
+#endif
+  }
+
+ if(XAPlay==XAFeed && XARepeat)
+  {
+   //XARepeat--;
+   for(;ns<NSSIZE;ns++)
+    {
+		 SSumL[ns]+=lastxa_rc;
+		 SSumR[ns]+=lastxa_rc;
+
+#if 0
+		 // Tales of Phantasia - voice meter
+		 if( cdxa_dbuf_ptr >= 0x400 )
+			 cdxa_dbuf_ptr = 0;
+		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lastxa_rc;
+		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = lastxa_rc;
+		 cdxa_dbuf_ptr += 2;
+#endif
+    }
+  }
 
  for(ns=0;ns<NSSIZE && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);ns++)
   {
    cdda_l=*CDDAPlay++;
-   if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;

-
-	 lc = (short)(cdda_l&0xffff);

-	 rc = (short)((cdda_l>>16) & 0xffff);

-

-	 if( lc < -32768 ) lc = -32768;

-	 if( rc < -32768 ) rc = -32768;

-	 if( lc > 32767 ) lc = 32767;

-	 if( rc > 32767 ) rc = 32767;

-

-	 SSumL[ns]+=lc;

-	 SSumR[ns]+=rc;

-

-#if 0

-	 // Vib Ribbon - playback

-	 if( cdxa_dbuf_ptr >= 0x400 )

-		 cdxa_dbuf_ptr = 0;

-		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lc;

-		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = rc;

-	 cdxa_dbuf_ptr += 2;

-#endif

-

-	 // improve crackle - buffer under

-	 // - not update fast enough

-	 lastcd_lc = lc;

-	 lastcd_rc = rc;

-	}

-

-

- if(CDDAPlay==CDDAFeed && XARepeat)

-  {

-   //XARepeat--;

-   for(;ns<NSSIZE;ns++)

-    {

-#if 0

-	 // Vib Ribbon - playback

-	 if( cdxa_dbuf_ptr >= 0x400 )

-		 cdxa_dbuf_ptr = 0;

-		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lastcd_lc;

-		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = lastcd_rc;

-	 cdxa_dbuf_ptr += 2;

-#endif

-

-		 SSumL[ns]+=lastcd_lc;

-		 SSumR[ns]+=lastcd_rc;

-    }

-  }

+   if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
+
+	 lc = (short)(cdda_l&0xffff);
+	 rc = (short)((cdda_l>>16) & 0xffff);
+
+	 if( lc < -32768 ) lc = -32768;
+	 if( rc < -32768 ) rc = -32768;
+	 if( lc > 32767 ) lc = 32767;
+	 if( rc > 32767 ) rc = 32767;
+
+	 SSumL[ns]+=lc;
+	 SSumR[ns]+=rc;
+
+#if 0
+	 // Vib Ribbon - playback
+	 if( cdxa_dbuf_ptr >= 0x400 )
+		 cdxa_dbuf_ptr = 0;
+		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lc;
+		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = rc;
+	 cdxa_dbuf_ptr += 2;
+#endif
+
+	 // improve crackle - buffer under
+	 // - not update fast enough
+	 lastcd_lc = lc;
+	 lastcd_rc = rc;
+	}
+
+
+ if(CDDAPlay==CDDAFeed && XARepeat)
+  {
+   //XARepeat--;
+   for(;ns<NSSIZE;ns++)
+    {
+#if 0
+	 // Vib Ribbon - playback
+	 if( cdxa_dbuf_ptr >= 0x400 )
+		 cdxa_dbuf_ptr = 0;
+		 spuMem[ (cdxa_dbuf_ptr + 0)/2 ] = lastcd_lc;
+		 spuMem[ (cdxa_dbuf_ptr + 0x400)/2 ] = lastcd_rc;
+	 cdxa_dbuf_ptr += 2;
+#endif
+
+		 SSumL[ns]+=lastcd_lc;
+		 SSumR[ns]+=lastcd_rc;
+    }
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////
 // small linux time helper... only used for watchdog
 ////////////////////////////////////////////////////////////////////////
-

-#ifndef _WINDOWS

+
+#ifndef _WINDOWS
 
 unsigned long timeGetTime_spu()
 {
@@ -185,8 +189,8 @@ unsigned long timeGetTime_spu()
  gettimeofday(&tv, 0);                                 // well, maybe there are better ways
  return tv.tv_sec * 1000 + tv.tv_usec/1000;            // to do that, but at least it works
 }
-

-#endif

+
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // FEED XA 
@@ -194,7 +198,7 @@ unsigned long timeGetTime_spu()
 
 INLINE void FeedXA(xa_decode_t *xap)
 {
- int sinc,spos,i,iSize,iPlace,vl,vr;
+ int sinc,spos,i,iSize,iPlace;
 
  if(!bSPUIsOpen) return;
 
@@ -381,8 +385,8 @@ INLINE void FeedXA(xa_decode_t *xap)
 // FEED CDDA
 ////////////////////////////////////////////////////////////////////////
 
-unsigned int cdda_ptr;

-

+unsigned int cdda_ptr;
+
 INLINE void FeedCDDA(unsigned char *pcm, int nBytes)
 {
  while(nBytes>0)
@@ -390,13 +394,13 @@ INLINE void FeedCDDA(unsigned char *pcm, int nBytes)
    if(CDDAFeed==CDDAEnd) CDDAFeed=CDDAStart;
    while(CDDAFeed==CDDAPlay-1||
          (CDDAFeed==CDDAEnd-1&&CDDAPlay==CDDAStart))
-   {

-#ifdef _WINDOWS

-    if (!iUseTimer) Sleep(1);

-    else return;

+   {
+#ifdef _WINDOWS
+    if (!iUseTimer) Sleep(1);
+    else return;
 #else
     if (!iUseTimer) usleep(1000);
-    else return;

+    else return;
 #endif
    }
    *CDDAFeed++=(*pcm | (*(pcm+1)<<8) | (*(pcm+2)<<16) | (*(pcm+3)<<24));
diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c
index 9baf8bc2..04148486 100644
--- a/plugins/dfxvideo/cfg.c
+++ b/plugins/dfxvideo/cfg.c
@@ -80,7 +80,7 @@ char * pConfigFile = NULL;
   size+=sprintf(pB+size, "%s = %.1f\n", name, (double)var); \
  }
 
-void ReadConfigFile()
+static void ReadConfigFile()
 {
  struct stat buf;
  FILE *in;char t[256];int len, size;
@@ -166,7 +166,7 @@ void ReadConfigFile()
  free(pB);
 }
 
-void ExecCfg(char *arg) {
+static void ExecCfg(char *arg) {
 	char cfg[256];
 	struct stat buf;
 
diff --git a/plugins/dfxvideo/draw.c b/plugins/dfxvideo/draw.c
index 53451ad7..52d665a9 100644
--- a/plugins/dfxvideo/draw.c
+++ b/plugins/dfxvideo/draw.c
@@ -63,8 +63,6 @@ int xv_vsync = 0;
 XShmSegmentInfo shminfo;
 int finalw,finalh;
 
-extern XvImage  *XvShmCreateImage(Display*, XvPortID, int, char*, int, int, XShmSegmentInfo*);
-
 #include <time.h>
 
 // prototypes
@@ -105,7 +103,7 @@ static __inline int GetResult2(DWORD A, DWORD B, DWORD C, DWORD D, DWORD E)
 }
 
 /* Convert RGB to YUV */
-__inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
+static __inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
     uint8_t Y = min(abs(R * 2104 + G * 4130 + B * 802 + 4096 + 131072) >> 13, 235);
     uint8_t U = min(abs(R * -1214 + G * -2384 + B * 3598 + 4096 + 1048576) >> 13, 240);
     uint8_t V = min(abs(R * 3598 + G * -3013 + B * -585 + 4096 + 1048576) >> 13, 240);
@@ -127,7 +125,7 @@ __inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
 	+ ((((A & qlowpixelMask8) + (B & qlowpixelMask8) + (C & qlowpixelMask8) + (D & qlowpixelMask8)) >> 2) & qlowpixelMask8))))
 
 
-void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
 	            unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch        = srcPitch<<1;
@@ -275,7 +273,7 @@ void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
 
 ////////////////////////////////////////////////////////////////////////
 
-void Std2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void Std2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
                   unsigned char *dstBitmap, int width, int height)
 {
  DWORD dstPitch        = srcPitch<<1;
@@ -481,7 +479,7 @@ void Std2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
 
 ////////////////////////////////////////////////////////////////////////
 
-void SuperEagle_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void SuperEagle_ex8(unsigned char *srcPtr, DWORD srcPitch,
 	                unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch        = srcPitch<<1;
@@ -711,7 +709,7 @@ static __inline void scale2x_32_def_whole(uint32_t*  dst0, uint32_t* dst1, const
 	}
 }
 
-void Scale2x_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void Scale2x_ex8(unsigned char *srcPtr, DWORD srcPitch,
 				 unsigned char  *dstPtr, int width, int height)
 {
 	//const int srcpitch = srcPitch;
@@ -840,7 +838,7 @@ static __inline void scale3x_32_def_whole(uint32_t* dst0, uint32_t* dst1, uint32
 }
 
 
-void Scale3x_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void Scale3x_ex8(unsigned char *srcPtr, DWORD srcPitch,
 				 unsigned char  *dstPtr, int width, int height)
 {
 	int count = height;
@@ -937,7 +935,7 @@ static Atom xv_intern_atom_if_exists( Display *display, char const * atom_name )
 
 // close display
 
-void DestroyDisplay(void)
+static void DestroyDisplay(void)
 {
  if(display)
   {
@@ -979,7 +977,7 @@ int root_window_id=0;
 
 // Create display
 
-void CreateDisplay(void)
+static void CreateDisplay(void)
 {
  XSetWindowAttributes winattr;
  int                  myscreen;
@@ -1336,7 +1334,7 @@ shminfo.readOnly = 0;
 void (*p2XSaIFunc) (unsigned char *, DWORD, unsigned char *, int, int);
 unsigned char *pBackBuffer = 0;
 
-void BlitScreen32(unsigned char *surf, int32_t x, int32_t y)
+static void BlitScreen32(unsigned char *surf, int32_t x, int32_t y)
 {
  unsigned char *pD;
  unsigned int startxy;
@@ -1405,7 +1403,7 @@ void BlitScreen32(unsigned char *surf, int32_t x, int32_t y)
 
 
 
-void BlitToYUV(unsigned char * surf,int32_t x,int32_t y)
+static void BlitToYUV(unsigned char * surf,int32_t x,int32_t y)
 {
  unsigned char * pD;
  unsigned int startxy;
@@ -1498,7 +1496,7 @@ void BlitToYUV(unsigned char * surf,int32_t x,int32_t y)
 }
 
 //dst will have half the pitch (32bit to 16bit)
-void RGB2YUV(uint32_t *s, int width, int height, uint32_t *d)
+static void RGB2YUV(uint32_t *s, int width, int height, uint32_t *d)
 {
 	int x,y;
 	int R,G,B, Y1,Y2,U,V;
@@ -1531,13 +1529,11 @@ void RGB2YUV(uint32_t *s, int width, int height, uint32_t *d)
 	}
 }
 
-extern time_t tStart;
-
 /* compute the position and the size of output screen
  * The aspect of the psx output mode is preserved.
  * Note: dest dx,dy,dw,dh are both input and output variables
  */
-__inline void MaintainAspect(uint32_t * dx, uint32_t * dy, uint32_t * dw, uint32_t * dh)
+static __inline void MaintainAspect(uint32_t * dx, uint32_t * dy, uint32_t * dw, uint32_t * dh)
 {
 
 	double ratio_x = ((double)*dw) / ((double)PSXDisplay.DisplayMode.x) ;
@@ -1673,7 +1669,7 @@ void DoClearFrontBuffer(void)                          // CLEAR DX BUFFER
  XSync(display,False);*/
 }
 
-int Xinitialize()
+static int Xinitialize()
 {
    iDesktopCol=32;
 
@@ -1739,7 +1735,7 @@ int Xinitialize()
  return 0;
 }
 
-void Xcleanup()                                        // X CLEANUP
+static void Xcleanup()                                        // X CLEANUP
 {
  CloseMenu();
 
diff --git a/plugins/dfxvideo/draw.h b/plugins/dfxvideo/draw.h
index 2454a1f4..a769d795 100644
--- a/plugins/dfxvideo/draw.h
+++ b/plugins/dfxvideo/draw.h
@@ -41,6 +41,18 @@ typedef struct {
 void          MoveScanLineArea(HWND hwnd);
 #endif
 
+#if !defined(_WINDOWS) &&  !defined (_MACGL)
+extern Display         *display;
+extern Window        window;
+extern int           root_window_id;
+#endif
+
+#ifndef _WINDOWS
+extern char * Xpixels;
+#endif
+
+#include <time.h>
+extern time_t tStart;
 ///////////////////////////////////////////////////////////////////////
 
 #endif // _GPU_DRAW_H_
diff --git a/plugins/dfxvideo/fps.c b/plugins/dfxvideo/fps.c
index 2edcd30b..b1734789 100644
--- a/plugins/dfxvideo/fps.c
+++ b/plugins/dfxvideo/fps.c
@@ -63,7 +63,7 @@ void CheckFrameRate(void)
 
 #define TIMEBASE 100000
 
-unsigned long timeGetTime()
+static unsigned long timeGetTime()
 {
  struct timeval tv;
  gettimeofday(&tv, 0);                                 // well, maybe there are better ways
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index 4aa6f230..e74331ae 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -32,16 +32,7 @@
 #include "key.h"
 #include "fps.h"
 #include "swap.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
+#include "psemu_plugin_defs.h"
 
 #ifdef _WINDOWS
 #include "resource.h"
@@ -58,14 +49,20 @@ const  unsigned char build    = 17;   // increase that with each version
 
 #if defined (_WINDOWS)
 static char *libraryName      = N_("Soft Driver");
+#if 0
 static char *libraryInfo      = N_("P.E.Op.S. Soft Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n");
+#endif
 #elif defined (_MACGL)
 static char *libraryName      = N_("SoftGL Driver");
+#if 0
 static char *libraryInfo      = N_("P.E.Op.S. SoftGL Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n");
+#endif
 #else
 static char *libraryName      = N_("XVideo Driver");
+#if 0
 static char *libraryInfo      = N_("P.E.Op.S. Xvideo Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n");
 #endif
+#endif
 
 static char *PluginAuthor     = N_("Pete Bernert and the P.E.Op.S. team");
 
@@ -137,7 +134,7 @@ EXECUTION_STATE WINAPI STUB_SetThreadExecutionState(EXECUTION_STATE esFlags)
 // The dynamic version of the system call is prepended with a "D_"
 EXECUTION_STATE (WINAPI *D_SetThreadExecutionState)(EXECUTION_STATE esFlags) = STUB_SetThreadExecutionState;
 
-BOOL LoadKernel32(void)
+static BOOL LoadKernel32(void)
 {
 	// Get a handle to the kernel32.dll (which is actually already loaded)
 	kernel32LibHandle = LoadLibrary("kernel32.dll");
@@ -152,7 +149,7 @@ BOOL LoadKernel32(void)
 	return TRUE;
 }
 
-BOOL FreeKernel32(void)
+static BOOL FreeKernel32(void)
 {
 	// Release the handle to kernel32.dll
 	if (kernel32LibHandle != NULL)
@@ -166,12 +163,12 @@ BOOL FreeKernel32(void)
 #else
 
 // Linux: Stub the functions
-BOOL LoadKernel32(void)
+static BOOL LoadKernel32(void)
 {
 	return TRUE;
 }
 
-BOOL FreeKernel32(void)
+static BOOL FreeKernel32(void)
 {
 	return TRUE;
 }
@@ -195,11 +192,13 @@ void CALLBACK GPUdisplayText(char * pText)             // some debug func
 
 ////////////////////////////////////////////////////////////////////////
 
+#if 0
 void CALLBACK GPUdisplayFlags(unsigned long dwFlags)   // some info func
 {
  dwCoreFlags=dwFlags;
  BuildDispMenu(0);
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // stuff to make this a true PDK module
@@ -220,16 +219,18 @@ unsigned long CALLBACK PSEgetLibVersion(void)
  return version<<16|revision<<8|build;
 }
 
+#if 0
 char * GPUgetLibInfos(void)
 {
  return _(libraryInfo);
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // Snapshot func
 ////////////////////////////////////////////////////////////////////////
 
-char * pGetConfigInfos(int iCfg)
+static char * pGetConfigInfos(int iCfg)
 {
  char szO[2][4]={"off","on "};
  char szTxt[256];
@@ -305,7 +306,12 @@ static void DoTextSnapShot(int iNum)
  pB = pGetConfigInfos(0);
  if (pB)
   {
-   fwrite(pB, strlen(pB), 1, txtfile);
+   if(fwrite(pB, strlen(pB), 1, txtfile) != 1) {
+     fclose(txtfile);
+     free(pB);
+     remove(szTxt);
+     return;
+   }
    free(pB);
   }
  fclose(txtfile);
@@ -373,7 +379,11 @@ void CALLBACK GPUmakeSnapshot(void)
  if ((bmpfile = fopen(filename,"wb")) == NULL)
   return;
 
- fwrite(header, 0x36, 1, bmpfile);
+ if(fwrite(header, 0x36, 1, bmpfile) != 1) {
+   fclose(bmpfile);
+   remove(filename);
+   return;
+ }
  for (i = height + PSXDisplay.DisplayPosition.y - 1; i >= PSXDisplay.DisplayPosition.y; i--)
   {
    pD = (unsigned char *)&psxVuw[i * 1024 + PSXDisplay.DisplayPosition.x];
@@ -396,10 +406,21 @@ void CALLBACK GPUmakeSnapshot(void)
        pD += 2;
       }
     }
-   fwrite(line, PreviousPSXDisplay.Range.x1 * 3, 1, bmpfile);
+   if(fwrite(line, PreviousPSXDisplay.Range.x1 * 3, 1, bmpfile) != 1) {
+     fclose(bmpfile);
+     remove(filename);
+     return;
+   }
   }
- fwrite(empty, 0x2, 1, bmpfile);
+ if(fwrite(empty, 0x2, 1, bmpfile) != 1) {
  fclose(bmpfile);
+   remove(filename);
+   return;
+ }
+ if(fclose(bmpfile) != 0) {
+   remove(filename);
+   return;
+ }
 
  DoTextSnapShot(snapshotnr);
 }
@@ -621,7 +642,7 @@ void updateDisplay(void)                               // UPDATE DISPLAY
 // roughly emulated screen centering bits... not complete !!!
 ////////////////////////////////////////////////////////////////////////
 
-void ChangeDispOffsetsX(void)                          // X CENTER
+static void ChangeDispOffsetsX(void)                          // X CENTER
 {
  long lx,l;
 
@@ -681,7 +702,7 @@ void ChangeDispOffsetsX(void)                          // X CENTER
 
 ////////////////////////////////////////////////////////////////////////
 
-void ChangeDispOffsetsY(void)                          // Y CENTER
+static void ChangeDispOffsetsY(void)                          // Y CENTER
 {
  int iT,iO=PreviousPSXDisplay.Range.y0;
  int iOldYOffset=PreviousPSXDisplay.DisplayModeNew.y;
@@ -741,7 +762,7 @@ void ChangeDispOffsetsY(void)                          // Y CENTER
 // check if update needed
 ////////////////////////////////////////////////////////////////////////
 
-void updateDisplayIfChanged(void)                      // UPDATE DISPLAY IF CHANGED
+static void updateDisplayIfChanged(void)                      // UPDATE DISPLAY IF CHANGED
 {
  if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) &&
      (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))
@@ -793,11 +814,8 @@ void ChangeWindowMode(void)                            // TOGGLE FULLSCREEN - WI
 
 #include "draw.h"
 
-void ChangeWindowMode(void)                            // TOGGLE FULLSCREEN - WINDOW
+static void ChangeWindowMode(void)                            // TOGGLE FULLSCREEN - WINDOW
 {
- extern Display         *display;
- extern Window        window;
- extern int           root_window_id;
  Screen 		*screen;
  XSizeHints           hints;
  MotifWmHints         mwmhints;
@@ -1240,7 +1258,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata)      // WRITE STATUS
 // vram read/write helpers, needed by LEWPY's optimized vram read/write :)
 ////////////////////////////////////////////////////////////////////////
 
-__inline void FinishedVRAMWrite(void)
+static __inline void FinishedVRAMWrite(void)
 {
 /*
 // NEWX
@@ -1267,7 +1285,7 @@ __inline void FinishedVRAMWrite(void)
  VRAMWrite.RowsRemaining = 0;
 }
 
-__inline void FinishedVRAMRead(void)
+static __inline void FinishedVRAMRead(void)
 {
  // Set register to NORMAL operation
  DataReadMode = DR_NORMAL;
@@ -1568,6 +1586,7 @@ void CALLBACK GPUwriteData(uint32_t gdata)
 // this functions will be removed soon (or 'soonish')... not really needed, but some emus want them
 ////////////////////////////////////////////////////////////////////////
 
+#if 0
 void CALLBACK GPUsetMode(unsigned long gdata)
 {
 // Peops does nothing here...
@@ -1583,6 +1602,7 @@ long CALLBACK GPUgetMode(void)
  if(DataReadMode ==DR_VRAMTRANSFER) iT|=0x2;
  return iT;
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // call config dlg
@@ -1629,7 +1649,7 @@ void SetFixes(void)
 
 unsigned long lUsedAddr[3];
 
-__inline BOOL CheckForEndlessLoop(unsigned long laddr)
+static __inline BOOL CheckForEndlessLoop(unsigned long laddr)
 {
  if(laddr==lUsedAddr[1]) return TRUE;
  if(laddr==lUsedAddr[2]) return TRUE;
@@ -1720,16 +1740,6 @@ long CALLBACK GPUtest(void)
 // Freeze
 ////////////////////////////////////////////////////////////////////////
 
-typedef struct GPUFREEZETAG
-{
- uint32_t ulFreezeVersion;      // should be always 1 for now (set by main emu)
- uint32_t ulStatus;             // current gpu status
- uint32_t ulControl[256];       // latest control register values
- unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN)
-} GPUFreeze_t;
-
-////////////////////////////////////////////////////////////////////////
-
 long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
 {
  //----------------------------------------------------//
@@ -2019,7 +2029,9 @@ unsigned char cFont[10][120]=
 
 ////////////////////////////////////////////////////////////////////////
 
-void PaintPicDot(unsigned char * p,unsigned char c)
+#ifdef _WINDOWS /* used by commmented out linux version as well */
+
+static void PaintPicDot(unsigned char * p,unsigned char c)
 {
 
  if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}        // black
@@ -2027,6 +2039,7 @@ void PaintPicDot(unsigned char * p,unsigned char c)
  if(c==2) {*p++=0x00;*p++=0x00;*p=0xff;return;}        // red
                                                        // transparent
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // the main emu allocs 128x96x3 bytes, and passes a ptr
@@ -2039,7 +2052,7 @@ void PaintPicDot(unsigned char * p,unsigned char c)
 
 #ifdef _WINDOWS
 
-void CALLBACK GPUgetScreenPic(unsigned char * pMem)
+long CALLBACK GPUgetScreenPic(unsigned char * pMem)
 {
  HRESULT ddrval;DDSURFACEDESC xddsd;unsigned char * pf;
  int x,y,c,v;RECT r;
@@ -2174,16 +2187,16 @@ void CALLBACK GPUgetScreenPic(unsigned char * pMem)
    *(pf+(127*3))=0xff;*pf++=0xff;
    pf+=127*3;                                          // offset to next line
   }
+  return 0;
 }
 
 #else
 
 // LINUX version:
 
-extern char * Xpixels;
-
-void GPUgetScreenPic(unsigned char * pMem)
+long GPUgetScreenPic(unsigned char * pMem)
 {
+  return -1;
 /*
  unsigned short c;unsigned char * pf;int x,y;
 
@@ -2250,6 +2263,7 @@ void GPUgetScreenPic(unsigned char * pMem)
    *(pf+(127*3))=0xff;*pf++=0xff;
    pf+=127*3;                                          // offset to next line
   }
+  return 0;
 */
 }
 
@@ -2263,17 +2277,20 @@ void GPUgetScreenPic(unsigned char * pMem)
 // release your picture data and stop displaying
 // the screen pic
 
-void CALLBACK GPUshowScreenPic(unsigned char * pMem)
+long CALLBACK GPUshowScreenPic(unsigned char * pMem)
 {
  DestroyPic();                                         // destroy old pic data
- if(pMem==0) return;                                   // done
+ if(pMem==0) return 0;                                   // done
  CreatePic(pMem);                                      // create new pic... don't free pMem or something like that... just read from it
+ return 0;
 }
 
+#if 0
 void CALLBACK GPUsetfix(uint32_t dwFixBits)
 {
  dwEmuFixes=dwFixBits;
 }
+#endif
 
 void CALLBACK GPUvBlank( int val )
 {
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 7a0e2327..e5062757 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -34,7 +34,7 @@ enum {
 
 /*	This function checks for the value being outside the accepted range,
 	and returns the appropriate boundary value */
-int set_limit (char *p, int len, int lower, int upper)
+static int set_limit (char *p, int len, int lower, int upper)
 {
 	int val = 0;
 
@@ -49,18 +49,18 @@ int set_limit (char *p, int len, int lower, int upper)
     return val;
 }
 
-void on_about_clicked(GtkWidget *widget, gpointer user_data)
+static void on_about_clicked(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy (widget);
 	exit (0);
 }
 
-void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
+static void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
 {
-	gtk_widget_set_sensitive (widget, (int)user_data);
+	gtk_widget_set_sensitive (widget, (int)(long)user_data);
 }
 
-void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
+static void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *resCombo2;
 	GladeXML *xml;
@@ -69,10 +69,10 @@ void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
 	check = glade_xml_get_widget(xml, "checkFullscreen");
 	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
 
-	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
+	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)));
 }
 
-void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
+static void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *table_fixes;
 	GladeXML *xml;
@@ -83,25 +83,26 @@ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 
 	/* Set the state of each of the fixes to the value of the use fixes toggle */
 	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
-		(void *)gtk_toggle_button_get_active (check));
+		(gpointer)(long)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(check)));
 }
 
-void on_fps_toggled(GtkWidget *widget, gpointer user_data)
+static void on_fps_toggled(GtkWidget *widget, gpointer user_data)
 {
-	GtkWidget *checkSetFPS, *checkAutoFPSLimit, *entryFPS;
+	GtkWidget *entryFPS, *checkAutoFPSLimit;
+	GtkToggleButton *checkSetFPS;
 	GladeXML *xml;
 
 	xml = (GladeXML*) user_data;
-	checkSetFPS = glade_xml_get_widget(xml, "checkSetFPS");
+	checkSetFPS = GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "checkSetFPS"));
 	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
 	entryFPS = glade_xml_get_widget(xml, "entryFPS");
 
-	set_widget_sensitive(entryFPS,
-		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
-	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
+	gtk_widget_set_sensitive(entryFPS,
+		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkAutoFPSLimit)));
+	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
 }
 
-void OnConfigClose(GtkWidget *widget, gpointer user_data)
+static void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
 	GladeXML *xml = (GladeXML *)user_data;
 
@@ -112,9 +113,9 @@ void OnConfigClose(GtkWidget *widget, gpointer user_data)
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *CfgWnd, *widget;
+  GtkWidget *widget;
   GladeXML *xml;
-  FILE *in;char t[256];int len,val; 
+  FILE *in;char t[256];int len = 0,val; 
   float valf;
   char * pB, * p;
   char cfg[255];
@@ -282,7 +283,7 @@ main (int argc, char *argv[])
     if(valf>500) valf=500;
    }
   sprintf(tempstr,"%.1f",valf);
-  gtk_entry_set_text(glade_xml_get_widget(xml, "entryFPS"),tempstr);
+  gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entryFPS")),tempstr);
 
   val=0;
   if(pB)
@@ -343,7 +344,7 @@ main (int argc, char *argv[])
 }
 
 
-void SetCfgVal(char * pB,char * pE,int val)
+static void SetCfgVal(char * pB,char * pE,int val)
 {
  char * p, *ps, *pC;char t[32];
 
@@ -381,7 +382,6 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
   char cfg[255];
   char tempstr[50];
   int i;
-  struct stat buf;
 
   pB=(char *)malloc(32767);
   memset(pB,0,32767);
@@ -432,7 +432,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
  SetCfgVal(pB,"\nUseFrameSkip",val);
 
  //Framerate stored *10
- val = atof(gtk_entry_get_text(glade_xml_get_widget(xml, "entryFPS"))) * 10;
+ val = atof(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entryFPS")))) * 10;
  SetCfgVal(pB,"\nFrameRate",val);
 
  val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkUseFixes")));
@@ -453,7 +453,8 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 
  if((in=fopen(cfg, WRITEBINARY))!=NULL)
   {
-   fwrite(pB,strlen(pB),1,in);
+   if(fwrite(pB,strlen(pB),1,in) != 1)
+      perror(cfg);
    fclose(in);
   }
 
diff --git a/plugins/dfxvideo/key.c b/plugins/dfxvideo/key.c
index 4d75c8f4..17311ef8 100644
--- a/plugins/dfxvideo/key.c
+++ b/plugins/dfxvideo/key.c
@@ -22,6 +22,7 @@
 #include "gpu.h"
 #include "draw.h"
 #include "key.h"
+#include "psemu_plugin_defs.h"
 
 #define VK_INSERT      65379
 #define VK_HOME        65360
diff --git a/plugins/dfxvideo/menu.c b/plugins/dfxvideo/menu.c
index 57ff2201..4867ca0b 100644
--- a/plugins/dfxvideo/menu.c
+++ b/plugins/dfxvideo/menu.c
@@ -20,79 +20,76 @@
 #include "externals.h"
 #include "draw.h"
 #include "menu.h"
-#include "gpu.h"

+#include "gpu.h"
 
-#ifdef _WINDOWS

-

-#include "record.h"

-

-HFONT hGFont=NULL;

-BOOL  bTransparent=FALSE;

-

-#endif

+#ifdef _WINDOWS
+
+#include "record.h"
+
+HFONT hGFont=NULL;
+BOOL  bTransparent=FALSE;
+
+#endif
 
 unsigned long dwCoreFlags = 0;
 
 // create lists/stuff for fonts (actually there are no more lists, but I am too lazy to change the func names ;)
 void InitMenu(void)
-{

-#ifdef _WINDOWS

- hGFont=CreateFont(//-8,

-                   13,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,

-                   ANSI_CHARSET,OUT_DEFAULT_PRECIS,

-                   CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,

-                   DEFAULT_PITCH,

-                   //"Courier New");

-                   //"MS Sans Serif");

-                   "Arial");

+{
+#ifdef _WINDOWS
+ hGFont=CreateFont(//-8,
+                   13,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,
+                   ANSI_CHARSET,OUT_DEFAULT_PRECIS,
+                   CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,
+                   DEFAULT_PITCH,
+                   //"Courier New");
+                   //"MS Sans Serif");
+                   "Arial");
 #endif
 }
 
 // kill existing lists/fonts
 void CloseMenu(void)
 {
-#ifdef _WINDOWS

- if(hGFont) DeleteObject(hGFont);

- hGFont=NULL;

-#else

- DestroyPic();

+#ifdef _WINDOWS
+ if(hGFont) DeleteObject(hGFont);
+ hGFont=NULL;
+#else
+ DestroyPic();
 #endif
 }
 
 // DISPLAY FPS/MENU TEXT
 
-#include <time.h>
-extern time_t tStart;
-
 int iMPos=0;                                           // menu arrow pos
 
 void DisplayText(void)                                 // DISPLAY TEXT
-{

-#ifdef _WINDOWS

- HDC hdc;HFONT hFO;

-

- IDirectDrawSurface_GetDC(DX.DDSRender,&hdc);

- hFO=(HFONT)SelectObject(hdc,hGFont);

-

- SetTextColor(hdc,RGB(0,255,0));

- if(bTransparent) 

-      SetBkMode(hdc,TRANSPARENT);

- else SetBkColor(hdc,RGB(0,0,0));

-

- if(szDebugText[0] && ((time(NULL) - tStart) < 2))     // special debug text? show it

-  {

-   RECT r={0,0,1024,1024};

-   DrawText(hdc,szDebugText,lstrlen(szDebugText),&r,DT_LEFT|DT_NOCLIP);

-  }

- else                                                  // else standard gpu menu

-  {

-   szDebugText[0]=0;

-   lstrcat(szDispBuf,szMenuBuf);

-   ExtTextOut(hdc,0,0,0,NULL,szDispBuf,lstrlen(szDispBuf),NULL);

-  }

-

- SelectObject(hdc,hFO);

- IDirectDrawSurface_ReleaseDC(DX.DDSRender,hdc);

+{
+#ifdef _WINDOWS
+ HDC hdc;HFONT hFO;
+
+ IDirectDrawSurface_GetDC(DX.DDSRender,&hdc);
+ hFO=(HFONT)SelectObject(hdc,hGFont);
+
+ SetTextColor(hdc,RGB(0,255,0));
+ if(bTransparent) 
+      SetBkMode(hdc,TRANSPARENT);
+ else SetBkColor(hdc,RGB(0,0,0));
+
+ if(szDebugText[0] && ((time(NULL) - tStart) < 2))     // special debug text? show it
+  {
+   RECT r={0,0,1024,1024};
+   DrawText(hdc,szDebugText,lstrlen(szDebugText),&r,DT_LEFT|DT_NOCLIP);
+  }
+ else                                                  // else standard gpu menu
+  {
+   szDebugText[0]=0;
+   lstrcat(szDispBuf,szMenuBuf);
+   ExtTextOut(hdc,0,0,0,NULL,szDispBuf,lstrlen(szDispBuf),NULL);
+  }
+
+ SelectObject(hdc,hFO);
+ IDirectDrawSurface_ReleaseDC(DX.DDSRender,hdc);
 #endif
 }
 
@@ -144,27 +141,27 @@ void BuildDispMenu(int iInc)
    szMenuBuf[24]='0'+(char)((dwCoreFlags&0xf000)>>12);                         // number
   }
 
-#ifdef _WINDOWS

- if(bVsync_Key)     szMenuBuf[25]  = 'V';

-#endif

+#ifdef _WINDOWS
+ if(bVsync_Key)     szMenuBuf[25]  = 'V';
+#endif
 
  if(lSelectedSlot)  szMenuBuf[26]  = '0'+(char)lSelectedSlot;   
 
- szMenuBuf[(iMPos+1)*5]='<';                           // set arrow

-
-#ifdef _WINDOWS

- if(RECORD_RECORDING)

-  {

-   szMenuBuf[27]  = ' ';

-   szMenuBuf[28]  = ' ';

-   szMenuBuf[29]  = ' ';

-   szMenuBuf[30]  = 'R';

-   szMenuBuf[31]  = 'e';

-   szMenuBuf[32]  = 'c';

-   szMenuBuf[33]  = 0;

-  }

-

- if(DX.DDSScreenPic) ShowTextGpuPic();

+ szMenuBuf[(iMPos+1)*5]='<';                           // set arrow
+
+#ifdef _WINDOWS
+ if(RECORD_RECORDING)
+  {
+   szMenuBuf[27]  = ' ';
+   szMenuBuf[28]  = ' ';
+   szMenuBuf[29]  = ' ';
+   szMenuBuf[30]  = 'R';
+   szMenuBuf[31]  = 'e';
+   szMenuBuf[32]  = 'c';
+   szMenuBuf[33]  = 0;
+  }
+
+ if(DX.DDSScreenPic) ShowTextGpuPic();
 #endif
 }
 
@@ -178,18 +175,18 @@ void SwitchDispMenu(int iStep)                         // SWITCH DISP MENU
    case 0:                                             // frame limit
     {
      int iType=0;
-     bInitCap = TRUE;

-
-#ifdef _WINDOWS

-     if(iFrameLimit==1 && UseFrameLimit &&

-        GetAsyncKeyState(VK_SHIFT)&32768)

-      {

-       fFrameRate+=iStep;

-       if(fFrameRate<3.0f) fFrameRate=3.0f;

-       SetAutoFrameCap();

-       break;

-      }

-#endif

+     bInitCap = TRUE;
+
+#ifdef _WINDOWS
+     if(iFrameLimit==1 && UseFrameLimit &&
+        GetAsyncKeyState(VK_SHIFT)&32768)
+      {
+       fFrameRate+=iStep;
+       if(fFrameRate<3.0f) fFrameRate=3.0f;
+       SetAutoFrameCap();
+       break;
+      }
+#endif
 
      if(UseFrameLimit) iType=iFrameLimit;
      iType+=iStep;
diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c
index 563980ae..8729170a 100644
--- a/plugins/dfxvideo/prim.c
+++ b/plugins/dfxvideo/prim.c
@@ -54,7 +54,7 @@ __inline unsigned short BGR24to16 (uint32_t BGR);
 
 #else
 
-__inline unsigned short BGR24to16 (uint32_t BGR)
+static __inline unsigned short BGR24to16 (uint32_t BGR)
 {
  return (unsigned short)(((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6));
 }
@@ -65,7 +65,7 @@ __inline unsigned short BGR24to16 (uint32_t BGR)
 // Update global TP infos
 ////////////////////////////////////////////////////////////////////////
 
-__inline void UpdateGlobalTP(unsigned short gdata)
+static __inline void UpdateGlobalTP(unsigned short gdata)
 {
  GlobalTextAddrX = (gdata << 6) & 0x3c0;               // texture addr
 
@@ -119,7 +119,7 @@ __inline void UpdateGlobalTP(unsigned short gdata)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetRenderMode(uint32_t DrawAttributes)
+static __inline void SetRenderMode(uint32_t DrawAttributes)
 {
  DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
 
@@ -155,7 +155,7 @@ __inline void SetRenderMode(uint32_t DrawAttributes)
 #define CHKMAX_X 1024
 #define CHKMAX_Y 512
 
-void AdjustCoord4()
+static void AdjustCoord4()
 {
  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -167,7 +167,7 @@ void AdjustCoord4()
  ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord3()
+static void AdjustCoord3()
 {
  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -177,7 +177,7 @@ void AdjustCoord3()
  ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord2()
+static void AdjustCoord2()
 {
  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -185,7 +185,7 @@ void AdjustCoord2()
  ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord1()
+static void AdjustCoord1()
 {
  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
  ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
@@ -207,11 +207,13 @@ void AdjustCoord1()
 // x -466 1023 180 1023
 // y   20 -228 222 -100
 
+/*
 // 0 __1
 //  \ / \ 
 //   2___3
+*/
 
-__inline BOOL CheckCoord4()
+static __inline BOOL CheckCoord4()
 {
  if(lx0<0)
   {
@@ -277,7 +279,7 @@ __inline BOOL CheckCoord4()
  return FALSE;
 }
 
-__inline BOOL CheckCoord3()
+static __inline BOOL CheckCoord3()
 {
  if(lx0<0)
   {
@@ -314,7 +316,7 @@ __inline BOOL CheckCoord3()
 }
 
 
-__inline BOOL CheckCoord2()
+static __inline BOOL CheckCoord2()
 {
  if(lx0<0)
   {
@@ -336,7 +338,7 @@ __inline BOOL CheckCoord2()
  return FALSE;
 }
 
-__inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
+static __inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
 {
  if(slx0<0)
   {
@@ -363,7 +365,7 @@ __inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
 // mask stuff... used in silent hill
 ////////////////////////////////////////////////////////////////////////
 
-void cmdSTP(unsigned char * baseAddr)
+static void cmdSTP(unsigned char * baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -381,7 +383,7 @@ void cmdSTP(unsigned char * baseAddr)
 // cmd: Set texture page infos
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTexturePage(unsigned char * baseAddr)
+static void cmdTexturePage(unsigned char * baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -398,7 +400,7 @@ void cmdTexturePage(unsigned char * baseAddr)
 // cmd: turn on/off texture window
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTextureWindow(unsigned char *baseAddr)
+static void cmdTextureWindow(unsigned char *baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -466,7 +468,7 @@ void cmdTextureWindow(unsigned char *baseAddr)
 
 
 
-void cmdDrawAreaStart(unsigned char * baseAddr)
+static void cmdDrawAreaStart(unsigned char * baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -490,7 +492,7 @@ void cmdDrawAreaStart(unsigned char * baseAddr)
 // cmd: end of drawing area... primitives will be clipped inside
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawAreaEnd(unsigned char * baseAddr)
+static void cmdDrawAreaEnd(unsigned char * baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -514,7 +516,7 @@ void cmdDrawAreaEnd(unsigned char * baseAddr)
 // cmd: draw offset... will be added to prim coords
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawOffset(unsigned char * baseAddr)
+static void cmdDrawOffset(unsigned char * baseAddr)
 {
  uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
@@ -539,7 +541,7 @@ void cmdDrawOffset(unsigned char * baseAddr)
 // cmd: load image to vram
 ////////////////////////////////////////////////////////////////////////
 
-void primLoadImage(unsigned char * baseAddr)
+static void primLoadImage(unsigned char * baseAddr)
 {
  unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
@@ -559,7 +561,7 @@ void primLoadImage(unsigned char * baseAddr)
 // cmd: vram -> psx mem
 ////////////////////////////////////////////////////////////////////////
 
-void primStoreImage(unsigned char * baseAddr)
+static void primStoreImage(unsigned char * baseAddr)
 {
  unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
@@ -581,7 +583,7 @@ void primStoreImage(unsigned char * baseAddr)
 // cmd: blkfill - NO primitive! Doesn't care about draw areas...
 ////////////////////////////////////////////////////////////////////////
 
-void primBlkFill(unsigned char * baseAddr)
+static void primBlkFill(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -610,7 +612,7 @@ void primBlkFill(unsigned char * baseAddr)
 // cmd: move image vram -> vram
 ////////////////////////////////////////////////////////////////////////
 
-void primMoveImage(unsigned char * baseAddr)
+static void primMoveImage(unsigned char * baseAddr)
 {
  short *sgpuData = ((short *) baseAddr);
 
@@ -718,7 +720,7 @@ void primMoveImage(unsigned char * baseAddr)
 //#define SMALLDEBUG
 //#include <dbgout.h>
 
-void primTileS(unsigned char * baseAddr)
+static void primTileS(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t*)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -749,7 +751,7 @@ void primTileS(unsigned char * baseAddr)
 // cmd: draw 1 dot Tile (point)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile1(unsigned char * baseAddr)
+static void primTile1(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t*)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -779,7 +781,7 @@ void primTile1(unsigned char * baseAddr)
 // cmd: draw 8 dot Tile (small rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile8(unsigned char * baseAddr)
+static void primTile8(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t*)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -809,7 +811,7 @@ void primTile8(unsigned char * baseAddr)
 // cmd: draw 16 dot Tile (medium rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile16(unsigned char * baseAddr)
+static void primTile16(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t*)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -839,7 +841,7 @@ void primTile16(unsigned char * baseAddr)
 // cmd: small sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt8(unsigned char * baseAddr)
+static void primSprt8(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -865,7 +867,7 @@ void primSprt8(unsigned char * baseAddr)
 // cmd: medium sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt16(unsigned char * baseAddr)
+static void primSprt16(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -892,7 +894,7 @@ void primSprt16(unsigned char * baseAddr)
 ////////////////////////////////////////////////////////////////////////
 
 // func used on texture coord wrap
-void primSprtSRest(unsigned char * baseAddr,unsigned short type)
+static void primSprtSRest(unsigned char * baseAddr,unsigned short type)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -977,7 +979,7 @@ void primSprtSRest(unsigned char * baseAddr,unsigned short type)
                                      
 ////////////////////////////////////////////////////////////////////////
 
-void primSprtS(unsigned char * baseAddr)
+static void primSprtS(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1023,7 +1025,7 @@ void primSprtS(unsigned char * baseAddr)
 // cmd: flat shaded Poly4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF4(unsigned char *baseAddr)
+static void primPolyF4(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1055,7 +1057,7 @@ void primPolyF4(unsigned char *baseAddr)
 // cmd: smooth shaded Poly4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyG4(unsigned char * baseAddr)
+static void primPolyG4(unsigned char * baseAddr)
 {
  uint32_t *gpuData = (uint32_t *)baseAddr;
  short *sgpuData = ((short *) baseAddr);
@@ -1088,7 +1090,7 @@ void primPolyG4(unsigned char * baseAddr)
 // cmd: flat shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyFT3(unsigned char * baseAddr)
+static void primPolyFT3(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1121,7 +1123,7 @@ void primPolyFT3(unsigned char * baseAddr)
 // cmd: flat shaded Texture4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyFT4(unsigned char * baseAddr)
+static void primPolyFT4(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1157,7 +1159,7 @@ void primPolyFT4(unsigned char * baseAddr)
 // cmd: smooth shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT3(unsigned char *baseAddr)
+static void primPolyGT3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1197,7 +1199,7 @@ void primPolyGT3(unsigned char *baseAddr)
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyG3(unsigned char *baseAddr)
+static void primPolyG3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1227,7 +1229,7 @@ void primPolyG3(unsigned char *baseAddr)
 // cmd: smooth shaded Texture4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT4(unsigned char *baseAddr)
+static void primPolyGT4(unsigned char *baseAddr)
 { 
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1270,7 +1272,7 @@ void primPolyGT4(unsigned char *baseAddr)
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF3(unsigned char *baseAddr)
+static void primPolyF3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1300,7 +1302,7 @@ void primPolyF3(unsigned char *baseAddr)
 // cmd: skipping shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGSkip(unsigned char *baseAddr)
+static void primLineGSkip(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int iMax=255;
@@ -1322,7 +1324,7 @@ void primLineGSkip(unsigned char *baseAddr)
 // cmd: shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGEx(unsigned char *baseAddr)
+static void primLineGEx(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int iMax=255;
@@ -1383,7 +1385,7 @@ void primLineGEx(unsigned char *baseAddr)
 // cmd: shaded polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineG2(unsigned char *baseAddr)
+static void primLineG2(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1412,7 +1414,7 @@ void primLineG2(unsigned char *baseAddr)
 // cmd: skipping flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFSkip(unsigned char *baseAddr)
+static void primLineFSkip(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int i=2,iMax=255;
@@ -1432,7 +1434,7 @@ void primLineFSkip(unsigned char *baseAddr)
 // cmd: drawing flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFEx(unsigned char *baseAddr)
+static void primLineFEx(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int iMax;
@@ -1481,7 +1483,7 @@ void primLineFEx(unsigned char *baseAddr)
 // cmd: drawing flat polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineF2(unsigned char *baseAddr)
+static void primLineF2(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1511,7 +1513,7 @@ void primLineF2(unsigned char *baseAddr)
 // cmd: well, easiest command... not implemented
 ////////////////////////////////////////////////////////////////////////
 
-void primNI(unsigned char *bA)
+static void primNI(unsigned char *bA)
 {
 }
 
diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index 4fdb3ae8..a0b2d25e 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -25,11 +25,11 @@
 #include "prim.h"
 #include "menu.h"
 #include "swap.h"
-

-#ifdef _WINDOWS

-#pragma warning (disable:4244)

-#pragma warning (disable:4761)

-#endif

+
+#ifdef _WINDOWS
+#pragma warning (disable:4244)
+#pragma warning (disable:4761)
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////
 // "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
@@ -211,7 +211,7 @@ unsigned char dithertable[16] =
     4, 3, 5, 2
 };
 
-void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)
+static void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)
 {
  unsigned char coeff;
  unsigned char rlow, glow, blow;
@@ -240,7 +240,7 @@ void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned s
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
+static __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
 {
  int32_t r,g,b;
 
@@ -304,7 +304,7 @@ __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 {
  if(bCheckMask && (*pdest & HOST2LE16(0x8000))) return;
 
@@ -363,7 +363,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
+static __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
 {
  if(DrawSemiTrans)
   {
@@ -450,7 +450,7 @@ __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 {
  int32_t r,g,b;unsigned short l;
 
@@ -523,7 +523,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 {
  int32_t r,g,b;unsigned short l;
 
@@ -544,7 +544,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
 {
  int32_t r,g,b;unsigned short l;
 
@@ -617,7 +617,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
 {
  int32_t r,g,b,l;
 
@@ -721,7 +721,7 @@ __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
 {
  int32_t r,g,b;
 
@@ -746,7 +746,7 @@ __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
 {
  int32_t r,g,b;
 
@@ -848,7 +848,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
 {
  int32_t r,g,b;
 
@@ -919,7 +919,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
 {
  int32_t r,g,b;unsigned short l;
 
@@ -991,7 +991,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
 {
  int32_t r,g,b;
 
@@ -1010,7 +1010,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
 {
  int32_t r,g,b;
  
@@ -1205,11 +1205,11 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 // NASM version (external):
 #define shl10idiv i386_shl10idiv
 
-__inline int shl10idiv(int x, int y);
+static __inline int shl10idiv(int x, int y);
 
 #else
 
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
 {
  __int64 bi=x;
  bi<<=10;
@@ -1222,7 +1222,7 @@ __inline int shl10idiv(int x, int y)
 
 // GNUC long long int version:
 
-__inline int shl10idiv(int x, int y) 
+static __inline int shl10idiv(int x, int y) 
 { 
  long long int bi=x; 
  bi<<=10; 
@@ -1235,7 +1235,7 @@ __inline int shl10idiv(int x, int y)
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
                         
-__inline int RightSection_F(void)
+static __inline int RightSection_F(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1251,7 +1251,7 @@ __inline int RightSection_F(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_F(void)
+static __inline int LeftSection_F(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1267,7 +1267,7 @@ __inline int LeftSection_F(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_F(void)
+static __inline BOOL NextRow_F(void)
 {
  if(--left_section_height<=0) 
   {
@@ -1293,7 +1293,7 @@ __inline BOOL NextRow_F(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
 {
  soft_vertex * v1, * v2, * v3;
  int height,longest;
@@ -1355,7 +1355,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_G(void)
+static __inline int RightSection_G(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1371,7 +1371,7 @@ __inline int RightSection_G(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_G(void)
+static __inline int LeftSection_G(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1394,7 +1394,7 @@ __inline int LeftSection_G(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_G(void)
+static __inline BOOL NextRow_G(void)
 {
  if(--left_section_height<=0) 
   {
@@ -1423,7 +1423,7 @@ __inline BOOL NextRow_G(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
  soft_vertex * v1, * v2, * v3;
  int height,longest,temp;
@@ -1501,7 +1501,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_FT(void)
+static __inline int RightSection_FT(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1517,7 +1517,7 @@ __inline int RightSection_FT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_FT(void)
+static __inline int LeftSection_FT(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1538,7 +1538,7 @@ __inline int LeftSection_FT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_FT(void)
+static __inline BOOL NextRow_FT(void)
 {
  if(--left_section_height<=0) 
   {
@@ -1566,7 +1566,7 @@ __inline BOOL NextRow_FT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
 {
  soft_vertex * v1, * v2, * v3;
  int height,longest,temp;
@@ -1654,7 +1654,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_GT(void)
+static __inline int RightSection_GT(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1670,7 +1670,7 @@ __inline int RightSection_GT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_GT(void)
+static __inline int LeftSection_GT(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1698,7 +1698,7 @@ __inline int LeftSection_GT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_GT(void)
+static __inline BOOL NextRow_GT(void)
 {
  if(--left_section_height<=0) 
   {
@@ -1729,7 +1729,7 @@ __inline BOOL NextRow_GT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
  soft_vertex * v1, * v2, * v3;
  int height,longest,temp;
@@ -1834,7 +1834,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_F4(void)
+static __inline int RightSection_F4(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1853,7 +1853,7 @@ __inline int RightSection_F4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_F4(void)
+static __inline int LeftSection_F4(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1872,7 +1872,7 @@ __inline int LeftSection_F4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_F4(void)
+static __inline BOOL NextRow_F4(void)
 {
  if(--left_section_height<=0) 
   {
@@ -1904,7 +1904,7 @@ __inline BOOL NextRow_F4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
 {
  soft_vertex * v1, * v2, * v3, * v4;
  int height,width,longest1,longest2;
@@ -2046,7 +2046,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_FT4(void)
+static __inline int RightSection_FT4(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2069,7 +2069,7 @@ __inline int RightSection_FT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_FT4(void)
+static __inline int LeftSection_FT4(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2092,7 +2092,7 @@ __inline int LeftSection_FT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_FT4(void)
+static __inline BOOL NextRow_FT4(void)
 {
  if(--left_section_height<=0) 
   {
@@ -2128,7 +2128,7 @@ __inline BOOL NextRow_FT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
  soft_vertex * v1, * v2, * v3, * v4;
  int height,width,longest1,longest2;
@@ -2277,7 +2277,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_GT4(void)
+static __inline int RightSection_GT4(void)
 {
  soft_vertex * v1 = right_array[ right_section ];
  soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2307,7 +2307,7 @@ __inline int RightSection_GT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_GT4(void)
+static __inline int LeftSection_GT4(void)
 {
  soft_vertex * v1 = left_array[ left_section ];
  soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2337,7 +2337,7 @@ __inline int LeftSection_GT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_GT4(void)
+static __inline BOOL NextRow_GT4(void)
 {
  if(--left_section_height<=0) 
   {
@@ -2379,7 +2379,7 @@ __inline BOOL NextRow_GT4(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
 {
  soft_vertex * v1, * v2, * v3, * v4;
  int height,width,longest1,longest2;
@@ -2549,7 +2549,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3
 // POLY 3/4 FLAT SHADED
 ////////////////////////////////////////////////////////////////////////
 
-__inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
+static __inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
 {
  int i,j,xmin,xmax,ymin,ymax;
  unsigned short color;uint32_t lcolor;
@@ -2693,7 +2693,7 @@ void drawPoly4F(int32_t rgb)
 // POLY 3/4 F-SHADED TEX PAL 4
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -2825,7 +2825,7 @@ void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, s
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
  int32_t difX, difY,difX2, difY2;
@@ -2981,7 +2981,7 @@ void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -3120,7 +3120,7 @@ void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3
 
 #ifdef POLYQUAD3
 
-void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  drawPoly3TEx4(x2,y2,x3,y3,x4,y4,
                tx2,ty2,tx3,ty3,tx4,ty4,
@@ -3134,7 +3134,7 @@ void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y
 
 // more exact:
 
-void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -3270,7 +3270,7 @@ void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, s
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j=0,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
@@ -3429,7 +3429,7 @@ void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -3567,7 +3567,7 @@ void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -3706,7 +3706,7 @@ void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short
 // POLY 3 F-SHADED TEX PAL 8
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -3822,7 +3822,7 @@ void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, s
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
  int32_t difX, difY,difX2, difY2;
@@ -3972,7 +3972,7 @@ void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+static void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -4097,7 +4097,7 @@ void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3
 
 #ifdef POLYQUAD3
 
-void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  drawPoly3TEx8(x2,y2,x3,y3,x4,y4,
                tx2,ty2,tx3,ty3,tx4,ty4,
@@ -4112,7 +4112,7 @@ void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y
 
 // more exact:
 
-void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -4231,7 +4231,7 @@ void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, s
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
@@ -4382,7 +4382,7 @@ void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -4507,7 +4507,7 @@ void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+static void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -4634,7 +4634,7 @@ void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short
 // POLY 3 F-SHADED TEX 15 BIT
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -4734,7 +4734,7 @@ void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, sho
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t difX, difY,difX2, difY2;
@@ -4843,7 +4843,7 @@ void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 
 #ifdef POLYQUAD3
 
-void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
  drawPoly3TD(x2,y2,x3,y3,x4,y4,
             tx2,ty2,tx3,ty3,tx4,ty4);
@@ -4855,7 +4855,7 @@ void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3,
 
 // more exact:
 
-void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -4961,7 +4961,7 @@ void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, sho
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -5073,7 +5073,7 @@ void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -5187,7 +5187,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3
 // POLY 3/4 G-SHADED
 ////////////////////////////////////////////////////////////////////////
  
-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -5328,7 +5328,7 @@ void drawPoly4G(int32_t rgb1, int32_t rgb2, int32_t rgb3, int32_t rgb4)
 // POLY 3/4 G-SHADED TEX PAL4
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -5474,7 +5474,7 @@ void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
  int32_t cR1,cG1,cB1;
@@ -5638,7 +5638,7 @@ void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -5792,7 +5792,7 @@ void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y
 // correct that way, so small texture distortions can 
 // happen... 
 
-void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4,
+static void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4,
                     short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,
                     short clX, short clY,
                     int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -5809,7 +5809,7 @@ void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, sho
 
 #ifdef POLYQUAD3GT
 
-void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                     short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                     short clX, short clY,
                     int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -5828,7 +5828,7 @@ void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short
                
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                     short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                     short clX, short clY,
                     int32_t col1, int32_t col2, int32_t col4, int32_t col3)
@@ -5994,7 +5994,7 @@ void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                     short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                     short clX, short clY,
                     int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -6014,7 +6014,7 @@ void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y
 // POLY 3/4 G-SHADED TEX PAL8
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -6150,7 +6150,7 @@ void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
  int32_t cR1,cG1,cB1;
@@ -6309,7 +6309,7 @@ void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -6452,7 +6452,7 @@ void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y
 
 // note: two g-shaded tris: small texture distortions can happen
 
-void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                            short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                            short clX, short clY,
                            int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -6469,7 +6469,7 @@ void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, sho
 
 #ifdef POLYQUAD3GT
                       
-void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                    short clX, short clY,
                    int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -6486,7 +6486,7 @@ void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short
 
 #endif
 
-void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                    short clX, short clY,
                    int32_t col1, int32_t col2, int32_t col4, int32_t col3)
@@ -6640,7 +6640,7 @@ void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+static void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
                    short clX, short clY,
                    int32_t col1, int32_t col2, int32_t col3, int32_t col4)
@@ -6659,7 +6659,7 @@ void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y
 // POLY 3 G-SHADED TEX 15 BIT
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -6783,7 +6783,7 @@ void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, sh
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,int32_t col1, int32_t col2, int32_t col3)
+static void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,int32_t col1, int32_t col2, int32_t col3)
 {
  int i,j,xmin,xmax,ymin,ymax;
  int32_t cR1,cG1,cB1;
@@ -6916,7 +6916,7 @@ void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 
 #ifdef POLYQUAD3GT
 
-void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col3, int32_t col4)
+static void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col3, int32_t col4)
 {
  drawPoly3TGD(x2,y2,x3,y3,x4,y4,
               tx2,ty2,tx3,ty3,tx4,ty4,
@@ -6928,7 +6928,7 @@ void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3
 
 #endif
 
-void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col4, int32_t col3)
+static void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col4, int32_t col3)
 {
  int32_t num; 
  int32_t i,j,xmin,xmax,ymin,ymax;
@@ -7066,7 +7066,7 @@ void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, sh
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col3, int32_t col4)
+static void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2, int32_t col3, int32_t col4)
 {
  drawPoly3TGD_TW(x2,y2,x3,y3,x4,y4,
               tx2,ty2,tx3,ty3,tx4,ty4,
@@ -7096,7 +7096,7 @@ __inline BOOL IsNoRect(void)
 */
 
 // real rect test
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
 {
  if(!(dwActFixes&0x200)) return FALSE;
 
@@ -7554,7 +7554,7 @@ void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t h)
 
 ////////////////////////////////////////////////////////////////////////
 
-void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int32_t tx,int32_t ty)
+static void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int32_t tx,int32_t ty)
 {
  int32_t sprtY,sprtX,sprtW,sprtH,tdx,tdy;
  uint32_t *gpuData = (uint32_t *)baseAddr;
@@ -7839,7 +7839,7 @@ void DrawSoftwareSprite(unsigned char * baseAddr,short w,short h,int32_t tx,int3
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+static void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
 {
     int dx, dy, incrE, incrSE, d;
 		uint32_t r0, g0, b0, r1, g1, b1;
@@ -7898,7 +7898,7 @@ void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+static void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
 {
     int dx, dy, incrS, incrSE, d;
 		uint32_t r0, g0, b0, r1, g1, b1;
@@ -7957,7 +7957,7 @@ void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+static void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
 {
     int dx, dy, incrN, incrNE, d;
 		uint32_t r0, g0, b0, r1, g1, b1;
@@ -8016,7 +8016,7 @@ void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+static void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
 {
     int dx, dy, incrE, incrNE, d;
 		uint32_t r0, g0, b0, r1, g1, b1;
@@ -8075,7 +8075,7 @@ void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb
 
 ///////////////////////////////////////////////////////////////////////
 
-void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
+static void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
 {
   int y, dy;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -8125,7 +8125,7 @@ void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
 
 ///////////////////////////////////////////////////////////////////////
 
-void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
+static void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
 {
   int x, dx;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -8175,7 +8175,7 @@ void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+static void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 {
     int dx, dy, incrE, incrSE, d, x, y;
 
@@ -8208,7 +8208,7 @@ void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+static void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 {
     int dx, dy, incrS, incrSE, d, x, y;
 
@@ -8241,7 +8241,7 @@ void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+static void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 {
     int dx, dy, incrN, incrNE, d, x, y;
 
@@ -8274,7 +8274,7 @@ void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+static void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 {
     int dx, dy, incrE, incrNE, d, x, y;
 
@@ -8307,7 +8307,7 @@ void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
 
 ///////////////////////////////////////////////////////////////////////
 
-void VertLineFlat(int x, int y0, int y1, unsigned short colour)
+static void VertLineFlat(int x, int y0, int y1, unsigned short colour)
 {
 	int y;
 
@@ -8323,7 +8323,7 @@ void VertLineFlat(int x, int y0, int y1, unsigned short colour)
 
 ///////////////////////////////////////////////////////////////////////
 
-void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
+static void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
 {
 	int x;
 
diff --git a/plugins/dfxvideo/zn.c b/plugins/dfxvideo/zn.c
index 534e9674..d3fe1c57 100644
--- a/plugins/dfxvideo/zn.c
+++ b/plugins/dfxvideo/zn.c
@@ -23,37 +23,7 @@
 // - psx gpu plugin interface prototypes-------------- //
 // --------------------------------------------------- //
 
-#ifdef _WINDOWS

-long CALLBACK GPUopen(HWND hwndGPU);

-#else

-long GPUopen(unsigned long * disp,const char * CapText,const char * CfgFile);

-#endif
-void CALLBACK GPUdisplayText(char * pText);
-void CALLBACK GPUdisplayFlags(uint32_t dwFlags);
-void CALLBACK GPUmakeSnapshot(void);
-long CALLBACK GPUinit();
-long CALLBACK GPUclose();
-long CALLBACK GPUshutdown();
-void CALLBACK GPUcursor(int iPlayer,int x,int y);
-void CALLBACK GPUupdateLace(void);
-uint32_t CALLBACK GPUreadStatus(void);
-void CALLBACK GPUwriteStatus(uint32_t gdata);
-void CALLBACK GPUreadDataMem(uint32_t * pMem, int iSize);
-uint32_t CALLBACK GPUreadData(void);
-void CALLBACK GPUwriteDataMem(uint32_t * pMem, int iSize);
-void CALLBACK GPUwriteData(uint32_t gdata);
-void CALLBACK GPUsetMode(uint32_t gdata);
-long CALLBACK GPUgetMode(void);
-long CALLBACK GPUdmaChain(uint32_t * baseAddrL, uint32_t addr);
-long CALLBACK GPUconfigure(void);
-void CALLBACK GPUabout(void);
-long CALLBACK GPUtest(void);
-long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,void * pF);
-void CALLBACK GPUgetScreenPic(unsigned char * pMem);
-void CALLBACK GPUshowScreenPic(unsigned char * pMem);
-#ifndef _WINDOWS

-void CALLBACK GPUkeypressed(int keycode);

-#endif
+#include "psemu_plugin_defs.h"
 
 // --------------------------------------------------- // 
 // - zn gpu interface -------------------------------- // 
@@ -79,6 +49,7 @@ typedef struct GPUOTAG
   const char*    CfgFile;        // NULL terminated string
  } GPUConfiguration_t;
 
+#if 0 // ZN_* functions: wtf?  not supported by pcsx
 // --------------------------------------------------- // 
 // --------------------------------------------------- // 
 // --------------------------------------------------- // 
@@ -113,10 +84,10 @@ long CALLBACK ZN_GPUopen(void * vcfg)
  long lret;
 
  if(!cfg)            return -1;
- if(cfg->Version!=1) return -1;

+ if(cfg->Version!=1) return -1;
 
-#ifdef _WINDOWS

- lret=GPUopen((HWND)cfg->hWnd);

+#ifdef _WINDOWS
+ lret=GPUopen((HWND)cfg->hWnd);
 #else
  lret = GPUopen(&cfg->hWnd, cfg->GameName, cfg->CfgFile);
 #endif
@@ -254,11 +225,12 @@ void CALLBACK ZN_GPUshowScreenPic(unsigned char * pMem)
 
 // --------------------------------------------------- // 
 
-#ifndef _WINDOWS

-

-void CALLBACK ZN_GPUkeypressed(int keycode)

-{

- GPUkeypressed(keycode);

-}

-

-#endif

+#ifndef _WINDOWS
+
+void CALLBACK ZN_GPUkeypressed(int keycode)
+{
+ GPUkeypressed(keycode);
+}
+
+#endif
+#endif
diff --git a/plugins/gxvideo/cfg.c b/plugins/gxvideo/cfg.c
index ffe0ff0e..2274c529 100644
--- a/plugins/gxvideo/cfg.c
+++ b/plugins/gxvideo/cfg.c
@@ -29,7 +29,7 @@
 
 #define DEFAULT_CFG_NAME "gxvideo.cfg"
 
-int get_int_value (char const * file_buffer, char const * name, int dflt) {
+static int get_int_value (char const * file_buffer, char const * name, int dflt) {
 	char * p = strstr(file_buffer, name);
 	if (p != NULL) {
 		p += strlen(name);
@@ -41,7 +41,7 @@ int get_int_value (char const * file_buffer, char const * name, int dflt) {
 	return dflt;
 }
 
-double get_double_value(char const * file_buffer, char const * name,
+static double get_double_value(char const * file_buffer, char const * name,
 		double dflt) {
 	char * p = strstr(file_buffer, name);
 	if (p != NULL) {
@@ -54,15 +54,15 @@ double get_double_value(char const * file_buffer, char const * name,
 	return dflt;
 }
 
-void write_int_value (FILE * f, char const * name, int val) {
+static void write_int_value (FILE * f, char const * name, int val) {
 	fprintf(f, "%s = %d\n", name, val);
 }
 
-void write_double_value (FILE * f, char const * name, double val) {
+static void write_double_value (FILE * f, char const * name, double val) {
 	fprintf(f, "%s = %.1f\n", name, val);
 }
 
-void ReadConfigFile() {
+static void ReadConfigFile() {
 	struct stat buf;
 	FILE * f_in;
 	char cfg_file_name[256];
@@ -153,7 +153,7 @@ void ReadConfigFile() {
 	free(file_buffer);
 }
 
-void ExecCfg(char const * arg) {
+static void ExecCfg(char const * arg) {
 	char cfg[256];
 	struct stat buf;
 
diff --git a/plugins/gxvideo/draw.c b/plugins/gxvideo/draw.c
index c8d6c7e0..a83e429b 100644
--- a/plugins/gxvideo/draw.c
+++ b/plugins/gxvideo/draw.c
@@ -38,7 +38,7 @@ enum {
 gxv_blit_t available_port[GXV_MAX_PORT];
 
 /* Convert RGB to YUV */
-inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
+static inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
 	uint8_t Y, U, V;
 	Y = abs(R * 2104 + G * 4130 + B * 802 + 4096 + 131072) >> 13;
 	Y = MIN(Y, 235);
@@ -49,7 +49,7 @@ inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
 	return Y << 24 | V << 16 | Y << 8 | U;
 }
 
-inline uint32_t rgb_to_yuv2(uint8_t R0, uint8_t G0, uint8_t B0, uint8_t R1,
+static inline uint32_t rgb_to_yuv2(uint8_t R0, uint8_t G0, uint8_t B0, uint8_t R1,
 		uint8_t G1, uint8_t B1) {
 	int32_t Y0, U0, V0;
 	int32_t Y1, U1, V1;
@@ -97,7 +97,7 @@ static Atom xv_intern_atom_if_exists(Display *display, char const * atom_name) {
 
 // close display
 
-void DestroyDisplay(void) {
+static void DestroyDisplay(void) {
 	if (g_draw.display) {
 		XFreeColormap(g_draw.display, g_draw.colormap);
 		if (g_draw.hGC) {
@@ -136,7 +136,7 @@ void DestroyDisplay(void) {
 
 // Create display
 
-void create_display(void) {
+static void create_display(void) {
 	//fprintf(stderr, "Entering %s\n", __FUNCTION__);
 	XSetWindowAttributes winattr;
 	int myscreen;
@@ -427,15 +427,17 @@ void create_display(void) {
 	return;
 }
 
-int rgb_check_port(XvImageFormatValues const * fo) {
+#if 0
+static int rgb_check_port(XvImageFormatValues const * fo) {
 	if (fo->type == XvRGB && fo->bits_per_pixel == 32) {
 		g_draw.xv_id = fo->id;
 		return 1;
 	}
 	return 0;
 }
+#endif
 
-void rgb_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
+static void rgb_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	//fprintf(stderr, "BlitToYUV\n");
 	int16_t * src_pxl;
 	int8_t * dst_pxl;
@@ -457,7 +459,7 @@ void rgb_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	}
 }
 
-void rgb_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
+static void rgb_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	//fprintf(stderr, "BlitToYUV\n");
 	int8_t * src_pxl;
 	int8_t * dst_pxl;
@@ -479,7 +481,8 @@ void rgb_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	}
 }
 
-int yuyv_check_port(XvImageFormatValues * fo) {
+#if 0
+static int yuyv_check_port(XvImageFormatValues * fo) {
 	if (fo->type == XvYUV && fo->bits_per_pixel == 16 && fo->format == XvPacked
 			&& strncmp("UYVY", fo->component_order, 4) == 0) {
 		g_draw.xv_id = fo->id;
@@ -487,8 +490,9 @@ int yuyv_check_port(XvImageFormatValues * fo) {
 	}
 	return 0;
 }
+#endif
 
-void yuyv_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
+static void yuyv_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	//fprintf(stderr, "yuyv_blit_24 %d %d %d %d\n", x, y, w, h);
 	uint8_t * src_pxl;
 	int8_t R0, G0, B0;
@@ -516,7 +520,7 @@ void yuyv_blit_24(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	}
 }
 
-void yuyv_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
+static void yuyv_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
 	//fprintf(stderr, "yuyv_blit_16 %d %d %d %d\n", x, y, w, h);
 	int8_t R0, G0, B0;
 	int8_t R1, G1, B1;
@@ -552,7 +556,7 @@ void yuyv_blit_16(int8_t * buff, int32_t x, int32_t y, int32_t w, int32_t h) {
  * The aspect of the psx output mode is preserved.
  * Note: dest dx,dy,dw,dh are both input and output variables
  */
-inline void maintain_aspect(uint32_t * dx, uint32_t * dy, uint32_t * dw,
+static inline void maintain_aspect(uint32_t * dx, uint32_t * dy, uint32_t * dw,
 		uint32_t * dh, int32_t w, int32_t h) {
 
 	double ratio_x = ((double) *dw) / ((double) w);
@@ -667,7 +671,7 @@ void do_clear_screen_buffer(void) // CLEAR DX BUFFER
 	XClearWindow(g_draw.display, g_draw.window);
 }
 
-void Xcleanup() // X CLEANUP
+static void Xcleanup() // X CLEANUP
 {
 	//CloseMenu();
 }
diff --git a/plugins/gxvideo/fps.c b/plugins/gxvideo/fps.c
index 151ff72e..f53800ff 100644
--- a/plugins/gxvideo/fps.c
+++ b/plugins/gxvideo/fps.c
@@ -27,7 +27,7 @@
 
 #define TIMEBASE 100000
 
-unsigned long time_get_time() {
+static unsigned long time_get_time() {
 	struct timeval tv;
 	gettimeofday(&tv, 0); // well, maybe there are better ways
 	return tv.tv_sec * 100000 + tv.tv_usec / 10; // to do that, but at least it works
diff --git a/plugins/gxvideo/gpu.c b/plugins/gxvideo/gpu.c
index 590bdb8c..85b003bd 100644
--- a/plugins/gxvideo/gpu.c
+++ b/plugins/gxvideo/gpu.c
@@ -27,6 +27,7 @@
 #include "globals.h"
 #include "gpu.h"
 #include "swap.h"
+#include "psemu_plugin_defs.h"
 
 #define CALLBACK
 
@@ -47,16 +48,6 @@
 #define MIN(a,b) ((a) > (b) ? (b) : (a))
 #define MAX(a,b) ((a) < (b) ? (b) : (a))
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 // PPDK developer must change libraryName field and can change revision and build
 ////////////////////////////////////////////////////////////////////////
@@ -66,7 +57,9 @@ unsigned char const revision = 0;
 unsigned char const build = 0; // increase that with each version
 
 static char const * libraryName = N_("GXVideo Driver");
+#if 0
 static char const * libraryInfo = N_("GXvideo Driver v1.00");
+#endif
 //static char const * PluginAuthor =
 //		N_("gschwind (rewrite from Pete Bernert and the P.E.Op.S. team)");
 
@@ -105,9 +98,11 @@ unsigned long CALLBACK PSEgetLibVersion(void) {
 	return version << 16 | revision << 8 | build;
 }
 
+#if 0
 char * GPUgetLibInfos(void) {
 	return _(libraryInfo);
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // Snapshot func
@@ -785,7 +780,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata) {
 // vram read/write helpers, needed by LEWPY's optimized vram read/write :)
 ////////////////////////////////////////////////////////////////////////
 
-inline void FinishedVRAMWrite(void) {
+static inline void FinishedVRAMWrite(void) {
 	// Set register to NORMAL operation
 	g_gpu.DataWriteMode = DR_NORMAL;
 	// Reset transfer values, to prevent mis-transfer of data
@@ -797,7 +792,7 @@ inline void FinishedVRAMWrite(void) {
 	g_gpu.VRAMWrite.RowsRemaining = 0;
 }
 
-inline void FinishedVRAMRead(void) {
+static inline void FinishedVRAMRead(void) {
 	// Set register to NORMAL operation
 	g_gpu.DataReadMode = DR_NORMAL;
 	// Reset transfer values, to prevent mis-transfer of data
@@ -1100,6 +1095,7 @@ void CALLBACK GPUwriteData(uint32_t gdata) {
 // this functions will be removed soon (or 'soonish')... not really needed, but some emus want them
 ////////////////////////////////////////////////////////////////////////
 
+#if 0
 void CALLBACK GPUsetMode(unsigned long gdata) {
 	// Peops does nothing here...
 	// DataWriteMode=(gdata&1)?DR_VRAMTRANSFER:DR_NORMAL;
@@ -1115,6 +1111,7 @@ long CALLBACK GPUgetMode(void) {
 		iT |= 0x2;
 	return iT;
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // call config dlg
@@ -1129,9 +1126,11 @@ long CALLBACK GPUconfigure(void) {
 // sets all kind of act fixes
 ////////////////////////////////////////////////////////////////////////
 
+#if 0
 void SetFixes(void) {
 
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // process gpu commands
@@ -1139,7 +1138,7 @@ void SetFixes(void) {
 
 unsigned long lUsedAddr[3];
 
-inline char CheckForEndlessLoop(unsigned long laddr) {
+static inline char CheckForEndlessLoop(unsigned long laddr) {
 	if (laddr == lUsedAddr[1])
 		return 1;
 	if (laddr == lUsedAddr[2])
@@ -1212,15 +1211,6 @@ long CALLBACK GPUtest(void) {
 // Freeze
 ////////////////////////////////////////////////////////////////////////
 
-typedef struct GPUFREEZETAG {
-	uint32_t ulFreezeVersion; // should be always 1 for now (set by main emu)
-	uint32_t ulStatus; // current gpu status
-	uint32_t ulControl[256]; // latest control register values
-	unsigned char psxVRam[1024 * 1024 * 2]; // current VRam image (full 2 MB for ZN)
-} GPUFreeze_t;
-
-////////////////////////////////////////////////////////////////////////
-
 long CALLBACK GPUfreeze(uint32_t ulGetFreezeData, GPUFreeze_t * pF) {
 	//----------------------------------------------------//
 	if (ulGetFreezeData == 2) // 2: info, which save slot is selected? (just for display)
@@ -1422,7 +1412,8 @@ unsigned char cFont[10][120] = {
 
 ////////////////////////////////////////////////////////////////////////
 
-void PaintPicDot(unsigned char * p, unsigned char c) {
+#if 0
+static void PaintPicDot(unsigned char * p, unsigned char c) {
 
 	if (c == 0) {
 		*p++ = 0x00;
@@ -1444,6 +1435,7 @@ void PaintPicDot(unsigned char * p, unsigned char c) {
 	} // red
 	// transparent
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // the main emu allocs 128x96x3 bytes, and passes a ptr
@@ -1455,9 +1447,7 @@ void PaintPicDot(unsigned char * p, unsigned char c) {
 // rendered picture
 // LINUX version:
 
-//extern char * Xpixels;
-
-void GPUgetScreenPic(unsigned char * pMem) {
+long GPUgetScreenPic(unsigned char * pMem) {
 	/*
 	 unsigned short c;unsigned char * pf;int x,y;
 
@@ -1525,6 +1515,7 @@ void GPUgetScreenPic(unsigned char * pMem) {
 	 pf+=127*3;                                          // offset to next line
 	 }
 	 */
+	return -1;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1535,16 +1526,19 @@ void GPUgetScreenPic(unsigned char * pMem) {
 // release your picture data and stop displaying
 // the screen pic
 
-void CALLBACK GPUshowScreenPic(unsigned char * pMem) {
+long CALLBACK GPUshowScreenPic(unsigned char * pMem) {
 	DestroyPic(); // destroy old pic data
 	if (pMem == 0)
-		return; // done
+		return 0; // done
 	CreatePic(pMem); // create new pic... don't free pMem or something like that... just read from it
+	return 0;
 }
 
+#if 0
 void CALLBACK GPUsetfix(uint32_t dwFixBits) {
 	g_prim.dwEmuFixes = dwFixBits;
 }
+#endif
 
 void CALLBACK GPUvBlank(int val) {
 	//fprintf(stderr, "Vblanc %d\n", val);
diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c
index b224f959..326eb1d8 100644
--- a/plugins/gxvideo/gpucfg/main.c
+++ b/plugins/gxvideo/gpucfg/main.c
@@ -67,49 +67,29 @@ typedef struct {
 
 void save_config(cfg_window_t *);
 
-/*	This function checks for the value being outside the accepted range,
- and returns the appropriate boundary value */
-int set_limit(char *p, int len, int lower, int upper) {
-	int val = 0;
-
-	if (p)
-		val = atoi(p + len);
-	/* printf("Checking for val %d greater than %d and lower than %d, ", val, lower, upper);*/
-	if (val < lower)
-		val = lower;
-	if (val > upper)
-		val = upper;
-	/* printf ("val is now %d\n", val);*/
-	return val;
-}
-
-void on_about_clicked(GtkWidget * widget, gpointer user_data) {
+static void on_about_clicked(GtkWidget * widget, gpointer user_data) {
 	gtk_widget_destroy(widget);
 	exit(0);
 }
 
-void set_widget_sensitive(GtkWidget * widget, gboolean * state) {
-	gtk_widget_set_sensitive(widget, *state);
-}
-
-void on_fullscreen_toggled(GtkWidget * widget, cfg_window_t * w) {
+static void on_fullscreen_toggled(GtkWidget * widget, cfg_window_t * w) {
 	gtk_widget_set_sensitive(w->resolution_combobox,
 			!gtk_toggle_button_get_active(
 					GTK_TOGGLE_BUTTON(w->fullscreen_checkbutton)));
 }
 
-void update_fixes_stase(GtkWidget * ths, GtkWidget * w) {
+static void update_fixes_stase(GtkWidget * ths, GtkWidget * w) {
 	gtk_widget_set_sensitive(ths, gtk_toggle_button_get_active(
 			GTK_TOGGLE_BUTTON(w)));
 }
 
-void on_use_fixes_toggled(GtkWidget * widget, cfg_window_t * w) {
+static void on_use_fixes_toggled(GtkWidget * widget, cfg_window_t * w) {
 	/* Set the state of each of the fixes to the value of the use fixes toggle */
 	gtk_container_foreach(GTK_CONTAINER (w->fixes_table),
 			(GtkCallback) update_fixes_stase, w->use_game_fixes_checkbutton);
 }
 
-void on_fps_toggled(GtkWidget * widget, cfg_window_t * w) {
+static void on_fps_toggled(GtkWidget * widget, cfg_window_t * w) {
 	gboolean state_set_fps = gtk_toggle_button_get_active(
 			GTK_TOGGLE_BUTTON(w->set_fps_checkbutton));
 	gboolean state_auto_fps_limit = gtk_toggle_button_get_active(
@@ -119,17 +99,17 @@ void on_fps_toggled(GtkWidget * widget, cfg_window_t * w) {
 	gtk_widget_set_sensitive(w->auto_fps_limit_checkbutton, state_set_fps);
 }
 
-void on_destroy_window(GtkWidget * widget, cfg_window_t * w) {
+static void on_destroy_window(GtkWidget * widget, cfg_window_t * w) {
 	free(w);
 }
 
-void on_click_save_button(GtkWidget * widget, cfg_window_t * w) {
+static void on_click_save_button(GtkWidget * widget, cfg_window_t * w) {
 	save_config(w);
 	gtk_widget_destroy(GTK_WIDGET(w->config_window));
 	gtk_exit(0);
 }
 
-void on_click_cancel_button(GtkWidget * widget, cfg_window_t * w) {
+static void on_click_cancel_button(GtkWidget * widget, cfg_window_t * w) {
 	gtk_widget_destroy(GTK_WIDGET(w->config_window));
 	gtk_exit(0);
 }
diff --git a/plugins/gxvideo/key.c b/plugins/gxvideo/key.c
index 2d56ae92..c8a9b288 100644
--- a/plugins/gxvideo/key.c
+++ b/plugins/gxvideo/key.c
@@ -19,6 +19,7 @@
 #include "gpu.h"
 #include "draw.h"
 #include "key.h"
+#include "psemu_plugin_defs.h"
 
 #define VK_INSERT      65379
 #define VK_HOME        65360
diff --git a/plugins/gxvideo/menu.c b/plugins/gxvideo/menu.c
index 7a96cfc1..babe2446 100644
--- a/plugins/gxvideo/menu.c
+++ b/plugins/gxvideo/menu.c
@@ -17,7 +17,7 @@
 
 #include "draw.h"
 #include "menu.h"
-#include "gpu.h"

+#include "gpu.h"
 
 unsigned long dwCoreFlags = 0;
 
@@ -28,19 +28,18 @@ void InitMenu(void)
 
 // kill existing lists/fonts
 void CloseMenu(void)
-{

- DestroyPic();

+{
+ DestroyPic();
 }
 
 // DISPLAY FPS/MENU TEXT
 
 #include <time.h>
-//extern time_t tStart;
 
 int iMPos=0;                                           // menu arrow pos
 
 void DisplayText(void)                                 // DISPLAY TEXT
-{

+{
 
 }
 
diff --git a/plugins/gxvideo/prim.c b/plugins/gxvideo/prim.c
index de1bb9a2..6a8d8cba 100644
--- a/plugins/gxvideo/prim.c
+++ b/plugins/gxvideo/prim.c
@@ -39,7 +39,7 @@ __inline unsigned short BGR24to16 (uint32_t BGR);
 
 #else
 
-inline unsigned short BGR24to16(uint32_t BGR) {
+static inline unsigned short BGR24to16(uint32_t BGR) {
 	return (unsigned short) (((BGR >> 3) & 0x1f) | ((BGR & 0xf80000) >> 9)
 			| ((BGR & 0xf800) >> 6));
 }
@@ -50,7 +50,7 @@ inline unsigned short BGR24to16(uint32_t BGR) {
 // Update global TP infos
 ////////////////////////////////////////////////////////////////////////
 
-inline void UpdateGlobalTP(unsigned short gdata) {
+static inline void UpdateGlobalTP(unsigned short gdata) {
 	g_soft.GlobalTextAddrX = (gdata << 6) & 0x3c0; // texture addr
 
 	if (512 == 1024) {
@@ -107,7 +107,7 @@ inline void UpdateGlobalTP(unsigned short gdata) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void SetRenderMode(uint32_t DrawAttributes) {
+static inline void SetRenderMode(uint32_t DrawAttributes) {
 	g_soft.DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? 1 : 0;
 
 	if (SHADETEXBIT(DrawAttributes)) {
@@ -141,7 +141,7 @@ inline void SetRenderMode(uint32_t DrawAttributes) {
 #define CHKMAX_X 1024
 #define CHKMAX_Y 512
 
-void AdjustCoord4() {
+static void AdjustCoord4() {
 	g_soft.lx0 = (short) (((int) g_soft.lx0 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.lx1 = (short) (((int) g_soft.lx1 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.lx2 = (short) (((int) g_soft.lx2 << SIGNSHIFT) >> SIGNSHIFT);
@@ -152,7 +152,7 @@ void AdjustCoord4() {
 	g_soft.ly3 = (short) (((int) g_soft.ly3 << SIGNSHIFT) >> SIGNSHIFT);
 }
 
-void AdjustCoord3() {
+static void AdjustCoord3() {
 	g_soft.lx0 = (short) (((int) g_soft.lx0 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.lx1 = (short) (((int) g_soft.lx1 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.lx2 = (short) (((int) g_soft.lx2 << SIGNSHIFT) >> SIGNSHIFT);
@@ -161,14 +161,14 @@ void AdjustCoord3() {
 	g_soft.ly2 = (short) (((int) g_soft.ly2 << SIGNSHIFT) >> SIGNSHIFT);
 }
 
-void AdjustCoord2() {
+static void AdjustCoord2() {
 	g_soft.lx0 = (short) (((int) g_soft.lx0 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.lx1 = (short) (((int) g_soft.lx1 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.ly0 = (short) (((int) g_soft.ly0 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.ly1 = (short) (((int) g_soft.ly1 << SIGNSHIFT) >> SIGNSHIFT);
 }
 
-void AdjustCoord1() {
+static void AdjustCoord1() {
 	g_soft.lx0 = (short) (((int) g_soft.lx0 << SIGNSHIFT) >> SIGNSHIFT);
 	g_soft.ly0 = (short) (((int) g_soft.ly0 << SIGNSHIFT) >> SIGNSHIFT);
 
@@ -194,7 +194,7 @@ void AdjustCoord1() {
  //  \ / \
  //   2___3
  */
-inline char CheckCoord4() {
+static inline char CheckCoord4() {
 	if (g_soft.lx0 < 0) {
 		if (((g_soft.lx1 - g_soft.lx0) > CHKMAX_X)
 				|| ((g_soft.lx2 - g_soft.lx0) > CHKMAX_X)) {
@@ -266,7 +266,7 @@ inline char CheckCoord4() {
 	return 0;
 }
 
-inline char CheckCoord3() {
+static inline char CheckCoord3() {
 	if (g_soft.lx0 < 0) {
 		if ((g_soft.lx1 - g_soft.lx0) > CHKMAX_X)
 			return 1;
@@ -307,7 +307,7 @@ inline char CheckCoord3() {
 	return 0;
 }
 
-inline char CheckCoord2() {
+static inline char CheckCoord2() {
 	if (g_soft.lx0 < 0) {
 		if ((g_soft.lx1 - g_soft.lx0) > CHKMAX_X)
 			return 1;
@@ -328,7 +328,7 @@ inline char CheckCoord2() {
 	return 0;
 }
 
-inline char CheckCoordL(short slx0, short sly0, short slx1, short sly1) {
+static inline char CheckCoordL(short slx0, short sly0, short slx1, short sly1) {
 	if (slx0 < 0) {
 		if ((slx1 - slx0) > CHKMAX_X)
 			return 1;
@@ -353,7 +353,7 @@ inline char CheckCoordL(short slx0, short sly0, short slx1, short sly1) {
 // mask stuff... used in silent hill
 ////////////////////////////////////////////////////////////////////////
 
-void cmdSTP(unsigned char * baseAddr) {
+static void cmdSTP(unsigned char * baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
 	g_gpu.status_reg &= ~0x1800; // Clear the necessary bits
@@ -377,7 +377,7 @@ void cmdSTP(unsigned char * baseAddr) {
 // cmd: Set texture page infos
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTexturePage(unsigned char * baseAddr) {
+static void cmdTexturePage(unsigned char * baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
 	g_gpu.status_reg &= ~0x000007ff;
@@ -393,7 +393,7 @@ void cmdTexturePage(unsigned char * baseAddr) {
 // cmd: turn on/off texture window
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTextureWindow(unsigned char *baseAddr) {
+static void cmdTextureWindow(unsigned char *baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
 	uint32_t YAlign, XAlign;
@@ -455,7 +455,7 @@ void cmdTextureWindow(unsigned char *baseAddr) {
 ////////////////////////////////////////////////////////////////////////
 
 
-void cmdDrawAreaStart(unsigned char * baseAddr) {
+static void cmdDrawAreaStart(unsigned char * baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 	g_prim.drawX = gdata & 0x3ff; // for soft drawing
 	g_gpu.lGPUInfoVals[INFO_DRAWSTART] = gdata & 0xFFFFF;
@@ -468,7 +468,7 @@ void cmdDrawAreaStart(unsigned char * baseAddr) {
 // cmd: end of drawing area... primitives will be clipped inside
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawAreaEnd(unsigned char * baseAddr) {
+static void cmdDrawAreaEnd(unsigned char * baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
 	g_prim.drawW = gdata & 0x3ff; // for soft drawing
@@ -483,7 +483,7 @@ void cmdDrawAreaEnd(unsigned char * baseAddr) {
 // cmd: draw offset... will be added to prim coords
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawOffset(unsigned char * baseAddr) {
+static void cmdDrawOffset(unsigned char * baseAddr) {
 	uint32_t gdata = GETLE32(&((uint32_t*)baseAddr)[0]);
 
 	g_gpu.dsp.DrawOffset.x = (short) (gdata & 0x7ff);
@@ -501,7 +501,7 @@ void cmdDrawOffset(unsigned char * baseAddr) {
 // cmd: load image to vram
 ////////////////////////////////////////////////////////////////////////
 
-void primLoadImage(unsigned char * baseAddr) {
+static void primLoadImage(unsigned char * baseAddr) {
 	unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
 	g_gpu.VRAMWrite.x = GETLEs16(&sgpuData[2]) & 0x3ff;
@@ -521,7 +521,7 @@ void primLoadImage(unsigned char * baseAddr) {
 // cmd: vram -> psx mem
 ////////////////////////////////////////////////////////////////////////
 
-void primStoreImage(unsigned char * baseAddr) {
+static void primStoreImage(unsigned char * baseAddr) {
 	unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
 	g_gpu.VRAMRead.x = GETLEs16(&sgpuData[2]) & 0x03ff;
@@ -543,7 +543,7 @@ void primStoreImage(unsigned char * baseAddr) {
 // cmd: blkfill - NO primitive! Doesn't care about draw areas...
 ////////////////////////////////////////////////////////////////////////
 
-void primBlkFill(unsigned char * baseAddr) {
+static void primBlkFill(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -572,7 +572,7 @@ void primBlkFill(unsigned char * baseAddr) {
 // cmd: move image vram -> vram
 ////////////////////////////////////////////////////////////////////////
 
-void primMoveImage(unsigned char * baseAddr) {
+static void primMoveImage(unsigned char * baseAddr) {
 	short *sgpuData = ((short *) baseAddr);
 
 	short imageY0, imageX0, imageY1, imageX1, imageSX, imageSY, i, j;
@@ -646,7 +646,7 @@ void primMoveImage(unsigned char * baseAddr) {
 ////////////////////////////////////////////////////////////////////////
 // cmd: draw free-size Tile 
 ////////////////////////////////////////////////////////////////////////
-void primTileS(unsigned char * baseAddr) {
+static void primTileS(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t*) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	short sW = GETLEs16(&sgpuData[4]) & 0x3ff;
@@ -676,7 +676,7 @@ void primTileS(unsigned char * baseAddr) {
 // cmd: draw 1 dot Tile (point)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile1(unsigned char * baseAddr) {
+static void primTile1(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t*) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	short sH = 1;
@@ -705,7 +705,7 @@ void primTile1(unsigned char * baseAddr) {
 // cmd: draw 8 dot Tile (small rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile8(unsigned char * baseAddr) {
+static void primTile8(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t*) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	short sH = 8;
@@ -734,7 +734,7 @@ void primTile8(unsigned char * baseAddr) {
 // cmd: draw 16 dot Tile (medium rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile16(unsigned char * baseAddr) {
+static void primTile16(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t*) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	short sH = 16;
@@ -763,7 +763,7 @@ void primTile16(unsigned char * baseAddr) {
 // cmd: small sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt8(unsigned char * baseAddr) {
+static void primSprt8(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -788,7 +788,7 @@ void primSprt8(unsigned char * baseAddr) {
 // cmd: medium sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt16(unsigned char * baseAddr) {
+static void primSprt16(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -814,7 +814,7 @@ void primSprt16(unsigned char * baseAddr) {
 ////////////////////////////////////////////////////////////////////////
 
 // func used on texture coord wrap
-void primSprtSRest(unsigned char * baseAddr, unsigned short type) {
+static void primSprtSRest(unsigned char * baseAddr, unsigned short type) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	unsigned short sTypeRest = 0;
@@ -906,7 +906,7 @@ void primSprtSRest(unsigned char * baseAddr, unsigned short type) {
 
 ////////////////////////////////////////////////////////////////////////
 
-void primSprtS(unsigned char * baseAddr) {
+static void primSprtS(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 	short sW, sH;
@@ -959,7 +959,7 @@ void primSprtS(unsigned char * baseAddr) {
 // cmd: flat shaded Poly4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF4(unsigned char *baseAddr) {
+static void primPolyF4(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -989,7 +989,7 @@ void primPolyF4(unsigned char *baseAddr) {
 // cmd: smooth shaded Poly4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyG4(unsigned char * baseAddr) {
+static void primPolyG4(unsigned char * baseAddr) {
 	uint32_t *gpuData = (uint32_t *) baseAddr;
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1020,7 +1020,7 @@ void primPolyG4(unsigned char * baseAddr) {
 // cmd: flat shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyFT3(unsigned char * baseAddr) {
+static void primPolyFT3(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1051,7 +1051,7 @@ void primPolyFT3(unsigned char * baseAddr) {
 // cmd: flat shaded Texture4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyFT4(unsigned char * baseAddr) {
+static void primPolyFT4(unsigned char * baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1085,7 +1085,7 @@ void primPolyFT4(unsigned char * baseAddr) {
 // cmd: smooth shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT3(unsigned char *baseAddr) {
+static void primPolyGT3(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1125,7 +1125,7 @@ void primPolyGT3(unsigned char *baseAddr) {
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyG3(unsigned char *baseAddr) {
+static void primPolyG3(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1153,7 +1153,7 @@ void primPolyG3(unsigned char *baseAddr) {
 // cmd: smooth shaded Texture4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT4(unsigned char *baseAddr) {
+static void primPolyGT4(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1197,7 +1197,7 @@ void primPolyGT4(unsigned char *baseAddr) {
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF3(unsigned char *baseAddr) {
+static void primPolyF3(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1225,7 +1225,8 @@ void primPolyF3(unsigned char *baseAddr) {
 // cmd: skipping shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGSkip(unsigned char *baseAddr) {
+#if 0
+static void primLineGSkip(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	int iMax = 255;
 	int i = 2;
@@ -1242,12 +1243,13 @@ void primLineGSkip(unsigned char *baseAddr) {
 			break;
 	}
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // cmd: shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGEx(unsigned char *baseAddr) {
+static void primLineGEx(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	int iMax = 255;
 	uint32_t lc0, lc1;
@@ -1311,7 +1313,7 @@ void primLineGEx(unsigned char *baseAddr) {
 // cmd: shaded polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineG2(unsigned char *baseAddr) {
+static void primLineG2(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1341,7 +1343,8 @@ void primLineG2(unsigned char *baseAddr) {
 // cmd: skipping flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFSkip(unsigned char *baseAddr) {
+#if 0
+static void primLineFSkip(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	int i = 2, iMax = 255;
 
@@ -1356,12 +1359,13 @@ void primLineFSkip(unsigned char *baseAddr) {
 			break;
 	}
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // cmd: drawing flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFEx(unsigned char *baseAddr) {
+static void primLineFEx(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	int iMax;
 	short slx0, slx1, sly0, sly1;
@@ -1414,7 +1418,7 @@ void primLineFEx(unsigned char *baseAddr) {
 // cmd: drawing flat polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineF2(unsigned char *baseAddr) {
+static void primLineF2(unsigned char *baseAddr) {
 	uint32_t *gpuData = ((uint32_t *) baseAddr);
 	short *sgpuData = ((short *) baseAddr);
 
@@ -1445,7 +1449,7 @@ void primLineF2(unsigned char *baseAddr) {
 // cmd: well, easiest command... not implemented
 ////////////////////////////////////////////////////////////////////////
 
-void primNI(unsigned char *bA) {
+static void primNI(unsigned char *bA) {
 	fprintf(stderr, "Unknow GPU func \n");
 }
 
diff --git a/plugins/gxvideo/soft.c b/plugins/gxvideo/soft.c
index a0772745..d7e3a5c7 100644
--- a/plugins/gxvideo/soft.c
+++ b/plugins/gxvideo/soft.c
@@ -192,7 +192,7 @@ void offsetPSX4(void) {
 uint8_t const dithertable[16] = { 7, 0, 6, 1, 2, 5, 3, 4, 1, 6, 0, 7, 4, 3, 5,
 		2 };
 
-void Dither16(uint16_t * pdest, uint32_t r, uint32_t g, uint32_t b, uint16_t sM) {
+static void Dither16(uint16_t * pdest, uint32_t r, uint32_t g, uint32_t b, uint16_t sM) {
 	uint8_t coeff;
 	uint8_t rlow, glow, blow;
 	int x, y;
@@ -225,7 +225,7 @@ void Dither16(uint16_t * pdest, uint32_t r, uint32_t g, uint32_t b, uint16_t sM)
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
-inline void GetShadeTransCol_Dither(uint16_t * pdest, int32_t m1,
+static inline void GetShadeTransCol_Dither(uint16_t * pdest, int32_t m1,
 		int32_t m2, int32_t m3) {
 	int32_t r, g, b;
 
@@ -284,7 +284,7 @@ inline void GetShadeTransCol_Dither(uint16_t * pdest, int32_t m1,
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetShadeTransCol(unsigned short * pdest, unsigned short color) {
+static inline void GetShadeTransCol(unsigned short * pdest, unsigned short color) {
 	if (g_draw.bCheckMask && (*pdest & HOST2LE16(0x8000)))
 		return;
 
@@ -339,7 +339,7 @@ else		PUTLE16(pdest, color|g_draw.sSetMask);
 
 	////////////////////////////////////////////////////////////////////////
 
-inline void GetShadeTransCol32(uint32_t * pdest, uint32_t color) {
+static inline void GetShadeTransCol32(uint32_t * pdest, uint32_t color) {
 	if (g_soft.DrawSemiTrans) {
 		int32_t r, g, b;
 
@@ -438,7 +438,7 @@ inline void GetShadeTransCol32(uint32_t * pdest, uint32_t color) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG(unsigned short * pdest, unsigned short color) {
+static inline void GetTextureTransColG(unsigned short * pdest, unsigned short color) {
 	int32_t r, g, b;
 	unsigned short l;
 
@@ -516,7 +516,7 @@ inline void GetTextureTransColG(unsigned short * pdest, unsigned short color) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG_S(unsigned short * pdest, unsigned short color) {
+static inline void GetTextureTransColG_S(unsigned short * pdest, unsigned short color) {
 	int32_t r, g, b;
 	unsigned short l;
 
@@ -541,7 +541,7 @@ inline void GetTextureTransColG_S(unsigned short * pdest, unsigned short color)
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG_SPR(unsigned short * pdest,
+static inline void GetTextureTransColG_SPR(unsigned short * pdest,
 		unsigned short color) {
 	int32_t r, g, b;
 	unsigned short l;
@@ -620,7 +620,7 @@ inline void GetTextureTransColG_SPR(unsigned short * pdest,
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG32(uint32_t * pdest, uint32_t color) {
+static inline void GetTextureTransColG32(uint32_t * pdest, uint32_t color) {
 	int32_t r, g, b, l;
 
 	if (color == 0)
@@ -752,7 +752,7 @@ inline void GetTextureTransColG32(uint32_t * pdest, uint32_t color) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG32_S(uint32_t * pdest, uint32_t color) {
+static inline void GetTextureTransColG32_S(uint32_t * pdest, uint32_t color) {
 	int32_t r, g, b;
 
 	if (color == 0)
@@ -789,7 +789,7 @@ inline void GetTextureTransColG32_S(uint32_t * pdest, uint32_t color) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColG32_SPR(uint32_t * pdest, uint32_t color) {
+static inline void GetTextureTransColG32_SPR(uint32_t * pdest, uint32_t color) {
 	int32_t r, g, b;
 
 	if (color == 0)
@@ -919,7 +919,7 @@ inline void GetTextureTransColG32_SPR(uint32_t * pdest, uint32_t color) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColGX_Dither(unsigned short * pdest,
+static inline void GetTextureTransColGX_Dither(unsigned short * pdest,
 		unsigned short color, int32_t m1, int32_t m2, int32_t m3) {
 	int32_t r, g, b;
 
@@ -986,7 +986,7 @@ inline void GetTextureTransColGX_Dither(unsigned short * pdest,
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColGX(unsigned short * pdest, unsigned short color,
+static inline void GetTextureTransColGX(unsigned short * pdest, unsigned short color,
 		short m1, short m2, short m3) {
 	int32_t r, g, b;
 	unsigned short l;
@@ -1055,7 +1055,7 @@ inline void GetTextureTransColGX(unsigned short * pdest, unsigned short color,
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColGX_S(unsigned short * pdest,
+static inline void GetTextureTransColGX_S(unsigned short * pdest,
 		unsigned short color, short m1, short m2, short m3) {
 	int32_t r, g, b;
 
@@ -1078,7 +1078,7 @@ inline void GetTextureTransColGX_S(unsigned short * pdest,
 
 ////////////////////////////////////////////////////////////////////////
 
-inline void GetTextureTransColGX32_S(uint32_t * pdest, uint32_t color,
+static inline void GetTextureTransColGX32_S(uint32_t * pdest, uint32_t color,
 		short m1, short m2, short m3) {
 	int32_t r, g, b;
 
@@ -1301,11 +1301,11 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 // NASM version (external):
 #define shl10idiv i386_shl10idiv
 
-inline int shl10idiv(int x, int y);
+static inline int shl10idiv(int x, int y);
 
 #else
 
-inline int shl10idiv(int x, int y) {
+static inline int shl10idiv(int x, int y) {
 	int64_t bi = x;
 	bi <<= 10;
 	return bi / y;
@@ -1317,7 +1317,7 @@ inline int shl10idiv(int x, int y) {
 
 // GNUC long long int version:
 
-inline int shl10idiv(int x, int y)
+static inline int shl10idiv(int x, int y)
 {
 	long long int bi=x;
 	bi<<=10;
@@ -1330,7 +1330,7 @@ inline int shl10idiv(int x, int y)
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_F(void) {
+static inline int RightSection_F(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -1346,7 +1346,7 @@ inline int RightSection_F(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_F(void) {
+static inline int LeftSection_F(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -1362,7 +1362,7 @@ inline int LeftSection_F(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_F(void) {
+static inline char NextRow_F(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section <= 0) {
 			return 1;
@@ -1389,7 +1389,7 @@ inline char NextRow_F(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_F(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_F(short x1, short y1, short x2, short y2, short x3,
 		short y3) {
 	soft_vertex * v1, *v2, *v3;
 	int height, longest;
@@ -1473,7 +1473,7 @@ inline char SetupSections_F(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_G(void) {
+static inline int RightSection_G(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -1489,7 +1489,7 @@ inline int RightSection_G(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_G(void) {
+static inline int LeftSection_G(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -1512,7 +1512,7 @@ inline int LeftSection_G(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_G(void) {
+static inline char NextRow_G(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section <= 0) {
 			return 1;
@@ -1542,7 +1542,7 @@ inline char NextRow_G(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_G(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_G(short x1, short y1, short x2, short y2, short x3,
 		short y3, int32_t rgb1, int32_t rgb2, int32_t rgb3) {
 	soft_vertex * v1, *v2, *v3;
 	int height, longest, temp;
@@ -1646,7 +1646,7 @@ inline char SetupSections_G(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_FT(void) {
+static inline int RightSection_FT(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -1662,7 +1662,7 @@ inline int RightSection_FT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_FT(void) {
+static inline int LeftSection_FT(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -1683,7 +1683,7 @@ inline int LeftSection_FT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_FT(void) {
+static inline char NextRow_FT(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section <= 0) {
 			return 1;
@@ -1712,7 +1712,7 @@ inline char NextRow_FT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_FT(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_FT(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3) {
 	soft_vertex * v1, *v2, *v3;
@@ -1829,7 +1829,7 @@ inline char SetupSections_FT(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_GT(void) {
+static inline int RightSection_GT(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -1845,7 +1845,7 @@ inline int RightSection_GT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_GT(void) {
+static inline int LeftSection_GT(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -1873,7 +1873,7 @@ inline int LeftSection_GT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_GT(void) {
+static inline char NextRow_GT(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section <= 0) {
 			return 1;
@@ -1905,7 +1905,7 @@ inline char NextRow_GT(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_GT(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_GT(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3) {
 	soft_vertex * v1, *v2, *v3;
@@ -2040,7 +2040,7 @@ inline char SetupSections_GT(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_F4(void) {
+static inline int RightSection_F4(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -2057,7 +2057,7 @@ inline int RightSection_F4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_F4(void) {
+static inline int LeftSection_F4(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -2074,7 +2074,7 @@ inline int LeftSection_F4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_F4(void) {
+static inline char NextRow_F4(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section > 0)
 			while (LeftSection_F4() <= 0) {
@@ -2099,7 +2099,7 @@ inline char NextRow_F4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4) {
 	soft_vertex * v1, *v2, *v3, *v4;
 	int height, width, longest1, longest2;
@@ -2268,7 +2268,7 @@ inline char SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_FT4(void) {
+static inline int RightSection_FT4(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -2289,7 +2289,7 @@ inline int RightSection_FT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_FT4(void) {
+static inline int LeftSection_FT4(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -2310,7 +2310,7 @@ inline int LeftSection_FT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_FT4(void) {
+static inline char NextRow_FT4(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section > 0)
 			while (LeftSection_FT4() <= 0) {
@@ -2339,7 +2339,7 @@ inline char NextRow_FT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_FT4(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_FT4(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4) {
 	soft_vertex * v1, *v2, *v3, *v4;
@@ -2520,7 +2520,7 @@ inline char SetupSections_FT4(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-inline int RightSection_GT4(void) {
+static inline int RightSection_GT4(void) {
 	soft_vertex * v1 = right_array[right_section];
 	soft_vertex * v2 = right_array[right_section - 1];
 
@@ -2548,7 +2548,7 @@ inline int RightSection_GT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline int LeftSection_GT4(void) {
+static inline int LeftSection_GT4(void) {
 	soft_vertex * v1 = left_array[left_section];
 	soft_vertex * v2 = left_array[left_section - 1];
 
@@ -2576,7 +2576,7 @@ inline int LeftSection_GT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char NextRow_GT4(void) {
+static inline char NextRow_GT4(void) {
 	if (--left_section_height <= 0) {
 		if (--left_section > 0)
 			while (LeftSection_GT4() <= 0) {
@@ -2611,7 +2611,7 @@ inline char NextRow_GT4(void) {
 
 ////////////////////////////////////////////////////////////////////////
 
-inline char SetupSections_GT4(short x1, short y1, short x2, short y2, short x3,
+static inline char SetupSections_GT4(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, int32_t rgb1,
 		int32_t rgb2, int32_t rgb3, int32_t rgb4) {
@@ -2814,7 +2814,7 @@ inline char SetupSections_GT4(short x1, short y1, short x2, short y2, short x3,
 // POLY 3/4 FLAT SHADED
 ////////////////////////////////////////////////////////////////////////
 
-inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3,
+static inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3,
 		short y3, int32_t rgb) {
 	int i, j, xmin, xmax, ymin, ymax;
 	unsigned short color;
@@ -2997,7 +2997,7 @@ void drawPoly4F(int32_t rgb) {
 // POLY 3/4 F-SHADED TEX PAL 4
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,
 		short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -3151,7 +3151,7 @@ void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax, n_xi, n_yi, TXV;
@@ -3332,7 +3332,7 @@ void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -3494,7 +3494,7 @@ void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3,
 
 #ifdef POLYQUAD3
 
-void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -3508,7 +3508,7 @@ void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3,
 
 // more exact:
 
-void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4, short clX, short clY) {
 	int32_t num;
@@ -3677,7 +3677,7 @@ void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -3872,7 +3872,7 @@ void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -4044,7 +4044,7 @@ void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -4216,7 +4216,7 @@ void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3,
 // POLY 3 F-SHADED TEX PAL 8
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,
 		short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -4358,7 +4358,7 @@ void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax, n_xi, n_yi, TXV, TXU;
@@ -4539,7 +4539,7 @@ void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -4689,7 +4689,7 @@ void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3,
 
 #ifdef POLYQUAD3
 
-void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -4704,7 +4704,7 @@ void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3,
 
 // more exact:
 
-void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4, short clX, short clY) {
 	int32_t num;
@@ -4860,7 +4860,7 @@ void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -5054,7 +5054,7 @@ void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -5214,7 +5214,7 @@ void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY) {
@@ -5375,7 +5375,7 @@ void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3,
 // POLY 3 F-SHADED TEX 15 BIT
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3) {
 	int i, j, xmin, xmax, ymin, ymax;
 	int32_t difX, difY, difX2, difY2;
@@ -5492,7 +5492,7 @@ void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3) {
 	int i, j, xmin, xmax, ymin, ymax;
 	int32_t difX, difY, difX2, difY2;
@@ -5617,7 +5617,7 @@ void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 
 #ifdef POLYQUAD3
 
-void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4) {
 	drawPoly3TD(x2, y2, x3, y3, x4, y4, tx2, ty2, tx3, ty3, tx4, ty4);
@@ -5628,7 +5628,7 @@ void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3,
 
 // more exact:
 
-void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4) {
 	int32_t num;
@@ -5763,7 +5763,7 @@ void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4) {
 	int32_t num;
@@ -5904,7 +5904,7 @@ void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4) {
 	int32_t num;
@@ -6047,7 +6047,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3,
 // POLY 3/4 G-SHADED
 ////////////////////////////////////////////////////////////////////////
 
-inline void drawPoly3Gi(short x1, short y1, short x2, short y2, short x3,
+static inline void drawPoly3Gi(short x1, short y1, short x2, short y2, short x3,
 		short y3, int32_t rgb1, int32_t rgb2, int32_t rgb3) {
 	int i, j, xmin, xmax, ymin, ymax;
 	int32_t cR1, cG1, cB1;
@@ -6212,7 +6212,7 @@ void drawPoly4G(int32_t rgb1, int32_t rgb2, int32_t rgb3, int32_t rgb4) {
 // POLY 3/4 G-SHADED TEX PAL4
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,
 		short clX, short clY, int32_t col1, int32_t col2, int32_t col3) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -6383,7 +6383,7 @@ void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY, int32_t col1, int32_t col2,
 		int32_t col3) {
@@ -6575,7 +6575,7 @@ void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY, int32_t col1, int32_t col2,
 		int32_t col3) {
@@ -6754,7 +6754,7 @@ void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
 // correct that way, so small texture distortions can 
 // happen... 
 
-void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -6766,7 +6766,7 @@ void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3,
 
 #ifdef POLYQUAD3GT
 
-void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -6780,7 +6780,7 @@ void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4, short clX, short clY,
 		int32_t col1, int32_t col2, int32_t col4, int32_t col3) {
@@ -6978,7 +6978,7 @@ void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -6993,7 +6993,7 @@ void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3,
 // POLY 3/4 G-SHADED TEX PAL8
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,
 		short clX, short clY, int32_t col1, int32_t col2, int32_t col3) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -7157,7 +7157,7 @@ void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY, int32_t col1, int32_t col2,
 		int32_t col3) {
@@ -7348,7 +7348,7 @@ void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, short clX, short clY, int32_t col1, int32_t col2,
 		int32_t col3) {
@@ -7518,7 +7518,7 @@ void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
 
 // note: two g-shaded tris: small texture distortions can happen
 
-void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -7530,7 +7530,7 @@ void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3,
 
 #ifdef POLYQUAD3GT
 
-void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -7542,7 +7542,7 @@ void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3,
 
 #endif
 
-void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4, short clX, short clY,
 		int32_t col1, int32_t col2, int32_t col4, int32_t col3) {
@@ -7732,7 +7732,7 @@ void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, short clX,
 		short clY, int32_t col1, int32_t col2, int32_t col3, int32_t col4) {
@@ -7746,7 +7746,7 @@ void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3,
 // POLY 3 G-SHADED TEX 15 BIT
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3,
 		short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,
 		int32_t col1, int32_t col2, int32_t col3) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -7894,7 +7894,7 @@ void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short tx1, short ty1, short tx2, short ty2, short tx3,
 		short ty3, int32_t col1, int32_t col2, int32_t col3) {
 	int i, j, xmin, xmax, ymin, ymax;
@@ -8051,7 +8051,7 @@ void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3,
 
 #ifdef POLYQUAD3GT
 
-void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1,
 		int32_t col2, int32_t col3, int32_t col4) {
@@ -8063,7 +8063,7 @@ void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3,
 
 #endif
 
-void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3,
+static void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3,
 		short x4, short y4, short tx1, short ty1, short tx2, short ty2,
 		short tx3, short ty3, short tx4, short ty4, int32_t col1, int32_t col2,
 		int32_t col4, int32_t col3) {
@@ -8236,7 +8236,7 @@ void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3,
 
 ////////////////////////////////////////////////////////////////////////
 
-void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3,
+static void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3,
 		short y3, short x4, short y4, short tx1, short ty1, short tx2,
 		short ty2, short tx3, short ty3, short tx4, short ty4, int32_t col1,
 		int32_t col2, int32_t col3, int32_t col4) {
@@ -8266,7 +8266,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3,
  */
 
 // real rect test
-inline char IsNoRect(void) {
+static inline char IsNoRect(void) {
 	if (!(g_prim.dwActFixes & 0x200))
 		return 0;
 
@@ -9022,7 +9022,7 @@ void DrawSoftwareSpriteMirror(unsigned char * baseAddr, int32_t w, int32_t h) {
 
 ////////////////////////////////////////////////////////////////////////
 
-void DrawSoftwareSprite_IL(unsigned char * baseAddr, short w, short h,
+static void DrawSoftwareSprite_IL(unsigned char * baseAddr, short w, short h,
 		int32_t tx, int32_t ty) {
 	int32_t sprtY, sprtX, sprtW, sprtH, tdx, tdy;
 	uint32_t *gpuData = (uint32_t *) baseAddr;
@@ -9317,7 +9317,7 @@ void DrawSoftwareSprite(unsigned char * baseAddr, short w, short h, int32_t tx,
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
+static void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 		uint32_t rgb1) {
 	int dx, dy, incrE, incrSE, d;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -9375,7 +9375,7 @@ void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
+static void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 		uint32_t rgb1) {
 	int dx, dy, incrS, incrSE, d;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -9433,7 +9433,7 @@ void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
+static void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 		uint32_t rgb1) {
 	int dx, dy, incrN, incrNE, d;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -9491,7 +9491,7 @@ void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
+static void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 		uint32_t rgb1) {
 	int dx, dy, incrE, incrNE, d;
 	uint32_t r0, g0, b0, r1, g1, b1;
@@ -9549,7 +9549,7 @@ void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0,
 
 ///////////////////////////////////////////////////////////////////////
 
-void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1) {
+static void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1) {
 	int y, dy;
 	uint32_t r0, g0, b0, r1, g1, b1;
 	int32_t dr, dg, db;
@@ -9595,7 +9595,7 @@ void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1) {
+static void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1) {
 	int x, dx;
 	uint32_t r0, g0, b0, r1, g1, b1;
 	int32_t dr, dg, db;
@@ -9641,7 +9641,7 @@ void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
+static void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 	int dx, dy, incrE, incrSE, d, x, y;
 
 	dx = x1 - x0;
@@ -9671,7 +9671,7 @@ void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
+static void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 	int dx, dy, incrS, incrSE, d, x, y;
 
 	dx = x1 - x0;
@@ -9701,7 +9701,7 @@ void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
+static void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 	int dx, dy, incrN, incrNE, d, x, y;
 
 	dx = x1 - x0;
@@ -9731,7 +9731,7 @@ void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
+static void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 	int dx, dy, incrE, incrNE, d, x, y;
 
 	dx = x1 - x0;
@@ -9761,7 +9761,7 @@ void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void VertLineFlat(int x, int y0, int y1, unsigned short colour) {
+static void VertLineFlat(int x, int y0, int y1, unsigned short colour) {
 	int y;
 
 	if (y0 < g_prim.drawY)
@@ -9776,7 +9776,7 @@ void VertLineFlat(int x, int y0, int y1, unsigned short colour) {
 
 ///////////////////////////////////////////////////////////////////////
 
-void HorzLineFlat(int y, int x0, int x1, unsigned short colour) {
+static void HorzLineFlat(int y, int x0, int x1, unsigned short colour) {
 	int x;
 
 	if (x0 < g_prim.drawX)
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index 748824a1..36bcf360 100644
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -1,1658 +1,1658 @@
-/***************************************************************************

-                           draw.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_DRAW

-

-#include "externals.h"

-#include "gpu.h"

-#include "draw.h"

-#include "prim.h"

-#include "texture.h"

-#include "menu.h"

-

-#if defined(_MACGL)

-// if you use it, you must include it

-#include <OpenGL/gl.h>

-#include <OpenGL/glext.h>

-#endif

-////////////////////////////////////////////////////////////////////////////////////

-// defines

-

-#define SIGNBIT 0x800

-#define S_MASK  0xf000

-#define L_MASK  0xfffff000

-

-// ownscale: some ogl drivers have buggy texture matrix funcs, so it

-//           is safer to calc sow/tow ourselves

-

-#ifdef OWNSCALE

-

-#define ST_FACSPRITE       255.99f

-#define ST_BFFACSPRITE     0.5f/256.0f

-#define ST_BFFACSPRITESORT 0.333f/256.0f

-

-#define ST_OFFSET          0.5f/256.0f;

-

-#define ST_FAC             255.99f

-#define ST_BFFAC           0.5f/256.0f

-#define ST_BFFACSORT       0.333f/256.0f

-

-#define ST_FACTRI          255.99f

-#define ST_BFFACTRI        0.5f/256.0f

-#define ST_BFFACTRISORT    0.333f/256.0f

-

-#define ST_FACVRAMX        255.0f

-#define ST_FACVRAM         256.0f

-

-///////////////////////////////////////////////////////////////

-

-#else

-

-#define ST_BFFACSPRITE     0.5f

-#define ST_BFFACSPRITESORT 0.333f

-

-#define ST_BFFAC           0.5f

-#define ST_BFFACSORT       0.333f

-

-#define ST_BFFACTRI        0.5f

-#define ST_BFFACTRISORT    0.333f

-

-#define ST_OFFSET          0.5f;

-                

-#endif

-

-////////////////////////////////////////////////////////////////////////////////////

-// draw globals; most will be initialized again later (by config or checks) 

-

-#ifdef _WINDOWS

-HDC            dcGlobal = NULL;

-HWND           hWWindow;

-#endif

-

-BOOL           bIsFirstFrame = TRUE;

-

-// resolution/ratio vars

-

-int            iResX;

-int            iResY;

-BOOL           bKeepRatio = FALSE;

-RECT           rRatioRect;

-

-// psx mask related vars

-

-BOOL           bCheckMask = FALSE;

-int            iUseMask = 0;

-int            iSetMask = 0;

-unsigned short sSetMask = 0;

-uint32_t       lSetMask = 0;

-

-// drawing/coord vars

-

-OGLVertex      vertex[4];

-GLubyte        gl_ux[8];

-GLubyte        gl_vy[8];

-short          sprtY,sprtX,sprtH,sprtW;

-

-// drawing options

-

-BOOL           bOpaquePass;

-BOOL           bAdvancedBlend;

-BOOL           bUseLines;

-BOOL           bUseAntiAlias;

-int            iTexQuality;

-int            iUsePalTextures=1;

-BOOL           bSnapShot=FALSE;

-BOOL           bSmallAlpha=FALSE;

-int            iShowFPS=0;

-

-// OGL extension support

-

-int                iForceVSync=-1;

-int                iUseExts=0;

-BOOL               bGLExt;

-BOOL               bGLFastMovie=FALSE;

-BOOL               bGLSoft;

-BOOL               bGLBlend;

-#if defined (_MACGL) // always supported on OSX > 10.4.3

-#define glBlendEquationEXTEx glBlendEquationEXT

-#define glColorTableEXTEx glColorTableEXT

-#else

-PFNGLBLENDEQU      glBlendEquationEXTEx=NULL;

-PFNGLCOLORTABLEEXT glColorTableEXTEx=NULL;

-#endif

-// gfx card buffer infos

-

-int            iDepthFunc=0;

-int            iZBufferDepth=0;

-GLbitfield     uiBufferBits=GL_COLOR_BUFFER_BIT;

-

-////////////////////////////////////////////////////////////////////////

-// Set OGL pixel format

-////////////////////////////////////////////////////////////////////////

- 

-#ifdef _WINDOWS

-BOOL bSetupPixelFormat(HDC hDC)

-{

- int pixelformat;

- static PIXELFORMATDESCRIPTOR pfd = 

-  {

-   sizeof(PIXELFORMATDESCRIPTOR),    // size of this pfd

-    1,                               // version number

-    PFD_DRAW_TO_WINDOW |             // support window

-      PFD_SUPPORT_OPENGL |           // support OpenGL

-      PFD_DOUBLEBUFFER,              // double buffered

-    PFD_TYPE_RGBA,                   // RGBA type

-    16,                              // 16-bit color depth  (adjusted later)

-    0, 0, 0, 0, 0, 0,                // color bits ignored

-    0,                               // no alpha buffer

-    0,                               // shift bit ignored

-    0,                               // no accumulation buffer

-    0, 0, 0, 0,                      // accum bits ignored

-    0,                               // z-buffer    

-    0,

-    0,                               // no auxiliary buffer

-    PFD_MAIN_PLANE,                  // main layer

-    0,                               // reserved

-    0, 0, 0                          // layer masks ignored

-  };

- 

- pfd.cColorBits=iColDepth;                             // set user color depth

- pfd.cDepthBits=iZBufferDepth;                         // set user zbuffer (by psx mask)

-

- if((pixelformat=ChoosePixelFormat(hDC,&pfd))==0)     

-  {

-   MessageBox(NULL,"ChoosePixelFormat failed","Error",MB_OK);

-   return FALSE;

-  }

-

- if(SetPixelFormat(hDC,pixelformat, &pfd)==FALSE)

-  {

-   MessageBox(NULL,"SetPixelFormat failed","Error",MB_OK);

-   return FALSE;

-  }

-

- return TRUE;

-}

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// Get extension infos (f.e. pal textures / packed pixels)

-////////////////////////////////////////////////////////////////////////

-

-void GetExtInfos(void)                              

-{

- BOOL bPacked=FALSE;                                   // default: no packed pixel support

-

- bGLExt=FALSE;                                         // default: no extensions

- bGLFastMovie=FALSE;

-

- if(strstr((char *)glGetString(GL_EXTENSIONS),         // packed pixels available?

-    "GL_EXT_packed_pixels"))                          

-  bPacked=TRUE;                                        // -> ok

-

- if(bPacked && bUse15bitMdec)                          // packed available and 15bit mdec wanted?

-  bGLFastMovie=TRUE;                                   // -> ok

-

- if(bPacked && (iTexQuality==1 || iTexQuality==2))     // packed available and 16 bit texture format?

-  {

-   bGLFastMovie=TRUE;                                  // -> ok

-   bGLExt=TRUE;

-  }

-

- if(iUseExts &&                                        // extension support wanted?

-    (strstr((char *)glGetString(GL_EXTENSIONS),

-     "GL_EXT_texture_edge_clamp") ||

-     strstr((char *)glGetString(GL_EXTENSIONS),        // -> check clamp support, if yes: use it

-     "GL_SGIS_texture_edge_clamp")))

-      iClampType=GL_TO_EDGE_CLAMP;

- else iClampType=GL_CLAMP;

-

-#if !defined (_MACGL) // OSX > 10.4.3 defines this

- glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL;           // init ogl palette func pointer

-#endif

-

-#ifndef __sun

- if(iGPUHeight!=1024 &&                                // no pal textures in ZN mode (height=1024)! 

-    strstr((char *)glGetString(GL_EXTENSIONS),         // otherwise: check ogl support

-    "GL_EXT_paletted_texture"))

-  {

-   iUsePalTextures=1;                                  // -> wow, supported, get func pointer

-

-#ifdef _WINDOWS

-   glColorTableEXTEx=(PFNGLCOLORTABLEEXT)wglGetProcAddress("glColorTableEXT");

-#elif defined (_MACGL)

-    // no prob, done already in OSX > 10.4.3

-#else

-   glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress("glColorTableEXT");

-#endif

-

-   if(glColorTableEXTEx==NULL) iUsePalTextures=0;      // -> ha, cheater... no func, no support

-

-  }

- else iUsePalTextures=0;

-#else

- iUsePalTextures=0;

-#endif

-}

-

-////////////////////////////////////////////////////////////////////////

-// Setup some stuff depending on user settings or in-game toggle

-////////////////////////////////////////////////////////////////////////

-

-void SetExtGLFuncs(void)

-{

- //----------------------------------------------------//

-

- SetFixes();                                           // update fix infos

-

- //----------------------------------------------------//

-

-#ifdef _WINDOWS

- if((iForceVSync>=0) &&                                // force vsync?

-    strstr((char *)glGetString(GL_EXTENSIONS),         // and extension available?

-    "WGL_EXT_swap_control"))

-  {

-   PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT= 

-    (PFNWGLSWAPINTERVALFARPROC)wglGetProcAddress("wglSwapIntervalEXT");

-

-   if(wglSwapIntervalEXT) wglSwapIntervalEXT(iForceVSync);

-  }

-#endif

-#ifdef _MACGL

-    SetVSync(iForceVSync);

-#endif

- if(iUseExts && !(dwActFixes&1024) &&                  // extensions wanted? and not turned off by game fix?

-    strstr((char *)glGetString(GL_EXTENSIONS),         // and blend_subtract available?

-    "GL_EXT_blend_subtract"))

-     {                                                 // -> get ogl blend function pointer

-#ifdef _WINDOWS

-      glBlendEquationEXTEx=(PFNGLBLENDEQU)wglGetProcAddress("glBlendEquationEXT");

-#elif defined(_MACGL)

-    // no prob, OSX > 10.4.3 has this

-#else

-      glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress("glBlendEquationEXT");

-#endif

-     }

- else                                                  // no subtract blending?

-  {

-   if(glBlendEquationEXTEx)                            // -> change to additive blending (if subract was active)

-    glBlendEquationEXTEx(FUNC_ADD_EXT);

-#if !defined(_MACGL) // BTW, why set to null? strange...

-   glBlendEquationEXTEx=(PFNGLBLENDEQU)NULL;           // -> no more blend function pointer

-#endif

-  }

-

- //----------------------------------------------------//

-

- if(iUseExts && bAdvancedBlend &&                      // advanced blending wanted ?

-    strstr((char *)glGetString(GL_EXTENSIONS),         // and extension avail?

-           "GL_EXT_texture_env_combine"))

-  {

-   bUseMultiPass=FALSE;bGLBlend=TRUE;                  // -> no need for 2 passes, perfect

-

-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    

-   glTexEnvf(GL_TEXTURE_ENV, COMBINE_RGB_EXT, GL_MODULATE);     

-   glTexEnvf(GL_TEXTURE_ENV, COMBINE_ALPHA_EXT, GL_MODULATE);     

-   glTexEnvf(GL_TEXTURE_ENV, RGB_SCALE_EXT, 2.0f);    

-  }

- else                                                  // no advanced blending wanted/available:

-  {

-   if(bAdvancedBlend) bUseMultiPass=TRUE;              // -> pseudo-advanced with 2 passes

-   else               bUseMultiPass=FALSE;             // -> or simple 'bright color' mode

-   bGLBlend=FALSE;                                     // -> no ext blending!

-

-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    

-  }

-

- //----------------------------------------------------//

- // init standard tex quality 0-2, and big alpha mode 3

-

- if(!(dwActFixes&0x4000) && iFilterType && iTexQuality>=3) 

-      bSmallAlpha=TRUE;                  

- else bSmallAlpha=FALSE;

-

- if(bOpaquePass)                                        // opaque mode?

-  {

-   if(dwActFixes&32) 

-    {

-     TCF[0]=CP8RGBA_0;

-     PalTexturedColourFn=CP8RGBA;                      // -> init col func

-    }

-   else

-    {

-     TCF[0]=XP8RGBA_0;

-     PalTexturedColourFn=XP8RGBA;                      // -> init col func

-    }

-

-   TCF[1]=XP8RGBA_1;

-   glAlphaFunc(GL_GREATER,0.49f);

-  }

- else                                                  // no opaque mode?

-  {

-   TCF[0]=TCF[1]=P8RGBA;

-   PalTexturedColourFn=P8RGBA;                         // -> init col func

-   glAlphaFunc(GL_NOTEQUAL,0);                         // --> set alpha func

-  }

-

- //----------------------------------------------------//

-

- LoadSubTexFn=LoadSubTexturePageSort;                  // init load tex ptr

-

- giWantedFMT=GL_RGBA;                                  // init ogl tex format

-

- switch(iTexQuality)                                   // -> quality:

-  {

-   //--------------------------------------------------// 

-   case 0:                                             // -> don't care

-    giWantedRGBA=4;

-    giWantedTYPE=GL_UNSIGNED_BYTE;

-    break;

-   //--------------------------------------------------// 

-   case 1:                                             // -> R4G4B4A4

-    if(bGLExt)

-     {

-      giWantedRGBA=GL_RGBA4;

-      giWantedTYPE=GL_UNSIGNED_SHORT_4_4_4_4_EXT;

-      LoadSubTexFn=LoadPackedSubTexturePageSort;

-      if(bOpaquePass) 

-       {

-        if(dwActFixes&32) PTCF[0]=CP4RGBA_0;

-        else              PTCF[0]=XP4RGBA_0;

-        PTCF[1]=XP4RGBA_1;

-       }

-      else      

-       {

-        PTCF[0]=PTCF[1]=P4RGBA;

-       }

-     }

-    else

-     {

-      giWantedRGBA=GL_RGBA4;

-      giWantedTYPE=GL_UNSIGNED_BYTE;

-     }

-    break;

-   //--------------------------------------------------// 

-   case 2:                                             // -> R5B5G5A1

-    if(bGLExt)

-     {

-      giWantedRGBA=GL_RGB5_A1;

-      giWantedTYPE=GL_UNSIGNED_SHORT_5_5_5_1_EXT;

-      LoadSubTexFn=LoadPackedSubTexturePageSort;

-      if(bOpaquePass) 

-       {

-        if(dwActFixes&32) PTCF[0]=CP5RGBA_0;

-        else              PTCF[0]=XP5RGBA_0;

-        PTCF[1]=XP5RGBA_1;

-       }

-      else   

-       {

-        PTCF[0]=PTCF[1]=P5RGBA;

-       }

-     }

-    else

-     {

-      giWantedRGBA=GL_RGB5_A1;giWantedTYPE=GL_UNSIGNED_BYTE;

-     }

-    break;

-   //--------------------------------------------------// 

-   case 3:                                             // -> R8G8B8A8

-    giWantedRGBA=GL_RGBA8;

-    giWantedTYPE=GL_UNSIGNED_BYTE;

-

-    if(bSmallAlpha)

-     {

-      if(bOpaquePass)                                  // opaque mode?

-       {

-        if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}

-        else              {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}

-        TCF[1]=XP8RGBAEx_1;

-       }

-     }

-

-    break;

-   //--------------------------------------------------// 

-   case 4:                                             // -> R8G8B8A8

-    giWantedRGBA = GL_RGBA8;

-    giWantedTYPE = GL_UNSIGNED_BYTE;

-

-    if(strstr((char *)glGetString(GL_EXTENSIONS),      // and extension avail?

-              "GL_EXT_bgra"))

-     {

-      giWantedFMT  = GL_BGRA_EXT;

-

-      if(bOpaquePass)                                  // opaque mode?

-       {

-        if(bSmallAlpha)

-         {

-          if(dwActFixes&32) {TCF[0]=CP8BGRAEx_0;PalTexturedColourFn=CP8RGBAEx;}

-          else              {TCF[0]=XP8BGRAEx_0;PalTexturedColourFn=XP8RGBAEx;}

-          TCF[1]=XP8BGRAEx_1;

-         }

-        else

-         {

-          if(dwActFixes&32) {TCF[0]=CP8BGRA_0;PalTexturedColourFn=CP8RGBA;}

-          else              {TCF[0]=XP8BGRA_0;PalTexturedColourFn=XP8RGBA;}

-          TCF[1]=XP8BGRA_1;

-         }

-       }

-      else                                             // no opaque mode?

-       {

-        TCF[0]=TCF[1]=P8BGRA;                          // -> init col func

-       }

-     }

-    else

-     {

-      iTexQuality=3;

-      if(bSmallAlpha)

-       {

-        if(bOpaquePass)                                 // opaque mode?

-         {

-          if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}

-          else              {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}

-          TCF[1]=XP8RGBAEx_1;

-         }

-       }

-     }

-

-    break;

-   //--------------------------------------------------// 

-  }

-

- bBlendEnable=FALSE;                                   // init blending: off

- glDisable(GL_BLEND);

-

- SetScanTrans();                                       // init scan lines (if wanted)

-}

-

-////////////////////////////////////////////////////////////////////////

-// setup scan lines

-////////////////////////////////////////////////////////////////////////

-

-#define R_TSP 0x00,0x45,0x00,0xff

-#define G_TSP 0x00,0x00,0x45,0xff

-#define B_TSP 0x45,0x00,0x00,0xff

-#define O_TSP 0x45,0x45,0x45,0xff

-#define N_TSP 0x00,0x00,0x00,0xff

-

-GLuint  gTexScanName=0;

-

-GLubyte texscan[4][16]= 

-{

-{R_TSP, G_TSP, B_TSP, N_TSP},

-{O_TSP, N_TSP, O_TSP, N_TSP},

-{B_TSP, N_TSP, R_TSP, G_TSP},

-{O_TSP, N_TSP, O_TSP, N_TSP}

-};

-

-void CreateScanLines(void)

-{

- if(iUseScanLines)

-  {

-   int y;

-   if(iScanBlend<0)                                    // special scan mask mode

-    {

-     glGenTextures(1, &gTexScanName);

-     glBindTexture(GL_TEXTURE_2D, gTexScanName);

-

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     glTexImage2D(GL_TEXTURE_2D, 0, 4, 4, 4, 0,GL_RGBA, GL_UNSIGNED_BYTE, texscan);

-    }

-   else                                                // otherwise simple lines in a display list

-    {

-     uiScanLine=glGenLists(1);

-     glNewList(uiScanLine,GL_COMPILE);

-     #ifdef _MACGL

-     	// not mac specific, just commenting out to be friendly

-     	// use it if you like

-     	// this draws anti-aliased lines with user-chosen color

-         glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);

-             glEnable(GL_BLEND | GL_LINE_SMOOTH);

-             glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);

-             glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);

-             glBegin(GL_LINES);

-                 for(y=0;y<iResY;y+=2)

-                  {

-                    glVertex2f(0,y);

-                    glVertex2f(iResX,y);

-                  }

-             glEnd();

-         glPopAttrib();

-	 #else

-	      for(y=0;y<iResY;y+=2)

-      {

-       glBegin(GL_QUADS);

-         glVertex2f(0,y);

-         glVertex2f(iResX,y);

-         glVertex2f(iResX,y+1);

-         glVertex2f(0,y+1);

-       glEnd();

-      }

-     

-    #endif

-    glEndList();

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// Initialize OGL

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS    

-HGLRC GLCONTEXT=NULL;

-#endif

-

-int GLinitialize() 

-{

-#ifdef _WINDOWS

- HGLRC objectRC;

- // init

- dcGlobal = GetDC(hWWindow);                           // FIRST: dc/rc stuff

- objectRC = wglCreateContext(dcGlobal); 

- GLCONTEXT=objectRC;

- wglMakeCurrent(dcGlobal, objectRC);

- // CheckWGLExtensions(dcGlobal);

- if(bWindowMode) ReleaseDC(hWWindow,dcGlobal);         // win mode: release dc again

-#endif

-#if defined (_MACGL)

-    BringContextForward();

-#endif

- glViewport(rRatioRect.left,                           // init viewport by ratio rect

-            iResY-(rRatioRect.top+rRatioRect.bottom),

-            rRatioRect.right, 

-            rRatioRect.bottom);         

-                                                      

- glScissor(0, 0, iResX, iResY);                        // init clipping (fullscreen)

- glEnable(GL_SCISSOR_TEST);                       

-

-#ifndef OWNSCALE

- glMatrixMode(GL_TEXTURE);                             // init psx tex sow and tow if not "ownscale"

- glLoadIdentity();

- glScalef(1.0f/255.99f,1.0f/255.99f,1.0f);             // geforce precision hack

-#endif 

-

- glMatrixMode(GL_PROJECTION);                          // init projection with psx resolution

- glLoadIdentity();

- glOrtho(0,PSXDisplay.DisplayMode.x,

-         PSXDisplay.DisplayMode.y, 0, -1, 1);

-

- if(iZBufferDepth)                                     // zbuffer?

-  {

-   uiBufferBits=GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT;

-   glEnable(GL_DEPTH_TEST);    

-   glDepthFunc(GL_ALWAYS);

-   iDepthFunc=1;

-  }

- else                                                  // no zbuffer?

-  {

-   uiBufferBits=GL_COLOR_BUFFER_BIT;

-   glDisable(GL_DEPTH_TEST);

-  }

-

- glClearColor(0.0f, 0.0f, 0.0f, 0.0f);                 // first buffer clear

- glClear(uiBufferBits);

-

- if(bUseLines)                                         // funny lines 

-  {

-   glPolygonMode(GL_FRONT, GL_LINE); 

-   glPolygonMode(GL_BACK, GL_LINE); 

-  }

- else                                                  // or the real filled thing

-  {

-   glPolygonMode(GL_FRONT, GL_FILL);

-   glPolygonMode(GL_BACK, GL_FILL);

-  }

-

- MakeDisplayLists();                                   // lists for menu/opaque

- GetExtInfos();                                        // get ext infos

- SetExtGLFuncs();                                      // init all kind of stuff (tex function pointers)

- 

- glEnable(GL_ALPHA_TEST);                              // wanna alpha test

-

- if(!bUseAntiAlias)                                    // no anti-alias (default)

-  {

-   glDisable(GL_LINE_SMOOTH);

-   glDisable(GL_POLYGON_SMOOTH);

-   glDisable(GL_POINT_SMOOTH);

-  }

- else                                                  // wanna try it? glitches galore...

-  {                    

-   glHint(GL_PERSPECTIVE_CORRECTION_HINT,GL_NICEST);

-   glEnable(GL_LINE_SMOOTH);

-   glEnable(GL_POLYGON_SMOOTH);

-   glEnable(GL_POINT_SMOOTH);

-   glHint(GL_LINE_SMOOTH_HINT,GL_NICEST);

-   glHint(GL_POINT_SMOOTH_HINT,GL_NICEST);

-   glHint(GL_POLYGON_SMOOTH_HINT,GL_NICEST);

-  }

-

- ubGloAlpha=127;                                       // init some drawing vars

- ubGloColAlpha=127;

- TWin.UScaleFactor = 1;

- TWin.VScaleFactor = 1;

- bDrawMultiPass=FALSE;

- bTexEnabled=FALSE;

- bUsingTWin=FALSE;

-      

- if(bDrawDither)  glEnable(GL_DITHER);                 // dither mode

- else             glDisable(GL_DITHER); 

-

- glDisable(GL_FOG);                                    // turn all (currently) unused modes off

- glDisable(GL_LIGHTING);  

- glDisable(GL_LOGIC_OP);

- glDisable(GL_STENCIL_TEST);  

- glDisable(GL_TEXTURE_1D);

- glDisable(GL_TEXTURE_2D);

- glDisable(GL_CULL_FACE);

-

- glPixelTransferi(GL_RED_SCALE, 1);                    // to be sure:

- glPixelTransferi(GL_RED_BIAS, 0);                     // init more OGL vals

- glPixelTransferi(GL_GREEN_SCALE, 1);

- glPixelTransferi(GL_GREEN_BIAS, 0);

- glPixelTransferi(GL_BLUE_SCALE, 1);

- glPixelTransferi(GL_BLUE_BIAS, 0);

- glPixelTransferi(GL_ALPHA_SCALE, 1);

- glPixelTransferi(GL_ALPHA_BIAS, 0);                                                  

-

-#ifdef _WINDOWS

-                                                       // detect Windows hw/sw mode (just for info)

- if(!strcmp("Microsoft Corporation",(LPTSTR)glGetString(GL_VENDOR)) &&

-    !strcmp("GDI Generic",          (LPTSTR)glGetString(GL_RENDERER)))

-      bGLSoft=TRUE;

- else bGLSoft=FALSE;

-#endif

-

- glFlush();                                            // we are done...

- glFinish();                           

-

- CreateScanLines();                                    // setup scanline stuff (if wanted)

-

- CheckTextureMemory();                                 // check available tex memory

-

- if(bKeepRatio) SetAspectRatio();                      // set ratio

-

- if(iShowFPS)                                          // user wants FPS display on startup?

-  {

-   ulKeybits|=KEY_SHOWFPS;                             // -> ok, turn display on

-   szDispBuf[0]=0;

-   BuildDispMenu(0);

-  }

- 

- bIsFirstFrame = FALSE;                                // we have survived the first frame :)

-

- return 0;

-}

-

-////////////////////////////////////////////////////////////////////////

-// clean up OGL stuff

-////////////////////////////////////////////////////////////////////////

-

-void GLcleanup() 

-{                                                     

- KillDisplayLists();                                   // bye display lists

-

- if(iUseScanLines)                                     // scanlines used?

-  {

-   if(iScanBlend<0)

-    {

-     if(gTexScanName!=0)                               // some scanline tex?

-      glDeleteTextures(1, &gTexScanName);              // -> delete it

-     gTexScanName=0;

-    }

-   else glDeleteLists(uiScanLine,1);                   // otherwise del scanline display list

-  }

-

- CleanupTextureStore();                                // bye textures

-

-#ifdef _WINDOWS 

- wglMakeCurrent(NULL, NULL);                           // bye context

- if(GLCONTEXT) wglDeleteContext(GLCONTEXT);

- if(!bWindowMode && dcGlobal) 

-  ReleaseDC(hWWindow,dcGlobal);

-#endif

-}

-

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////////////////

-// Offset stuff

-////////////////////////////////////////////////////////////////////////

-

-// please note: it is hardly do-able in a hw/accel plugin to get the 

-//              real psx polygon coord mapping right... the following

-//              works not to bad with many games, though

-

-__inline BOOL CheckCoord4()

-{

- if(lx0<0)

-  {

-   if(((lx1-lx0)>CHKMAX_X) ||

-      ((lx2-lx0)>CHKMAX_X)) 

-    {

-     if(lx3<0)

-      {

-       if((lx1-lx3)>CHKMAX_X) return TRUE;

-       if((lx2-lx3)>CHKMAX_X) return TRUE;

-      }

-    }

-  }

- if(lx1<0)

-  {

-   if((lx0-lx1)>CHKMAX_X) return TRUE;

-   if((lx2-lx1)>CHKMAX_X) return TRUE;

-   if((lx3-lx1)>CHKMAX_X) return TRUE;

-  }

- if(lx2<0)

-  {

-   if((lx0-lx2)>CHKMAX_X) return TRUE;

-   if((lx1-lx2)>CHKMAX_X) return TRUE;

-   if((lx3-lx2)>CHKMAX_X) return TRUE;

-  }

- if(lx3<0)

-  {

-   if(((lx1-lx3)>CHKMAX_X) ||

-      ((lx2-lx3)>CHKMAX_X))

-    {

-     if(lx0<0)

-      {

-       if((lx1-lx0)>CHKMAX_X) return TRUE;

-       if((lx2-lx0)>CHKMAX_X) return TRUE;

-      }

-    }

-  }

- 

-

- if(ly0<0)

-  {

-   if((ly1-ly0)>CHKMAX_Y) return TRUE;

-   if((ly2-ly0)>CHKMAX_Y) return TRUE;

-  }

- if(ly1<0)

-  {

-   if((ly0-ly1)>CHKMAX_Y) return TRUE;

-   if((ly2-ly1)>CHKMAX_Y) return TRUE;

-   if((ly3-ly1)>CHKMAX_Y) return TRUE;

-  }

- if(ly2<0)

-  {

-   if((ly0-ly2)>CHKMAX_Y) return TRUE;

-   if((ly1-ly2)>CHKMAX_Y) return TRUE;

-   if((ly3-ly2)>CHKMAX_Y) return TRUE;

-  }

- if(ly3<0)

-  {

-   if((ly1-ly3)>CHKMAX_Y) return TRUE;

-   if((ly2-ly3)>CHKMAX_Y) return TRUE;

-  }

-

- return FALSE;

-}

-

-__inline BOOL CheckCoord3()

-{

- if(lx0<0)

-  {

-   if((lx1-lx0)>CHKMAX_X) return TRUE;

-   if((lx2-lx0)>CHKMAX_X) return TRUE;

-  }

- if(lx1<0)

-  {

-   if((lx0-lx1)>CHKMAX_X) return TRUE;

-   if((lx2-lx1)>CHKMAX_X) return TRUE;

-  }

- if(lx2<0)

-  {

-   if((lx0-lx2)>CHKMAX_X) return TRUE;

-   if((lx1-lx2)>CHKMAX_X) return TRUE;

-  }

- if(ly0<0)

-  {

-   if((ly1-ly0)>CHKMAX_Y) return TRUE;

-   if((ly2-ly0)>CHKMAX_Y) return TRUE;

-  }

- if(ly1<0)

-  {

-   if((ly0-ly1)>CHKMAX_Y) return TRUE;

-   if((ly2-ly1)>CHKMAX_Y) return TRUE;

-  }

- if(ly2<0)

-  {

-   if((ly0-ly2)>CHKMAX_Y) return TRUE;

-   if((ly1-ly2)>CHKMAX_Y) return TRUE;

-  }

-

- return FALSE;

-}

-

-

-__inline BOOL CheckCoord2()

-{

- if(lx0<0)

-  {

-   if((lx1-lx0)>CHKMAX_X) return TRUE;

-  }

- if(lx1<0)

-  {

-   if((lx0-lx1)>CHKMAX_X) return TRUE;

-  }

- if(ly0<0)

-  {

-   if((ly1-ly0)>CHKMAX_Y) return TRUE;

-  }

- if(ly1<0)

-  {

-   if((ly0-ly1)>CHKMAX_Y) return TRUE;

-  }

-

- return FALSE;

-}

-

-/*

-//Lewpys "offsetline" func:

-

-void offsetline(void)

-{

-	float x0, x1, y0, y1, oolength, xl, yl;

-

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   if((lx0 & SIGNBIT)) lx0|=S_MASK;

-   else                lx0&=~S_MASK;

-   if((lx1 & SIGNBIT)) lx1|=S_MASK;

-   else                lx1&=~S_MASK;

-   if((ly0 & SIGNBIT)) ly0|=S_MASK;

-   else                ly0&=~S_MASK;

-   if((ly1 & SIGNBIT)) ly1|=S_MASK;

-   else                ly1&=~S_MASK;

-  }

-

- x0 = (float)(lx0 + PSXDisplay.CumulOffset.x);

- x1 = (float)(lx1 + PSXDisplay.CumulOffset.x);

- y0 = (float)(ly0 + PSXDisplay.CumulOffset.y);

- y1 = (float)(ly1 + PSXDisplay.CumulOffset.y);

-

- oolength = (float)1/((float)sqrt((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2);

-//	oolength = (float)1/((float)sqrt(((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2));

-

-	xl = (x1 - x0) * oolength;

-	yl = (y1 - y0) * oolength;

-

-	x0 += 0.5f;

-	x1 += 0.5f;

-

-	x0 -= xl - yl;

-	x1 += xl + yl;

-	y0 -= yl + xl;

-	y1 += yl - xl;

-

-	vertex[0].x=x0;

-	vertex[1].x=x1;

-	vertex[0].y=y0;

-	vertex[1].y=y1;

-

-	x0 -= yl * 2;

-	x1 -= yl * 2;

-	y0 += xl * 2;

-	y1 += xl * 2;

-

-	vertex[2].x=x1;

-	vertex[3].x=x0;

-	vertex[2].y=y1;

-	vertex[3].y=y0;

-}

-*/

-

-

-// Pete's way: a very easy (and hopefully fast) approach for lines

-// without sqrt... using a small float -> short cast trick :)

-

-#define VERTEX_OFFX 0.2f

-#define VERTEX_OFFY 0.2f

-

-BOOL offsetline(void)           

-{

- short x0,x1,y0,y1,dx,dy;float px,py;

-

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

-   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

-   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

-   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);

-

-   if(CheckCoord2()) return TRUE;

-  }

-

- x0 = (lx0 + PSXDisplay.CumulOffset.x)+1;

- x1 = (lx1 + PSXDisplay.CumulOffset.x)+1;

- y0 = (ly0 + PSXDisplay.CumulOffset.y)+1;

- y1 = (ly1 + PSXDisplay.CumulOffset.y)+1;

- 

- dx=x1-x0;

- dy=y1-y0;

- 

- if(dx>=0)

-  {

-   if(dy>=0)

-    {

-     px=0.5f;

-          if(dx>dy) py=-0.5f;

-     else if(dx<dy) py= 0.5f;

-     else           py= 0.0f;

-    }

-   else

-    {

-     py=-0.5f;

-     dy=-dy;

-          if(dx>dy) px= 0.5f;

-     else if(dx<dy) px=-0.5f;

-     else           px= 0.0f;

-    }

-  }

- else

-  {

-   if(dy>=0)

-    {

-     py=0.5f;

-     dx=-dx;

-          if(dx>dy) px=-0.5f;

-     else if(dx<dy) px= 0.5f;

-     else           px= 0.0f;

-    }

-   else

-    {

-     px=-0.5f;

-          if(dx>dy) py=-0.5f;

-     else if(dx<dy) py= 0.5f;

-     else           py= 0.0f;

-    }

-  } 

- 

- vertex[0].x=(short)((float)x0-px);

- vertex[3].x=(short)((float)x0+py);

- 

- vertex[0].y=(short)((float)y0-py);

- vertex[3].y=(short)((float)y0-px);

- 

- vertex[1].x=(short)((float)x1-py);

- vertex[2].x=(short)((float)x1+px);

-

- vertex[1].y=(short)((float)y1+px);

- vertex[2].y=(short)((float)y1+py);

-

- if(vertex[0].x==vertex[3].x &&                        // ortho rect? done

-    vertex[1].x==vertex[2].x &&

-    vertex[0].y==vertex[1].y &&

-    vertex[2].y==vertex[3].y) return FALSE;

- if(vertex[0].x==vertex[1].x &&

-    vertex[2].x==vertex[3].x &&

-    vertex[0].y==vertex[3].y &&

-    vertex[1].y==vertex[2].y) return FALSE;

-

- vertex[0].x-=VERTEX_OFFX;                             // otherwise a small offset

- vertex[0].y-=VERTEX_OFFY;                             // to get better accuracy

- vertex[1].x-=VERTEX_OFFX;

- vertex[1].y-=VERTEX_OFFY;

- vertex[2].x-=VERTEX_OFFX;

- vertex[2].y-=VERTEX_OFFY;

- vertex[3].x-=VERTEX_OFFX;

- vertex[3].y-=VERTEX_OFFY;

-

- return FALSE;

-}

-

-///////////////////////////////////////////////////////// 

-

-BOOL offset2(void)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

-   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

-   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

-   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);

-

-   if(CheckCoord2()) return TRUE;

-  }

-

- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;

- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;

- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;

- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;

-

- return FALSE;

-}

-

-///////////////////////////////////////////////////////// 

-

-BOOL offset3(void)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

-   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

-   lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);

-   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

-   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);

-   ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);

-

-   if(CheckCoord3()) return TRUE;

-  }

-

- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;

- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;

- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;

- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;

- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;

- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;

-

- return FALSE;

-}

-

-///////////////////////////////////////////////////////// 

-

-BOOL offset4(void)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

-   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

-   lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);

-   lx3=(short)(((int)lx3<<SIGNSHIFT)>>SIGNSHIFT);

-   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

-   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);

-   ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);

-   ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);

-

-   if(CheckCoord4()) return TRUE;

-  }

-

- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;

- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;

- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;

- vertex[3].x=lx3+PSXDisplay.CumulOffset.x;

- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;

- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;

- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;

- vertex[3].y=ly3+PSXDisplay.CumulOffset.y;

-

- return FALSE;

-}

-

-///////////////////////////////////////////////////////// 

-

-void offsetST(void)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(!(dwActFixes&16))

-  {

-   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

-   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

-

-   if(lx0<-512 && PSXDisplay.DrawOffset.x<=-512)

-    lx0+=2048;

-

-   if(ly0<-512 && PSXDisplay.DrawOffset.y<=-512)

-    ly0+=2048;

-  }

-

- ly1 = ly0;

- ly2 = ly3 = ly0+sprtH;

- lx3 = lx0;

- lx1 = lx2 = lx0+sprtW;

-

- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;

- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;

- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;

- vertex[3].x=lx3+PSXDisplay.CumulOffset.x;

- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;

- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;

- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;

- vertex[3].y=ly3+PSXDisplay.CumulOffset.y;

-}

-

-///////////////////////////////////////////////////////// 

-

-void offsetScreenUpload(int Position)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-

- if(Position==-1)

-  {

-   int lmdx,lmdy;

-

-   lmdx=xrUploadArea.x0;

-   lmdy=xrUploadArea.y0;

-

-   lx0-=lmdx;

-   ly0-=lmdy;

-   lx1-=lmdx;

-   ly1-=lmdy;

-   lx2-=lmdx;

-   ly2-=lmdy;

-   lx3-=lmdx;

-   ly3-=lmdy;

-  }

- else

- if(Position)

-  {

-   lx0-=PSXDisplay.DisplayPosition.x;

-   ly0-=PSXDisplay.DisplayPosition.y;

-   lx1-=PSXDisplay.DisplayPosition.x;

-   ly1-=PSXDisplay.DisplayPosition.y;

-   lx2-=PSXDisplay.DisplayPosition.x;

-   ly2-=PSXDisplay.DisplayPosition.y;

-   lx3-=PSXDisplay.DisplayPosition.x;

-   ly3-=PSXDisplay.DisplayPosition.y;

-  }

- else

-  {

-   lx0-=PreviousPSXDisplay.DisplayPosition.x;

-   ly0-=PreviousPSXDisplay.DisplayPosition.y;

-   lx1-=PreviousPSXDisplay.DisplayPosition.x;

-   ly1-=PreviousPSXDisplay.DisplayPosition.y;

-   lx2-=PreviousPSXDisplay.DisplayPosition.x;

-   ly2-=PreviousPSXDisplay.DisplayPosition.y;

-   lx3-=PreviousPSXDisplay.DisplayPosition.x;

-   ly3-=PreviousPSXDisplay.DisplayPosition.y;

-  }

-

- vertex[0].x=lx0 + PreviousPSXDisplay.Range.x0;

- vertex[1].x=lx1 + PreviousPSXDisplay.Range.x0;

- vertex[2].x=lx2 + PreviousPSXDisplay.Range.x0;

- vertex[3].x=lx3 + PreviousPSXDisplay.Range.x0;

- vertex[0].y=ly0 + PreviousPSXDisplay.Range.y0;

- vertex[1].y=ly1 + PreviousPSXDisplay.Range.y0;

- vertex[2].y=ly2 + PreviousPSXDisplay.Range.y0;

- vertex[3].y=ly3 + PreviousPSXDisplay.Range.y0;

-

- if(iUseMask)

-  {

-   vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;

-   gl_z+=0.00004f;

-  }

-}

- 

-///////////////////////////////////////////////////////// 

-

-void offsetBlk(void)

-{

- if(bDisplayNotSet)

-  SetOGLDisplaySettings(1);

-                                            

- vertex[0].x=lx0-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;

- vertex[1].x=lx1-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;

- vertex[2].x=lx2-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;

- vertex[3].x=lx3-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;

- vertex[0].y=ly0-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;

- vertex[1].y=ly1-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;

- vertex[2].y=ly2-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;

- vertex[3].y=ly3-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;

-

- if(iUseMask)

-  {

-   vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;

-   gl_z+=0.00004f;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// texture sow/tow calculations

-////////////////////////////////////////////////////////////////////////

-

-void assignTextureVRAMWrite(void)

-{

-#ifdef OWNSCALE

-

- vertex[0].sow=0.5f/ ST_FACVRAMX;

- vertex[0].tow=0.5f/ ST_FACVRAM;

-

- vertex[1].sow=(float)gl_ux[1]/ ST_FACVRAMX;

- vertex[1].tow=0.5f/ ST_FACVRAM;

-

- vertex[2].sow=(float)gl_ux[2]/ ST_FACVRAMX;

- vertex[2].tow=(float)gl_vy[2]/ ST_FACVRAM;

-

- vertex[3].sow=0.5f/ ST_FACVRAMX;

- vertex[3].tow=(float)gl_vy[3]/ ST_FACVRAM;

-

-#else

-

- if(gl_ux[1]==255)

-  {

-   vertex[0].sow=(gl_ux[0]*255.99f)/255.0f;

-   vertex[1].sow=(gl_ux[1]*255.99f)/255.0f;

-   vertex[2].sow=(gl_ux[2]*255.99f)/255.0f;

-   vertex[3].sow=(gl_ux[3]*255.99f)/255.0f;

-  }

- else

-  {

-   vertex[0].sow=gl_ux[0];

-   vertex[1].sow=gl_ux[1];

-   vertex[2].sow=gl_ux[2];

-   vertex[3].sow=gl_ux[3];

-  }

-

- vertex[0].tow=gl_vy[0];

- vertex[1].tow=gl_vy[1];

- vertex[2].tow=gl_vy[2];

- vertex[3].tow=gl_vy[3];

-

-#endif

-}

-

-GLuint  gLastTex=0;

-GLuint  gLastFMode=(GLuint)-1;

-

-///////////////////////////////////////////////////////// 

-

-void assignTextureSprite(void)

-{

- if(bUsingTWin)

-  {

-   vertex[0].sow=vertex[3].sow=(float)gl_ux[0]/TWin.UScaleFactor;

-   vertex[1].sow=vertex[2].sow=(float)sSprite_ux2/TWin.UScaleFactor;

-   vertex[0].tow=vertex[1].tow=(float)gl_vy[0]/TWin.VScaleFactor;

-   vertex[2].tow=vertex[3].tow=(float)sSprite_vy2/TWin.VScaleFactor;

-   gLastTex=gTexName;

-

-   if(iFilterType>0 && iFilterType<3 && iHiResTextures!=2) 

-    {

-     float fxmin=65536.0f,fxmax=0.0f,fymin=65536.0f,fymax=0.0f;int i;

-

-     for(i=0;i<4;i++)

-      {

-       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;

-       if(vertex[i].tow<fymin) fymin=vertex[i].tow;

-       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;

-       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 

-      }

-

-     for(i=0;i<4;i++)

-      {

-#ifdef OWNSCALE

-       if(vertex[i].sow==fxmin) vertex[i].sow+=0.375f/(float)TWin.Position.x1;

-       if(vertex[i].sow==fxmax) vertex[i].sow-=0.375f/(float)TWin.Position.x1;

-       if(vertex[i].tow==fymin) vertex[i].tow+=0.375f/(float)TWin.Position.y1;

-       if(vertex[i].tow==fymax) vertex[i].tow-=0.375f/(float)TWin.Position.y1;

-#else

-       if(vertex[i].sow==fxmin) vertex[i].sow+=96.0f/(float)TWin.Position.x1;

-       if(vertex[i].sow==fxmax) vertex[i].sow-=96.0f/(float)TWin.Position.x1;

-       if(vertex[i].tow==fymin) vertex[i].tow+=96.0f/(float)TWin.Position.y1;

-       if(vertex[i].tow==fymax) vertex[i].tow-=96.0f/(float)TWin.Position.y1;

-#endif

-      }

-    }

-

-  }

- else

-  {

-#ifdef OWNSCALE

-

-   vertex[0].sow=vertex[3].sow=(float)gl_ux[0]     / ST_FACSPRITE;

-   vertex[1].sow=vertex[2].sow=(float)sSprite_ux2  / ST_FACSPRITE;

-   vertex[0].tow=vertex[1].tow=(float)gl_vy[0]     / ST_FACSPRITE;

-   vertex[2].tow=vertex[3].tow=(float)sSprite_vy2  / ST_FACSPRITE;

-

-#else

- 

-   vertex[0].sow=vertex[3].sow=gl_ux[0];

-   vertex[1].sow=vertex[2].sow=sSprite_ux2;

-   vertex[0].tow=vertex[1].tow=gl_vy[0];

-   vertex[2].tow=vertex[3].tow=sSprite_vy2;

-

-#endif

-

-   if(iFilterType>2) 

-    {

-     if(gLastTex!=gTexName || gLastFMode!=0)

-      {

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-       gLastTex=gTexName;gLastFMode=0;

-      }

-    }

-  }

-

- if(usMirror & 0x1000) 

-  {

-   vertex[0].sow=vertex[1].sow;

-   vertex[1].sow=vertex[2].sow=vertex[3].sow;

-   vertex[3].sow=vertex[0].sow;

-  }

-

- if(usMirror & 0x2000) 

-  {

-   vertex[0].tow=vertex[3].tow;

-   vertex[2].tow=vertex[3].tow=vertex[1].tow;

-   vertex[1].tow=vertex[0].tow;

-  }

-

-}

-

-///////////////////////////////////////////////////////// 

-

-void assignTexture3(void)

-{

- if(bUsingTWin)

-  {

-   vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;

-   vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;

-   vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;

-   vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;

-   vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;

-   vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;

-   gLastTex=gTexName;

-  }

- else

-  {

-#ifdef OWNSCALE

-   vertex[0].sow=(float)gl_ux[0] / ST_FACTRI;

-   vertex[0].tow=(float)gl_vy[0] / ST_FACTRI;

-   vertex[1].sow=(float)gl_ux[1] / ST_FACTRI;

-

-   vertex[1].tow=(float)gl_vy[1] / ST_FACTRI;

-   vertex[2].sow=(float)gl_ux[2] / ST_FACTRI;

-   vertex[2].tow=(float)gl_vy[2] / ST_FACTRI;

-#else

-   vertex[0].sow=gl_ux[0];

-   vertex[0].tow=gl_vy[0];

-   vertex[1].sow=gl_ux[1];

-   vertex[1].tow=gl_vy[1];

-   vertex[2].sow=gl_ux[2];

-   vertex[2].tow=gl_vy[2];

-#endif

-

-   if(iFilterType>2) 

-    {

-     if(gLastTex!=gTexName || gLastFMode!=1)

-      {

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-       gLastTex=gTexName;gLastFMode=1;

-      }

-    }

-

-   if(iFilterType) 

-    {

-     float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;

-     for(i=0;i<3;i++)

-      {

-       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;

-       if(vertex[i].tow<fymin) fymin=vertex[i].tow;

-       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;

-       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 

-      }

-

-     for(i=0;i<3;i++)

-      {

-       if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;

-       if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;

-       if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;

-       if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;

-      }

-    }

-  }

-}

-

-///////////////////////////////////////////////////////// 

-

-void assignTexture4(void)

-{

- if(bUsingTWin)

-  {

-   vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;

-   vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;

-   vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;

-   vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;

-   vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;

-   vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;

-   vertex[3].sow=(float)gl_ux[3]/TWin.UScaleFactor;

-   vertex[3].tow=(float)gl_vy[3]/TWin.VScaleFactor;

-   gLastTex=gTexName;

-  }

- else

-  {

-#ifdef OWNSCALE

-   vertex[0].sow=(float)gl_ux[0] / ST_FAC;

-   vertex[0].tow=(float)gl_vy[0] / ST_FAC;

-   vertex[1].sow=(float)gl_ux[1] / ST_FAC;

-   vertex[1].tow=(float)gl_vy[1] / ST_FAC;

-   vertex[2].sow=(float)gl_ux[2] / ST_FAC;

-   vertex[2].tow=(float)gl_vy[2] / ST_FAC;

-   vertex[3].sow=(float)gl_ux[3] / ST_FAC;

-   vertex[3].tow=(float)gl_vy[3] / ST_FAC;

-#else

-   vertex[0].sow=gl_ux[0];

-   vertex[0].tow=gl_vy[0];

-   vertex[1].sow=gl_ux[1];

-   vertex[1].tow=gl_vy[1];

-   vertex[2].sow=gl_ux[2];

-   vertex[2].tow=gl_vy[2];

-   vertex[3].sow=gl_ux[3];

-   vertex[3].tow=gl_vy[3];

-#endif

-

-   if(iFilterType>2) 

-    {

-     if(gLastTex!=gTexName || gLastFMode!=1)

-      {

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-       gLastTex=gTexName;gLastFMode=1;

-      }

-    }

-

-   if(iFilterType) 

-    {

-     float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;

-     for(i=0;i<4;i++)

-      {

-       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;

-       if(vertex[i].tow<fymin) fymin=vertex[i].tow;

-       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;

-       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 

-      }

-

-     for(i=0;i<4;i++)

-      {

-       if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;

-       if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;

-       if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;

-       if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;

-      }

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////////////////

-// render pos / buffers

-////////////////////////////////////////////////////////////////////////

-

-#ifndef _WINDOWS

-#define EqualRect(pr1,pr2) ((pr1)->left==(pr2)->left && (pr1)->top==(pr2)->top && (pr1)->right==(pr2)->right && (pr1)->bottom==(pr2)->bottom)

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// SetDisplaySettings: "simply" calcs the new drawing area and updates

-//                     the ogl clipping (scissor) 

-

-BOOL bSetClip=FALSE;

-

-void SetOGLDisplaySettings(BOOL DisplaySet)

-{

- static RECT rprev={0,0,0,0};

- static RECT rC   ={0,0,0,0};

- static int iOldX=0;

- static int iOldY=0;

- RECT r;float XS,YS;

-

- bDisplayNotSet = FALSE;

-

- //----------------------------------------------------// that's a whole screen upload

- if(!DisplaySet)

-  {

-   RECT rX;

-   PSXDisplay.GDrawOffset.x=0;

-   PSXDisplay.GDrawOffset.y=0;

-

-   PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x+PreviousPSXDisplay.Range.x0;

-   PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y+PreviousPSXDisplay.Range.y0;

-

-   rprev.left=rprev.left+1;

-

-   rX=rRatioRect;

-   rX.top=iResY-(rRatioRect.top+rRatioRect.bottom);

-

-   if(bSetClip || !EqualRect(&rC,&rX))

-    {

-     rC=rX;

-     glScissor(rC.left,rC.top,rC.right,rC.bottom);

-     bSetClip=FALSE; 

-    }

-   return;

-  }

- //----------------------------------------------------// 

-

- PSXDisplay.GDrawOffset.y = PreviousPSXDisplay.DisplayPosition.y;

- PSXDisplay.GDrawOffset.x = PreviousPSXDisplay.DisplayPosition.x;

- PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x+PreviousPSXDisplay.Range.x0;

- PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y+PreviousPSXDisplay.Range.y0;

-

- r.top   =PSXDisplay.DrawArea.y0 - PreviousPSXDisplay.DisplayPosition.y;

- r.bottom=PSXDisplay.DrawArea.y1 - PreviousPSXDisplay.DisplayPosition.y;

-

- if(r.bottom<0 || r.top>=PSXDisplay.DisplayMode.y)

-  {

-   r.top   =PSXDisplay.DrawArea.y0 - PSXDisplay.DisplayPosition.y;

-   r.bottom=PSXDisplay.DrawArea.y1 - PSXDisplay.DisplayPosition.y;

-  }

-

- r.left  =PSXDisplay.DrawArea.x0 - PreviousPSXDisplay.DisplayPosition.x;

- r.right =PSXDisplay.DrawArea.x1 - PreviousPSXDisplay.DisplayPosition.x;

-

- if(r.right<0 || r.left>=PSXDisplay.DisplayMode.x)

-  {

-   r.left  =PSXDisplay.DrawArea.x0 - PSXDisplay.DisplayPosition.x;

-   r.right =PSXDisplay.DrawArea.x1 - PSXDisplay.DisplayPosition.x;

-  }

-

- if(!bSetClip && EqualRect(&r,&rprev) &&

-    iOldX == PSXDisplay.DisplayMode.x &&

-    iOldY == PSXDisplay.DisplayMode.y)

-  return;

-

- rprev = r;

- iOldX = PSXDisplay.DisplayMode.x;

- iOldY = PSXDisplay.DisplayMode.y;

-

- XS=(float)rRatioRect.right/(float)PSXDisplay.DisplayMode.x;

- YS=(float)rRatioRect.bottom/(float)PSXDisplay.DisplayMode.y;

-

- if(PreviousPSXDisplay.Range.x0)

-  {

-   short s=PreviousPSXDisplay.Range.x0+PreviousPSXDisplay.Range.x1;

-

-   r.left+=PreviousPSXDisplay.Range.x0+1;

-

-   r.right+=PreviousPSXDisplay.Range.x0;

-

-   if(r.left>s)  r.left=s;

-   if(r.right>s) r.right=s;

-  }

-

- if(PreviousPSXDisplay.Range.y0)

-  {

-   short s=PreviousPSXDisplay.Range.y0+PreviousPSXDisplay.Range.y1;

-

-   r.top+=PreviousPSXDisplay.Range.y0+1;

-   r.bottom+=PreviousPSXDisplay.Range.y0;

-

-   if(r.top>s)    r.top=s;

-   if(r.bottom>s) r.bottom=s;

-  }

-

- // Set the ClipArea variables to reflect the new screen,

- // offset from zero (since it is a new display buffer)

- r.left   = (int)(((float)(r.left))      *XS);

- r.top    = (int)(((float)(r.top))       *YS);

- r.right  = (int)(((float)(r.right  + 1))*XS);

- r.bottom = (int)(((float)(r.bottom + 1))*YS);

-

- // Limit clip area to the screen size

- if (r.left   > iResX)   r.left   = iResX;

- if (r.left   < 0)       r.left   = 0;

- if (r.top    > iResY)   r.top    = iResY;

- if (r.top    < 0)       r.top    = 0;

- if (r.right  > iResX)   r.right  = iResX;

- if (r.right  < 0)       r.right  = 0;

- if (r.bottom > iResY)   r.bottom = iResY;

- if (r.bottom < 0)       r.bottom = 0;

-

- r.right -=r.left;

- r.bottom-=r.top;

- r.top=iResY-(r.top+r.bottom);

-

- r.left+=rRatioRect.left;

- r.top -=rRatioRect.top;

-

- if(bSetClip || !EqualRect(&r,&rC))

-  {

-   glScissor(r.left,r.top,r.right,r.bottom);

-   rC=r;

-   bSetClip=FALSE;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-

+/***************************************************************************
+                           draw.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_DRAW
+
+#include "externals.h"
+#include "gpu.h"
+#include "draw.h"
+#include "prim.h"
+#include "texture.h"
+#include "menu.h"
+
+#if defined(_MACGL)
+// if you use it, you must include it
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#endif
+////////////////////////////////////////////////////////////////////////////////////
+// defines
+
+#define SIGNBIT 0x800
+#define S_MASK  0xf000
+#define L_MASK  0xfffff000
+
+// ownscale: some ogl drivers have buggy texture matrix funcs, so it
+//           is safer to calc sow/tow ourselves
+
+#ifdef OWNSCALE
+
+#define ST_FACSPRITE       255.99f
+#define ST_BFFACSPRITE     0.5f/256.0f
+#define ST_BFFACSPRITESORT 0.333f/256.0f
+
+#define ST_OFFSET          0.5f/256.0f;
+
+#define ST_FAC             255.99f
+#define ST_BFFAC           0.5f/256.0f
+#define ST_BFFACSORT       0.333f/256.0f
+
+#define ST_FACTRI          255.99f
+#define ST_BFFACTRI        0.5f/256.0f
+#define ST_BFFACTRISORT    0.333f/256.0f
+
+#define ST_FACVRAMX        255.0f
+#define ST_FACVRAM         256.0f
+
+///////////////////////////////////////////////////////////////
+
+#else
+
+#define ST_BFFACSPRITE     0.5f
+#define ST_BFFACSPRITESORT 0.333f
+
+#define ST_BFFAC           0.5f
+#define ST_BFFACSORT       0.333f
+
+#define ST_BFFACTRI        0.5f
+#define ST_BFFACTRISORT    0.333f
+
+#define ST_OFFSET          0.5f;
+                
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////
+// draw globals; most will be initialized again later (by config or checks) 
+
+#ifdef _WINDOWS
+HDC            dcGlobal = NULL;
+HWND           hWWindow;
+#endif
+
+BOOL           bIsFirstFrame = TRUE;
+
+// resolution/ratio vars
+
+int            iResX;
+int            iResY;
+BOOL           bKeepRatio = FALSE;
+RECT           rRatioRect;
+
+// psx mask related vars
+
+BOOL           bCheckMask = FALSE;
+int            iUseMask = 0;
+int            iSetMask = 0;
+unsigned short sSetMask = 0;
+uint32_t       lSetMask = 0;
+
+// drawing/coord vars
+
+OGLVertex      vertex[4];
+GLubyte        gl_ux[8];
+GLubyte        gl_vy[8];
+short          sprtY,sprtX,sprtH,sprtW;
+
+// drawing options
+
+BOOL           bOpaquePass;
+BOOL           bAdvancedBlend;
+BOOL           bUseLines;
+BOOL           bUseAntiAlias;
+int            iTexQuality;
+int            iUsePalTextures=1;
+BOOL           bSnapShot=FALSE;
+BOOL           bSmallAlpha=FALSE;
+int            iShowFPS=0;
+
+// OGL extension support
+
+int                iForceVSync=-1;
+int                iUseExts=0;
+BOOL               bGLExt;
+BOOL               bGLFastMovie=FALSE;
+BOOL               bGLSoft;
+BOOL               bGLBlend;
+#if defined (_MACGL) // always supported on OSX > 10.4.3
+#define glBlendEquationEXTEx glBlendEquationEXT
+#define glColorTableEXTEx glColorTableEXT
+#else
+PFNGLBLENDEQU      glBlendEquationEXTEx=NULL;
+PFNGLCOLORTABLEEXT glColorTableEXTEx=NULL;
+#endif
+// gfx card buffer infos
+
+int            iDepthFunc=0;
+int            iZBufferDepth=0;
+GLbitfield     uiBufferBits=GL_COLOR_BUFFER_BIT;
+
+////////////////////////////////////////////////////////////////////////
+// Set OGL pixel format
+////////////////////////////////////////////////////////////////////////
+ 
+#ifdef _WINDOWS
+BOOL bSetupPixelFormat(HDC hDC)
+{
+ int pixelformat;
+ static PIXELFORMATDESCRIPTOR pfd = 
+  {
+   sizeof(PIXELFORMATDESCRIPTOR),    // size of this pfd
+    1,                               // version number
+    PFD_DRAW_TO_WINDOW |             // support window
+      PFD_SUPPORT_OPENGL |           // support OpenGL
+      PFD_DOUBLEBUFFER,              // double buffered
+    PFD_TYPE_RGBA,                   // RGBA type
+    16,                              // 16-bit color depth  (adjusted later)
+    0, 0, 0, 0, 0, 0,                // color bits ignored
+    0,                               // no alpha buffer
+    0,                               // shift bit ignored
+    0,                               // no accumulation buffer
+    0, 0, 0, 0,                      // accum bits ignored
+    0,                               // z-buffer    
+    0,
+    0,                               // no auxiliary buffer
+    PFD_MAIN_PLANE,                  // main layer
+    0,                               // reserved
+    0, 0, 0                          // layer masks ignored
+  };
+ 
+ pfd.cColorBits=iColDepth;                             // set user color depth
+ pfd.cDepthBits=iZBufferDepth;                         // set user zbuffer (by psx mask)
+
+ if((pixelformat=ChoosePixelFormat(hDC,&pfd))==0)     
+  {
+   MessageBox(NULL,"ChoosePixelFormat failed","Error",MB_OK);
+   return FALSE;
+  }
+
+ if(SetPixelFormat(hDC,pixelformat, &pfd)==FALSE)
+  {
+   MessageBox(NULL,"SetPixelFormat failed","Error",MB_OK);
+   return FALSE;
+  }
+
+ return TRUE;
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// Get extension infos (f.e. pal textures / packed pixels)
+////////////////////////////////////////////////////////////////////////
+
+static void GetExtInfos(void)                              
+{
+ BOOL bPacked=FALSE;                                   // default: no packed pixel support
+
+ bGLExt=FALSE;                                         // default: no extensions
+ bGLFastMovie=FALSE;
+
+ if(strstr((char *)glGetString(GL_EXTENSIONS),         // packed pixels available?
+    "GL_EXT_packed_pixels"))                          
+  bPacked=TRUE;                                        // -> ok
+
+ if(bPacked && bUse15bitMdec)                          // packed available and 15bit mdec wanted?
+  bGLFastMovie=TRUE;                                   // -> ok
+
+ if(bPacked && (iTexQuality==1 || iTexQuality==2))     // packed available and 16 bit texture format?
+  {
+   bGLFastMovie=TRUE;                                  // -> ok
+   bGLExt=TRUE;
+  }
+
+ if(iUseExts &&                                        // extension support wanted?
+    (strstr((char *)glGetString(GL_EXTENSIONS),
+     "GL_EXT_texture_edge_clamp") ||
+     strstr((char *)glGetString(GL_EXTENSIONS),        // -> check clamp support, if yes: use it
+     "GL_SGIS_texture_edge_clamp")))
+      iClampType=GL_TO_EDGE_CLAMP;
+ else iClampType=GL_CLAMP;
+
+#if !defined (_MACGL) // OSX > 10.4.3 defines this
+ glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL;           // init ogl palette func pointer
+#endif
+
+#ifndef __sun
+ if(iGPUHeight!=1024 &&                                // no pal textures in ZN mode (height=1024)! 
+    strstr((char *)glGetString(GL_EXTENSIONS),         // otherwise: check ogl support
+    "GL_EXT_paletted_texture"))
+  {
+   iUsePalTextures=1;                                  // -> wow, supported, get func pointer
+
+#ifdef _WINDOWS
+   glColorTableEXTEx=(PFNGLCOLORTABLEEXT)wglGetProcAddress("glColorTableEXT");
+#elif defined (_MACGL)
+    // no prob, done already in OSX > 10.4.3
+#else
+   glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress((GLubyte *)"glColorTableEXT");
+#endif
+
+   if(glColorTableEXTEx==NULL) iUsePalTextures=0;      // -> ha, cheater... no func, no support
+
+  }
+ else iUsePalTextures=0;
+#else
+ iUsePalTextures=0;
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// Setup some stuff depending on user settings or in-game toggle
+////////////////////////////////////////////////////////////////////////
+
+void SetExtGLFuncs(void)
+{
+ //----------------------------------------------------//
+
+ SetFixes();                                           // update fix infos
+
+ //----------------------------------------------------//
+
+#ifdef _WINDOWS
+ if((iForceVSync>=0) &&                                // force vsync?
+    strstr((char *)glGetString(GL_EXTENSIONS),         // and extension available?
+    "WGL_EXT_swap_control"))
+  {
+   PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT= 
+    (PFNWGLSWAPINTERVALFARPROC)wglGetProcAddress("wglSwapIntervalEXT");
+
+   if(wglSwapIntervalEXT) wglSwapIntervalEXT(iForceVSync);
+  }
+#endif
+#ifdef _MACGL
+    SetVSync(iForceVSync);
+#endif
+ if(iUseExts && !(dwActFixes&1024) &&                  // extensions wanted? and not turned off by game fix?
+    strstr((char *)glGetString(GL_EXTENSIONS),         // and blend_subtract available?
+    "GL_EXT_blend_subtract"))
+     {                                                 // -> get ogl blend function pointer
+#ifdef _WINDOWS
+      glBlendEquationEXTEx=(PFNGLBLENDEQU)wglGetProcAddress("glBlendEquationEXT");
+#elif defined(_MACGL)
+    // no prob, OSX > 10.4.3 has this
+#else
+      glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress((GLubyte *)"glBlendEquationEXT");
+#endif
+     }
+ else                                                  // no subtract blending?
+  {
+   if(glBlendEquationEXTEx)                            // -> change to additive blending (if subract was active)
+    glBlendEquationEXTEx(FUNC_ADD_EXT);
+#if !defined(_MACGL) // BTW, why set to null? strange...
+   glBlendEquationEXTEx=(PFNGLBLENDEQU)NULL;           // -> no more blend function pointer
+#endif
+  }
+
+ //----------------------------------------------------//
+
+ if(iUseExts && bAdvancedBlend &&                      // advanced blending wanted ?
+    strstr((char *)glGetString(GL_EXTENSIONS),         // and extension avail?
+           "GL_EXT_texture_env_combine"))
+  {
+   bUseMultiPass=FALSE;bGLBlend=TRUE;                  // -> no need for 2 passes, perfect
+
+   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    
+   glTexEnvf(GL_TEXTURE_ENV, COMBINE_RGB_EXT, GL_MODULATE);     
+   glTexEnvf(GL_TEXTURE_ENV, COMBINE_ALPHA_EXT, GL_MODULATE);     
+   glTexEnvf(GL_TEXTURE_ENV, RGB_SCALE_EXT, 2.0f);    
+  }
+ else                                                  // no advanced blending wanted/available:
+  {
+   if(bAdvancedBlend) bUseMultiPass=TRUE;              // -> pseudo-advanced with 2 passes
+   else               bUseMultiPass=FALSE;             // -> or simple 'bright color' mode
+   bGLBlend=FALSE;                                     // -> no ext blending!
+
+   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    
+  }
+
+ //----------------------------------------------------//
+ // init standard tex quality 0-2, and big alpha mode 3
+
+ if(!(dwActFixes&0x4000) && iFilterType && iTexQuality>=3) 
+      bSmallAlpha=TRUE;                  
+ else bSmallAlpha=FALSE;
+
+ if(bOpaquePass)                                        // opaque mode?
+  {
+   if(dwActFixes&32) 
+    {
+     TCF[0]=CP8RGBA_0;
+     PalTexturedColourFn=CP8RGBA;                      // -> init col func
+    }
+   else
+    {
+     TCF[0]=XP8RGBA_0;
+     PalTexturedColourFn=XP8RGBA;                      // -> init col func
+    }
+
+   TCF[1]=XP8RGBA_1;
+   glAlphaFunc(GL_GREATER,0.49f);
+  }
+ else                                                  // no opaque mode?
+  {
+   TCF[0]=TCF[1]=P8RGBA;
+   PalTexturedColourFn=P8RGBA;                         // -> init col func
+   glAlphaFunc(GL_NOTEQUAL,0);                         // --> set alpha func
+  }
+
+ //----------------------------------------------------//
+
+ LoadSubTexFn=LoadSubTexturePageSort;                  // init load tex ptr
+
+ giWantedFMT=GL_RGBA;                                  // init ogl tex format
+
+ switch(iTexQuality)                                   // -> quality:
+  {
+   //--------------------------------------------------// 
+   case 0:                                             // -> don't care
+    giWantedRGBA=4;
+    giWantedTYPE=GL_UNSIGNED_BYTE;
+    break;
+   //--------------------------------------------------// 
+   case 1:                                             // -> R4G4B4A4
+    if(bGLExt)
+     {
+      giWantedRGBA=GL_RGBA4;
+      giWantedTYPE=GL_UNSIGNED_SHORT_4_4_4_4_EXT;
+      LoadSubTexFn=LoadPackedSubTexturePageSort;
+      if(bOpaquePass) 
+       {
+        if(dwActFixes&32) PTCF[0]=CP4RGBA_0;
+        else              PTCF[0]=XP4RGBA_0;
+        PTCF[1]=XP4RGBA_1;
+       }
+      else      
+       {
+        PTCF[0]=PTCF[1]=P4RGBA;
+       }
+     }
+    else
+     {
+      giWantedRGBA=GL_RGBA4;
+      giWantedTYPE=GL_UNSIGNED_BYTE;
+     }
+    break;
+   //--------------------------------------------------// 
+   case 2:                                             // -> R5B5G5A1
+    if(bGLExt)
+     {
+      giWantedRGBA=GL_RGB5_A1;
+      giWantedTYPE=GL_UNSIGNED_SHORT_5_5_5_1_EXT;
+      LoadSubTexFn=LoadPackedSubTexturePageSort;
+      if(bOpaquePass) 
+       {
+        if(dwActFixes&32) PTCF[0]=CP5RGBA_0;
+        else              PTCF[0]=XP5RGBA_0;
+        PTCF[1]=XP5RGBA_1;
+       }
+      else   
+       {
+        PTCF[0]=PTCF[1]=P5RGBA;
+       }
+     }
+    else
+     {
+      giWantedRGBA=GL_RGB5_A1;giWantedTYPE=GL_UNSIGNED_BYTE;
+     }
+    break;
+   //--------------------------------------------------// 
+   case 3:                                             // -> R8G8B8A8
+    giWantedRGBA=GL_RGBA8;
+    giWantedTYPE=GL_UNSIGNED_BYTE;
+
+    if(bSmallAlpha)
+     {
+      if(bOpaquePass)                                  // opaque mode?
+       {
+        if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+        else              {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+        TCF[1]=XP8RGBAEx_1;
+       }
+     }
+
+    break;
+   //--------------------------------------------------// 
+   case 4:                                             // -> R8G8B8A8
+    giWantedRGBA = GL_RGBA8;
+    giWantedTYPE = GL_UNSIGNED_BYTE;
+
+    if(strstr((char *)glGetString(GL_EXTENSIONS),      // and extension avail?
+              "GL_EXT_bgra"))
+     {
+      giWantedFMT  = GL_BGRA_EXT;
+
+      if(bOpaquePass)                                  // opaque mode?
+       {
+        if(bSmallAlpha)
+         {
+          if(dwActFixes&32) {TCF[0]=CP8BGRAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+          else              {TCF[0]=XP8BGRAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+          TCF[1]=XP8BGRAEx_1;
+         }
+        else
+         {
+          if(dwActFixes&32) {TCF[0]=CP8BGRA_0;PalTexturedColourFn=CP8RGBA;}
+          else              {TCF[0]=XP8BGRA_0;PalTexturedColourFn=XP8RGBA;}
+          TCF[1]=XP8BGRA_1;
+         }
+       }
+      else                                             // no opaque mode?
+       {
+        TCF[0]=TCF[1]=P8BGRA;                          // -> init col func
+       }
+     }
+    else
+     {
+      iTexQuality=3;
+      if(bSmallAlpha)
+       {
+        if(bOpaquePass)                                 // opaque mode?
+         {
+          if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+          else              {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+          TCF[1]=XP8RGBAEx_1;
+         }
+       }
+     }
+
+    break;
+   //--------------------------------------------------// 
+  }
+
+ bBlendEnable=FALSE;                                   // init blending: off
+ glDisable(GL_BLEND);
+
+ SetScanTrans();                                       // init scan lines (if wanted)
+}
+
+////////////////////////////////////////////////////////////////////////
+// setup scan lines
+////////////////////////////////////////////////////////////////////////
+
+#define R_TSP 0x00,0x45,0x00,0xff
+#define G_TSP 0x00,0x00,0x45,0xff
+#define B_TSP 0x45,0x00,0x00,0xff
+#define O_TSP 0x45,0x45,0x45,0xff
+#define N_TSP 0x00,0x00,0x00,0xff
+
+GLuint  gTexScanName=0;
+
+GLubyte texscan[4][16]= 
+{
+{R_TSP, G_TSP, B_TSP, N_TSP},
+{O_TSP, N_TSP, O_TSP, N_TSP},
+{B_TSP, N_TSP, R_TSP, G_TSP},
+{O_TSP, N_TSP, O_TSP, N_TSP}
+};
+
+static void CreateScanLines(void)
+{
+ if(iUseScanLines)
+  {
+   int y;
+   if(iScanBlend<0)                                    // special scan mask mode
+    {
+     glGenTextures(1, &gTexScanName);
+     glBindTexture(GL_TEXTURE_2D, gTexScanName);
+
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     glTexImage2D(GL_TEXTURE_2D, 0, 4, 4, 4, 0,GL_RGBA, GL_UNSIGNED_BYTE, texscan);
+    }
+   else                                                // otherwise simple lines in a display list
+    {
+     uiScanLine=glGenLists(1);
+     glNewList(uiScanLine,GL_COMPILE);
+     #ifdef _MACGL
+     	// not mac specific, just commenting out to be friendly
+     	// use it if you like
+     	// this draws anti-aliased lines with user-chosen color
+         glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
+             glEnable(GL_BLEND | GL_LINE_SMOOTH);
+             glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+             glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);
+             glBegin(GL_LINES);
+                 for(y=0;y<iResY;y+=2)
+                  {
+                    glVertex2f(0,y);
+                    glVertex2f(iResX,y);
+                  }
+             glEnd();
+         glPopAttrib();
+	 #else
+	      for(y=0;y<iResY;y+=2)
+      {
+       glBegin(GL_QUADS);
+         glVertex2f(0,y);
+         glVertex2f(iResX,y);
+         glVertex2f(iResX,y+1);
+         glVertex2f(0,y+1);
+       glEnd();
+      }
+     
+    #endif
+    glEndList();
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Initialize OGL
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS    
+HGLRC GLCONTEXT=NULL;
+#endif
+
+int GLinitialize() 
+{
+#ifdef _WINDOWS
+ HGLRC objectRC;
+ // init
+ dcGlobal = GetDC(hWWindow);                           // FIRST: dc/rc stuff
+ objectRC = wglCreateContext(dcGlobal); 
+ GLCONTEXT=objectRC;
+ wglMakeCurrent(dcGlobal, objectRC);
+ // CheckWGLExtensions(dcGlobal);
+ if(bWindowMode) ReleaseDC(hWWindow,dcGlobal);         // win mode: release dc again
+#endif
+#if defined (_MACGL)
+    BringContextForward();
+#endif
+ glViewport(rRatioRect.left,                           // init viewport by ratio rect
+            iResY-(rRatioRect.top+rRatioRect.bottom),
+            rRatioRect.right, 
+            rRatioRect.bottom);         
+                                                      
+ glScissor(0, 0, iResX, iResY);                        // init clipping (fullscreen)
+ glEnable(GL_SCISSOR_TEST);                       
+
+#ifndef OWNSCALE
+ glMatrixMode(GL_TEXTURE);                             // init psx tex sow and tow if not "ownscale"
+ glLoadIdentity();
+ glScalef(1.0f/255.99f,1.0f/255.99f,1.0f);             // geforce precision hack
+#endif 
+
+ glMatrixMode(GL_PROJECTION);                          // init projection with psx resolution
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+         PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ if(iZBufferDepth)                                     // zbuffer?
+  {
+   uiBufferBits=GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT;
+   glEnable(GL_DEPTH_TEST);    
+   glDepthFunc(GL_ALWAYS);
+   iDepthFunc=1;
+  }
+ else                                                  // no zbuffer?
+  {
+   uiBufferBits=GL_COLOR_BUFFER_BIT;
+   glDisable(GL_DEPTH_TEST);
+  }
+
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f);                 // first buffer clear
+ glClear(uiBufferBits);
+
+ if(bUseLines)                                         // funny lines 
+  {
+   glPolygonMode(GL_FRONT, GL_LINE); 
+   glPolygonMode(GL_BACK, GL_LINE); 
+  }
+ else                                                  // or the real filled thing
+  {
+   glPolygonMode(GL_FRONT, GL_FILL);
+   glPolygonMode(GL_BACK, GL_FILL);
+  }
+
+ MakeDisplayLists();                                   // lists for menu/opaque
+ GetExtInfos();                                        // get ext infos
+ SetExtGLFuncs();                                      // init all kind of stuff (tex function pointers)
+ 
+ glEnable(GL_ALPHA_TEST);                              // wanna alpha test
+
+ if(!bUseAntiAlias)                                    // no anti-alias (default)
+  {
+   glDisable(GL_LINE_SMOOTH);
+   glDisable(GL_POLYGON_SMOOTH);
+   glDisable(GL_POINT_SMOOTH);
+  }
+ else                                                  // wanna try it? glitches galore...
+  {                    
+   glHint(GL_PERSPECTIVE_CORRECTION_HINT,GL_NICEST);
+   glEnable(GL_LINE_SMOOTH);
+   glEnable(GL_POLYGON_SMOOTH);
+   glEnable(GL_POINT_SMOOTH);
+   glHint(GL_LINE_SMOOTH_HINT,GL_NICEST);
+   glHint(GL_POINT_SMOOTH_HINT,GL_NICEST);
+   glHint(GL_POLYGON_SMOOTH_HINT,GL_NICEST);
+  }
+
+ ubGloAlpha=127;                                       // init some drawing vars
+ ubGloColAlpha=127;
+ TWin.UScaleFactor = 1;
+ TWin.VScaleFactor = 1;
+ bDrawMultiPass=FALSE;
+ bTexEnabled=FALSE;
+ bUsingTWin=FALSE;
+      
+ if(bDrawDither)  glEnable(GL_DITHER);                 // dither mode
+ else             glDisable(GL_DITHER); 
+
+ glDisable(GL_FOG);                                    // turn all (currently) unused modes off
+ glDisable(GL_LIGHTING);  
+ glDisable(GL_LOGIC_OP);
+ glDisable(GL_STENCIL_TEST);  
+ glDisable(GL_TEXTURE_1D);
+ glDisable(GL_TEXTURE_2D);
+ glDisable(GL_CULL_FACE);
+
+ glPixelTransferi(GL_RED_SCALE, 1);                    // to be sure:
+ glPixelTransferi(GL_RED_BIAS, 0);                     // init more OGL vals
+ glPixelTransferi(GL_GREEN_SCALE, 1);
+ glPixelTransferi(GL_GREEN_BIAS, 0);
+ glPixelTransferi(GL_BLUE_SCALE, 1);
+ glPixelTransferi(GL_BLUE_BIAS, 0);
+ glPixelTransferi(GL_ALPHA_SCALE, 1);
+ glPixelTransferi(GL_ALPHA_BIAS, 0);                                                  
+
+#ifdef _WINDOWS
+                                                       // detect Windows hw/sw mode (just for info)
+ if(!strcmp("Microsoft Corporation",(LPTSTR)glGetString(GL_VENDOR)) &&
+    !strcmp("GDI Generic",          (LPTSTR)glGetString(GL_RENDERER)))
+      bGLSoft=TRUE;
+ else bGLSoft=FALSE;
+#endif
+
+ glFlush();                                            // we are done...
+ glFinish();                           
+
+ CreateScanLines();                                    // setup scanline stuff (if wanted)
+
+ CheckTextureMemory();                                 // check available tex memory
+
+ if(bKeepRatio) SetAspectRatio();                      // set ratio
+
+ if(iShowFPS)                                          // user wants FPS display on startup?
+  {
+   ulKeybits|=KEY_SHOWFPS;                             // -> ok, turn display on
+   szDispBuf[0]=0;
+   BuildDispMenu(0);
+  }
+ 
+ bIsFirstFrame = FALSE;                                // we have survived the first frame :)
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// clean up OGL stuff
+////////////////////////////////////////////////////////////////////////
+
+void GLcleanup() 
+{                                                     
+ KillDisplayLists();                                   // bye display lists
+
+ if(iUseScanLines)                                     // scanlines used?
+  {
+   if(iScanBlend<0)
+    {
+     if(gTexScanName!=0)                               // some scanline tex?
+      glDeleteTextures(1, &gTexScanName);              // -> delete it
+     gTexScanName=0;
+    }
+   else glDeleteLists(uiScanLine,1);                   // otherwise del scanline display list
+  }
+
+ CleanupTextureStore();                                // bye textures
+
+#ifdef _WINDOWS 
+ wglMakeCurrent(NULL, NULL);                           // bye context
+ if(GLCONTEXT) wglDeleteContext(GLCONTEXT);
+ if(!bWindowMode && dcGlobal) 
+  ReleaseDC(hWWindow,dcGlobal);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// Offset stuff
+////////////////////////////////////////////////////////////////////////
+
+// please note: it is hardly do-able in a hw/accel plugin to get the 
+//              real psx polygon coord mapping right... the following
+//              works not to bad with many games, though
+
+static __inline BOOL CheckCoord4()
+{
+ if(lx0<0)
+  {
+   if(((lx1-lx0)>CHKMAX_X) ||
+      ((lx2-lx0)>CHKMAX_X)) 
+    {
+     if(lx3<0)
+      {
+       if((lx1-lx3)>CHKMAX_X) return TRUE;
+       if((lx2-lx3)>CHKMAX_X) return TRUE;
+      }
+    }
+  }
+ if(lx1<0)
+  {
+   if((lx0-lx1)>CHKMAX_X) return TRUE;
+   if((lx2-lx1)>CHKMAX_X) return TRUE;
+   if((lx3-lx1)>CHKMAX_X) return TRUE;
+  }
+ if(lx2<0)
+  {
+   if((lx0-lx2)>CHKMAX_X) return TRUE;
+   if((lx1-lx2)>CHKMAX_X) return TRUE;
+   if((lx3-lx2)>CHKMAX_X) return TRUE;
+  }
+ if(lx3<0)
+  {
+   if(((lx1-lx3)>CHKMAX_X) ||
+      ((lx2-lx3)>CHKMAX_X))
+    {
+     if(lx0<0)
+      {
+       if((lx1-lx0)>CHKMAX_X) return TRUE;
+       if((lx2-lx0)>CHKMAX_X) return TRUE;
+      }
+    }
+  }
+ 
+
+ if(ly0<0)
+  {
+   if((ly1-ly0)>CHKMAX_Y) return TRUE;
+   if((ly2-ly0)>CHKMAX_Y) return TRUE;
+  }
+ if(ly1<0)
+  {
+   if((ly0-ly1)>CHKMAX_Y) return TRUE;
+   if((ly2-ly1)>CHKMAX_Y) return TRUE;
+   if((ly3-ly1)>CHKMAX_Y) return TRUE;
+  }
+ if(ly2<0)
+  {
+   if((ly0-ly2)>CHKMAX_Y) return TRUE;
+   if((ly1-ly2)>CHKMAX_Y) return TRUE;
+   if((ly3-ly2)>CHKMAX_Y) return TRUE;
+  }
+ if(ly3<0)
+  {
+   if((ly1-ly3)>CHKMAX_Y) return TRUE;
+   if((ly2-ly3)>CHKMAX_Y) return TRUE;
+  }
+
+ return FALSE;
+}
+
+static __inline BOOL CheckCoord3()
+{
+ if(lx0<0)
+  {
+   if((lx1-lx0)>CHKMAX_X) return TRUE;
+   if((lx2-lx0)>CHKMAX_X) return TRUE;
+  }
+ if(lx1<0)
+  {
+   if((lx0-lx1)>CHKMAX_X) return TRUE;
+   if((lx2-lx1)>CHKMAX_X) return TRUE;
+  }
+ if(lx2<0)
+  {
+   if((lx0-lx2)>CHKMAX_X) return TRUE;
+   if((lx1-lx2)>CHKMAX_X) return TRUE;
+  }
+ if(ly0<0)
+  {
+   if((ly1-ly0)>CHKMAX_Y) return TRUE;
+   if((ly2-ly0)>CHKMAX_Y) return TRUE;
+  }
+ if(ly1<0)
+  {
+   if((ly0-ly1)>CHKMAX_Y) return TRUE;
+   if((ly2-ly1)>CHKMAX_Y) return TRUE;
+  }
+ if(ly2<0)
+  {
+   if((ly0-ly2)>CHKMAX_Y) return TRUE;
+   if((ly1-ly2)>CHKMAX_Y) return TRUE;
+  }
+
+ return FALSE;
+}
+
+
+static __inline BOOL CheckCoord2()
+{
+ if(lx0<0)
+  {
+   if((lx1-lx0)>CHKMAX_X) return TRUE;
+  }
+ if(lx1<0)
+  {
+   if((lx0-lx1)>CHKMAX_X) return TRUE;
+  }
+ if(ly0<0)
+  {
+   if((ly1-ly0)>CHKMAX_Y) return TRUE;
+  }
+ if(ly1<0)
+  {
+   if((ly0-ly1)>CHKMAX_Y) return TRUE;
+  }
+
+ return FALSE;
+}
+
+/*
+//Lewpys "offsetline" func:
+
+void offsetline(void)
+{
+	float x0, x1, y0, y1, oolength, xl, yl;
+
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   if((lx0 & SIGNBIT)) lx0|=S_MASK;
+   else                lx0&=~S_MASK;
+   if((lx1 & SIGNBIT)) lx1|=S_MASK;
+   else                lx1&=~S_MASK;
+   if((ly0 & SIGNBIT)) ly0|=S_MASK;
+   else                ly0&=~S_MASK;
+   if((ly1 & SIGNBIT)) ly1|=S_MASK;
+   else                ly1&=~S_MASK;
+  }
+
+ x0 = (float)(lx0 + PSXDisplay.CumulOffset.x);
+ x1 = (float)(lx1 + PSXDisplay.CumulOffset.x);
+ y0 = (float)(ly0 + PSXDisplay.CumulOffset.y);
+ y1 = (float)(ly1 + PSXDisplay.CumulOffset.y);
+
+ oolength = (float)1/((float)sqrt((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2);
+//	oolength = (float)1/((float)sqrt(((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2));
+
+	xl = (x1 - x0) * oolength;
+	yl = (y1 - y0) * oolength;
+
+	x0 += 0.5f;
+	x1 += 0.5f;
+
+	x0 -= xl - yl;
+	x1 += xl + yl;
+	y0 -= yl + xl;
+	y1 += yl - xl;
+
+	vertex[0].x=x0;
+	vertex[1].x=x1;
+	vertex[0].y=y0;
+	vertex[1].y=y1;
+
+	x0 -= yl * 2;
+	x1 -= yl * 2;
+	y0 += xl * 2;
+	y1 += xl * 2;
+
+	vertex[2].x=x1;
+	vertex[3].x=x0;
+	vertex[2].y=y1;
+	vertex[3].y=y0;
+}
+*/
+
+
+// Pete's way: a very easy (and hopefully fast) approach for lines
+// without sqrt... using a small float -> short cast trick :)
+
+#define VERTEX_OFFX 0.2f
+#define VERTEX_OFFY 0.2f
+
+BOOL offsetline(void)           
+{
+ short x0,x1,y0,y1,dx,dy;float px,py;
+
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+
+   if(CheckCoord2()) return TRUE;
+  }
+
+ x0 = (lx0 + PSXDisplay.CumulOffset.x)+1;
+ x1 = (lx1 + PSXDisplay.CumulOffset.x)+1;
+ y0 = (ly0 + PSXDisplay.CumulOffset.y)+1;
+ y1 = (ly1 + PSXDisplay.CumulOffset.y)+1;
+ 
+ dx=x1-x0;
+ dy=y1-y0;
+ 
+ if(dx>=0)
+  {
+   if(dy>=0)
+    {
+     px=0.5f;
+          if(dx>dy) py=-0.5f;
+     else if(dx<dy) py= 0.5f;
+     else           py= 0.0f;
+    }
+   else
+    {
+     py=-0.5f;
+     dy=-dy;
+          if(dx>dy) px= 0.5f;
+     else if(dx<dy) px=-0.5f;
+     else           px= 0.0f;
+    }
+  }
+ else
+  {
+   if(dy>=0)
+    {
+     py=0.5f;
+     dx=-dx;
+          if(dx>dy) px=-0.5f;
+     else if(dx<dy) px= 0.5f;
+     else           px= 0.0f;
+    }
+   else
+    {
+     px=-0.5f;
+          if(dx>dy) py=-0.5f;
+     else if(dx<dy) py= 0.5f;
+     else           py= 0.0f;
+    }
+  } 
+ 
+ vertex[0].x=(short)((float)x0-px);
+ vertex[3].x=(short)((float)x0+py);
+ 
+ vertex[0].y=(short)((float)y0-py);
+ vertex[3].y=(short)((float)y0-px);
+ 
+ vertex[1].x=(short)((float)x1-py);
+ vertex[2].x=(short)((float)x1+px);
+
+ vertex[1].y=(short)((float)y1+px);
+ vertex[2].y=(short)((float)y1+py);
+
+ if(vertex[0].x==vertex[3].x &&                        // ortho rect? done
+    vertex[1].x==vertex[2].x &&
+    vertex[0].y==vertex[1].y &&
+    vertex[2].y==vertex[3].y) return FALSE;
+ if(vertex[0].x==vertex[1].x &&
+    vertex[2].x==vertex[3].x &&
+    vertex[0].y==vertex[3].y &&
+    vertex[1].y==vertex[2].y) return FALSE;
+
+ vertex[0].x-=VERTEX_OFFX;                             // otherwise a small offset
+ vertex[0].y-=VERTEX_OFFY;                             // to get better accuracy
+ vertex[1].x-=VERTEX_OFFX;
+ vertex[1].y-=VERTEX_OFFY;
+ vertex[2].x-=VERTEX_OFFX;
+ vertex[2].y-=VERTEX_OFFY;
+ vertex[3].x-=VERTEX_OFFX;
+ vertex[3].y-=VERTEX_OFFY;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset2(void)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+
+   if(CheckCoord2()) return TRUE;
+  }
+
+ vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
+ vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
+ vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
+ vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset3(void)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+   lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
+   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+   ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
+
+   if(CheckCoord3()) return TRUE;
+  }
+
+ vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
+ vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
+ vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
+ vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
+ vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
+ vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset4(void)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+   lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+   lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
+   lx3=(short)(((int)lx3<<SIGNSHIFT)>>SIGNSHIFT);
+   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+   ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+   ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
+   ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);
+
+   if(CheckCoord4()) return TRUE;
+  }
+
+ vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
+ vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
+ vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
+ vertex[3].x=lx3+PSXDisplay.CumulOffset.x;
+ vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
+ vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
+ vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
+ vertex[3].y=ly3+PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+void offsetST(void)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+  {
+   lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+   ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+
+   if(lx0<-512 && PSXDisplay.DrawOffset.x<=-512)
+    lx0+=2048;
+
+   if(ly0<-512 && PSXDisplay.DrawOffset.y<=-512)
+    ly0+=2048;
+  }
+
+ ly1 = ly0;
+ ly2 = ly3 = ly0+sprtH;
+ lx3 = lx0;
+ lx1 = lx2 = lx0+sprtW;
+
+ vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
+ vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
+ vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
+ vertex[3].x=lx3+PSXDisplay.CumulOffset.x;
+ vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
+ vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
+ vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
+ vertex[3].y=ly3+PSXDisplay.CumulOffset.y;
+}
+
+///////////////////////////////////////////////////////// 
+
+void offsetScreenUpload(int Position)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+
+ if(Position==-1)
+  {
+   int lmdx,lmdy;
+
+   lmdx=xrUploadArea.x0;
+   lmdy=xrUploadArea.y0;
+
+   lx0-=lmdx;
+   ly0-=lmdy;
+   lx1-=lmdx;
+   ly1-=lmdy;
+   lx2-=lmdx;
+   ly2-=lmdy;
+   lx3-=lmdx;
+   ly3-=lmdy;
+  }
+ else
+ if(Position)
+  {
+   lx0-=PSXDisplay.DisplayPosition.x;
+   ly0-=PSXDisplay.DisplayPosition.y;
+   lx1-=PSXDisplay.DisplayPosition.x;
+   ly1-=PSXDisplay.DisplayPosition.y;
+   lx2-=PSXDisplay.DisplayPosition.x;
+   ly2-=PSXDisplay.DisplayPosition.y;
+   lx3-=PSXDisplay.DisplayPosition.x;
+   ly3-=PSXDisplay.DisplayPosition.y;
+  }
+ else
+  {
+   lx0-=PreviousPSXDisplay.DisplayPosition.x;
+   ly0-=PreviousPSXDisplay.DisplayPosition.y;
+   lx1-=PreviousPSXDisplay.DisplayPosition.x;
+   ly1-=PreviousPSXDisplay.DisplayPosition.y;
+   lx2-=PreviousPSXDisplay.DisplayPosition.x;
+   ly2-=PreviousPSXDisplay.DisplayPosition.y;
+   lx3-=PreviousPSXDisplay.DisplayPosition.x;
+   ly3-=PreviousPSXDisplay.DisplayPosition.y;
+  }
+
+ vertex[0].x=lx0 + PreviousPSXDisplay.Range.x0;
+ vertex[1].x=lx1 + PreviousPSXDisplay.Range.x0;
+ vertex[2].x=lx2 + PreviousPSXDisplay.Range.x0;
+ vertex[3].x=lx3 + PreviousPSXDisplay.Range.x0;
+ vertex[0].y=ly0 + PreviousPSXDisplay.Range.y0;
+ vertex[1].y=ly1 + PreviousPSXDisplay.Range.y0;
+ vertex[2].y=ly2 + PreviousPSXDisplay.Range.y0;
+ vertex[3].y=ly3 + PreviousPSXDisplay.Range.y0;
+
+ if(iUseMask)
+  {
+   vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+   gl_z+=0.00004f;
+  }
+}
+ 
+///////////////////////////////////////////////////////// 
+
+void offsetBlk(void)
+{
+ if(bDisplayNotSet)
+  SetOGLDisplaySettings(1);
+                                            
+ vertex[0].x=lx0-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[1].x=lx1-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[2].x=lx2-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[3].x=lx3-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[0].y=ly0-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[1].y=ly1-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[2].y=ly2-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[3].y=ly3-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+
+ if(iUseMask)
+  {
+   vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+   gl_z+=0.00004f;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// texture sow/tow calculations
+////////////////////////////////////////////////////////////////////////
+
+void assignTextureVRAMWrite(void)
+{
+#ifdef OWNSCALE
+
+ vertex[0].sow=0.5f/ ST_FACVRAMX;
+ vertex[0].tow=0.5f/ ST_FACVRAM;
+
+ vertex[1].sow=(float)gl_ux[1]/ ST_FACVRAMX;
+ vertex[1].tow=0.5f/ ST_FACVRAM;
+
+ vertex[2].sow=(float)gl_ux[2]/ ST_FACVRAMX;
+ vertex[2].tow=(float)gl_vy[2]/ ST_FACVRAM;
+
+ vertex[3].sow=0.5f/ ST_FACVRAMX;
+ vertex[3].tow=(float)gl_vy[3]/ ST_FACVRAM;
+
+#else
+
+ if(gl_ux[1]==255)
+  {
+   vertex[0].sow=(gl_ux[0]*255.99f)/255.0f;
+   vertex[1].sow=(gl_ux[1]*255.99f)/255.0f;
+   vertex[2].sow=(gl_ux[2]*255.99f)/255.0f;
+   vertex[3].sow=(gl_ux[3]*255.99f)/255.0f;
+  }
+ else
+  {
+   vertex[0].sow=gl_ux[0];
+   vertex[1].sow=gl_ux[1];
+   vertex[2].sow=gl_ux[2];
+   vertex[3].sow=gl_ux[3];
+  }
+
+ vertex[0].tow=gl_vy[0];
+ vertex[1].tow=gl_vy[1];
+ vertex[2].tow=gl_vy[2];
+ vertex[3].tow=gl_vy[3];
+
+#endif
+}
+
+GLuint  gLastTex=0;
+GLuint  gLastFMode=(GLuint)-1;
+
+///////////////////////////////////////////////////////// 
+
+void assignTextureSprite(void)
+{
+ if(bUsingTWin)
+  {
+   vertex[0].sow=vertex[3].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+   vertex[1].sow=vertex[2].sow=(float)sSprite_ux2/TWin.UScaleFactor;
+   vertex[0].tow=vertex[1].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+   vertex[2].tow=vertex[3].tow=(float)sSprite_vy2/TWin.VScaleFactor;
+   gLastTex=gTexName;
+
+   if(iFilterType>0 && iFilterType<3 && iHiResTextures!=2) 
+    {
+     float fxmin=65536.0f,fxmax=0.0f,fymin=65536.0f,fymax=0.0f;int i;
+
+     for(i=0;i<4;i++)
+      {
+       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+       if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+      }
+
+     for(i=0;i<4;i++)
+      {
+#ifdef OWNSCALE
+       if(vertex[i].sow==fxmin) vertex[i].sow+=0.375f/(float)TWin.Position.x1;
+       if(vertex[i].sow==fxmax) vertex[i].sow-=0.375f/(float)TWin.Position.x1;
+       if(vertex[i].tow==fymin) vertex[i].tow+=0.375f/(float)TWin.Position.y1;
+       if(vertex[i].tow==fymax) vertex[i].tow-=0.375f/(float)TWin.Position.y1;
+#else
+       if(vertex[i].sow==fxmin) vertex[i].sow+=96.0f/(float)TWin.Position.x1;
+       if(vertex[i].sow==fxmax) vertex[i].sow-=96.0f/(float)TWin.Position.x1;
+       if(vertex[i].tow==fymin) vertex[i].tow+=96.0f/(float)TWin.Position.y1;
+       if(vertex[i].tow==fymax) vertex[i].tow-=96.0f/(float)TWin.Position.y1;
+#endif
+      }
+    }
+
+  }
+ else
+  {
+#ifdef OWNSCALE
+
+   vertex[0].sow=vertex[3].sow=(float)gl_ux[0]     / ST_FACSPRITE;
+   vertex[1].sow=vertex[2].sow=(float)sSprite_ux2  / ST_FACSPRITE;
+   vertex[0].tow=vertex[1].tow=(float)gl_vy[0]     / ST_FACSPRITE;
+   vertex[2].tow=vertex[3].tow=(float)sSprite_vy2  / ST_FACSPRITE;
+
+#else
+ 
+   vertex[0].sow=vertex[3].sow=gl_ux[0];
+   vertex[1].sow=vertex[2].sow=sSprite_ux2;
+   vertex[0].tow=vertex[1].tow=gl_vy[0];
+   vertex[2].tow=vertex[3].tow=sSprite_vy2;
+
+#endif
+
+   if(iFilterType>2) 
+    {
+     if(gLastTex!=gTexName || gLastFMode!=0)
+      {
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+       gLastTex=gTexName;gLastFMode=0;
+      }
+    }
+  }
+
+ if(usMirror & 0x1000) 
+  {
+   vertex[0].sow=vertex[1].sow;
+   vertex[1].sow=vertex[2].sow=vertex[3].sow;
+   vertex[3].sow=vertex[0].sow;
+  }
+
+ if(usMirror & 0x2000) 
+  {
+   vertex[0].tow=vertex[3].tow;
+   vertex[2].tow=vertex[3].tow=vertex[1].tow;
+   vertex[1].tow=vertex[0].tow;
+  }
+
+}
+
+///////////////////////////////////////////////////////// 
+
+void assignTexture3(void)
+{
+ if(bUsingTWin)
+  {
+   vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+   vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+   vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
+   vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
+   vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
+   vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
+   gLastTex=gTexName;
+  }
+ else
+  {
+#ifdef OWNSCALE
+   vertex[0].sow=(float)gl_ux[0] / ST_FACTRI;
+   vertex[0].tow=(float)gl_vy[0] / ST_FACTRI;
+   vertex[1].sow=(float)gl_ux[1] / ST_FACTRI;
+
+   vertex[1].tow=(float)gl_vy[1] / ST_FACTRI;
+   vertex[2].sow=(float)gl_ux[2] / ST_FACTRI;
+   vertex[2].tow=(float)gl_vy[2] / ST_FACTRI;
+#else
+   vertex[0].sow=gl_ux[0];
+   vertex[0].tow=gl_vy[0];
+   vertex[1].sow=gl_ux[1];
+   vertex[1].tow=gl_vy[1];
+   vertex[2].sow=gl_ux[2];
+   vertex[2].tow=gl_vy[2];
+#endif
+
+   if(iFilterType>2) 
+    {
+     if(gLastTex!=gTexName || gLastFMode!=1)
+      {
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+       gLastTex=gTexName;gLastFMode=1;
+      }
+    }
+
+   if(iFilterType) 
+    {
+     float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
+     for(i=0;i<3;i++)
+      {
+       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+       if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+      }
+
+     for(i=0;i<3;i++)
+      {
+       if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
+       if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
+       if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
+       if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
+      }
+    }
+  }
+}
+
+///////////////////////////////////////////////////////// 
+
+void assignTexture4(void)
+{
+ if(bUsingTWin)
+  {
+   vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+   vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+   vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
+   vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
+   vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
+   vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
+   vertex[3].sow=(float)gl_ux[3]/TWin.UScaleFactor;
+   vertex[3].tow=(float)gl_vy[3]/TWin.VScaleFactor;
+   gLastTex=gTexName;
+  }
+ else
+  {
+#ifdef OWNSCALE
+   vertex[0].sow=(float)gl_ux[0] / ST_FAC;
+   vertex[0].tow=(float)gl_vy[0] / ST_FAC;
+   vertex[1].sow=(float)gl_ux[1] / ST_FAC;
+   vertex[1].tow=(float)gl_vy[1] / ST_FAC;
+   vertex[2].sow=(float)gl_ux[2] / ST_FAC;
+   vertex[2].tow=(float)gl_vy[2] / ST_FAC;
+   vertex[3].sow=(float)gl_ux[3] / ST_FAC;
+   vertex[3].tow=(float)gl_vy[3] / ST_FAC;
+#else
+   vertex[0].sow=gl_ux[0];
+   vertex[0].tow=gl_vy[0];
+   vertex[1].sow=gl_ux[1];
+   vertex[1].tow=gl_vy[1];
+   vertex[2].sow=gl_ux[2];
+   vertex[2].tow=gl_vy[2];
+   vertex[3].sow=gl_ux[3];
+   vertex[3].tow=gl_vy[3];
+#endif
+
+   if(iFilterType>2) 
+    {
+     if(gLastTex!=gTexName || gLastFMode!=1)
+      {
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+       gLastTex=gTexName;gLastFMode=1;
+      }
+    }
+
+   if(iFilterType) 
+    {
+     float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
+     for(i=0;i<4;i++)
+      {
+       if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+       if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+       if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+       if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+      }
+
+     for(i=0;i<4;i++)
+      {
+       if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
+       if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
+       if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
+       if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
+      }
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// render pos / buffers
+////////////////////////////////////////////////////////////////////////
+
+#ifndef _WINDOWS
+#define EqualRect(pr1,pr2) ((pr1)->left==(pr2)->left && (pr1)->top==(pr2)->top && (pr1)->right==(pr2)->right && (pr1)->bottom==(pr2)->bottom)
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// SetDisplaySettings: "simply" calcs the new drawing area and updates
+//                     the ogl clipping (scissor) 
+
+BOOL bSetClip=FALSE;
+
+void SetOGLDisplaySettings(BOOL DisplaySet)
+{
+ static RECT rprev={0,0,0,0};
+ static RECT rC   ={0,0,0,0};
+ static int iOldX=0;
+ static int iOldY=0;
+ RECT r;float XS,YS;
+
+ bDisplayNotSet = FALSE;
+
+ //----------------------------------------------------// that's a whole screen upload
+ if(!DisplaySet)
+  {
+   RECT rX;
+   PSXDisplay.GDrawOffset.x=0;
+   PSXDisplay.GDrawOffset.y=0;
+
+   PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x+PreviousPSXDisplay.Range.x0;
+   PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y+PreviousPSXDisplay.Range.y0;
+
+   rprev.left=rprev.left+1;
+
+   rX=rRatioRect;
+   rX.top=iResY-(rRatioRect.top+rRatioRect.bottom);
+
+   if(bSetClip || !EqualRect(&rC,&rX))
+    {
+     rC=rX;
+     glScissor(rC.left,rC.top,rC.right,rC.bottom);
+     bSetClip=FALSE; 
+    }
+   return;
+  }
+ //----------------------------------------------------// 
+
+ PSXDisplay.GDrawOffset.y = PreviousPSXDisplay.DisplayPosition.y;
+ PSXDisplay.GDrawOffset.x = PreviousPSXDisplay.DisplayPosition.x;
+ PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x+PreviousPSXDisplay.Range.x0;
+ PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y+PreviousPSXDisplay.Range.y0;
+
+ r.top   =PSXDisplay.DrawArea.y0 - PreviousPSXDisplay.DisplayPosition.y;
+ r.bottom=PSXDisplay.DrawArea.y1 - PreviousPSXDisplay.DisplayPosition.y;
+
+ if(r.bottom<0 || r.top>=PSXDisplay.DisplayMode.y)
+  {
+   r.top   =PSXDisplay.DrawArea.y0 - PSXDisplay.DisplayPosition.y;
+   r.bottom=PSXDisplay.DrawArea.y1 - PSXDisplay.DisplayPosition.y;
+  }
+
+ r.left  =PSXDisplay.DrawArea.x0 - PreviousPSXDisplay.DisplayPosition.x;
+ r.right =PSXDisplay.DrawArea.x1 - PreviousPSXDisplay.DisplayPosition.x;
+
+ if(r.right<0 || r.left>=PSXDisplay.DisplayMode.x)
+  {
+   r.left  =PSXDisplay.DrawArea.x0 - PSXDisplay.DisplayPosition.x;
+   r.right =PSXDisplay.DrawArea.x1 - PSXDisplay.DisplayPosition.x;
+  }
+
+ if(!bSetClip && EqualRect(&r,&rprev) &&
+    iOldX == PSXDisplay.DisplayMode.x &&
+    iOldY == PSXDisplay.DisplayMode.y)
+  return;
+
+ rprev = r;
+ iOldX = PSXDisplay.DisplayMode.x;
+ iOldY = PSXDisplay.DisplayMode.y;
+
+ XS=(float)rRatioRect.right/(float)PSXDisplay.DisplayMode.x;
+ YS=(float)rRatioRect.bottom/(float)PSXDisplay.DisplayMode.y;
+
+ if(PreviousPSXDisplay.Range.x0)
+  {
+   short s=PreviousPSXDisplay.Range.x0+PreviousPSXDisplay.Range.x1;
+
+   r.left+=PreviousPSXDisplay.Range.x0+1;
+
+   r.right+=PreviousPSXDisplay.Range.x0;
+
+   if(r.left>s)  r.left=s;
+   if(r.right>s) r.right=s;
+  }
+
+ if(PreviousPSXDisplay.Range.y0)
+  {
+   short s=PreviousPSXDisplay.Range.y0+PreviousPSXDisplay.Range.y1;
+
+   r.top+=PreviousPSXDisplay.Range.y0+1;
+   r.bottom+=PreviousPSXDisplay.Range.y0;
+
+   if(r.top>s)    r.top=s;
+   if(r.bottom>s) r.bottom=s;
+  }
+
+ // Set the ClipArea variables to reflect the new screen,
+ // offset from zero (since it is a new display buffer)
+ r.left   = (int)(((float)(r.left))      *XS);
+ r.top    = (int)(((float)(r.top))       *YS);
+ r.right  = (int)(((float)(r.right  + 1))*XS);
+ r.bottom = (int)(((float)(r.bottom + 1))*YS);
+
+ // Limit clip area to the screen size
+ if (r.left   > iResX)   r.left   = iResX;
+ if (r.left   < 0)       r.left   = 0;
+ if (r.top    > iResY)   r.top    = iResY;
+ if (r.top    < 0)       r.top    = 0;
+ if (r.right  > iResX)   r.right  = iResX;
+ if (r.right  < 0)       r.right  = 0;
+ if (r.bottom > iResY)   r.bottom = iResY;
+ if (r.bottom < 0)       r.bottom = 0;
+
+ r.right -=r.left;
+ r.bottom-=r.top;
+ r.top=iResY-(r.top+r.bottom);
+
+ r.left+=rRatioRect.left;
+ r.top -=rRatioRect.top;
+
+ if(bSetClip || !EqualRect(&r,&rC))
+  {
+   glScissor(r.left,r.top,r.right,r.bottom);
+   rC=r;
+   bSetClip=FALSE;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
diff --git a/plugins/peopsxgl/fps.c b/plugins/peopsxgl/fps.c
index dc89600f..e7e0b3fe 100644
--- a/plugins/peopsxgl/fps.c
+++ b/plugins/peopsxgl/fps.c
@@ -1,396 +1,399 @@
-/***************************************************************************

-                          fps.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-//*************************************************************************// 

-// History of changes:

-//

-// 2009/03/08 - Pete  

-// - generic cleanup for the Peops release

-//

-//*************************************************************************// 

-

-#include "stdafx.h"

-

-#define _IN_FPS

-

-#include "externals.h"

-

-////////////////////////////////////////////////////////////////////////

-// FPS stuff

-////////////////////////////////////////////////////////////////////////

-

-BOOL           bIsPerformanceCounter=FALSE;

-float          fFrameRateHz=0;

-DWORD          dwFrameRateTicks=16;

-float          fFrameRate;

-int            iFrameLimit;

-BOOL           bUseFrameLimit=FALSE;

-BOOL           bUseFrameSkip=0;

-DWORD          dwLaceCnt=0;

-

-////////////////////////////////////////////////////////////////////////

-// FPS skipping / limit

-////////////////////////////////////////////////////////////////////////

-

-BOOL         bInitCap = TRUE; 

-float        fps_skip = 0;

-float        fps_cur  = 0;

-

-#define TIMEBASE 100000

-

-unsigned long timeGetTime()

-{

- struct timeval tv;

- gettimeofday(&tv, 0);                                // well, maybe there are better ways

- return tv.tv_sec * 100000 + tv.tv_usec/10;           // to do that in linux, but at least it works

-}

-

-void FrameCap(void)

-{

- static unsigned long curticks, lastticks, _ticks_since_last_update;

- static unsigned long TicksToWait = 0;

- bool Waiting = TRUE;

-

-  {

-   curticks = timeGetTime();

-   _ticks_since_last_update = curticks - lastticks;

-

-    if((_ticks_since_last_update > TicksToWait) ||

-       (curticks <lastticks))

-    {

-     lastticks = curticks;

-

-     if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)

-          TicksToWait=0;

-     else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);

-    }

-   else

-    {

-     while (Waiting) 

-      {

-       curticks = timeGetTime(); 

-       _ticks_since_last_update = curticks - lastticks; 

-       if ((_ticks_since_last_update > TicksToWait) ||

-           (curticks < lastticks)) 

-        { 

-         Waiting = FALSE;

-         lastticks = curticks;

-         TicksToWait = dwFrameRateTicks; 

-        } 

-      } 

-    } 

-  } 

-} 

-

-#define MAXSKIP 120

-#define MAXLACE 16

-

-void FrameSkip(void)

-{

- static int   iNumSkips=0,iAdditionalSkip=0;           // number of additional frames to skip

- static DWORD dwLastLace=0;                            // helper var for frame limitation

- static DWORD curticks, lastticks, _ticks_since_last_update;

-

- if(!dwLaceCnt) return;                                // important: if no updatelace happened, we ignore it completely

-

- if(iNumSkips)                                         // we are in skipping mode?

-  {

-   dwLastLace+=dwLaceCnt;                              // -> calc frame limit helper (number of laces)

-   bSkipNextFrame = TRUE;                              // -> we skip next frame

-   iNumSkips--;                                        // -> ok, one done

-  }

- else                                                  // ok, no additional skipping has to be done... 

-  {                                                    // we check now, if some limitation is needed, or a new skipping has to get started

-   DWORD dwWaitTime;

-

-   if(bInitCap || bSkipNextFrame)                      // first time or we skipped before?

-    {

-     if(bUseFrameLimit && !bInitCap)                   // frame limit wanted and not first time called?

-      {

-       DWORD dwT=_ticks_since_last_update;             // -> that's the time of the last drawn frame

-       dwLastLace+=dwLaceCnt;                          // -> and that's the number of updatelace since the start of the last drawn frame

-

-       curticks = timeGetTime();

-       _ticks_since_last_update= dwT+curticks - lastticks;

-

-       dwWaitTime=dwLastLace*dwFrameRateTicks;         // -> and now we calc the time the real psx would have needed

-

-       if(_ticks_since_last_update<dwWaitTime)         // -> we were too fast?

-        {                                    

-         if((dwWaitTime-_ticks_since_last_update)>     // -> some more security, to prevent

-            (60*dwFrameRateTicks))                     //    wrong waiting times

-          _ticks_since_last_update=dwWaitTime;

-

-         while(_ticks_since_last_update<dwWaitTime)    // -> loop until we have reached the real psx time

-          {                                            //    (that's the additional limitation, yup)

-           curticks = timeGetTime();

-           _ticks_since_last_update = dwT+curticks - lastticks;

-          }

-        }

-       else                                            // we were still too slow ?!!?

-        {

-         if(iAdditionalSkip<MAXSKIP)                   // -> well, somewhen we really have to stop skipping on very slow systems

-          {

-           iAdditionalSkip++;                          // -> inc our watchdog var

-           dwLaceCnt=0;                                // -> reset lace count

-           lastticks = timeGetTime();

-           return;                                     // -> done, we will skip next frame to get more speed

-          }

-        }

-      }

-

-     bInitCap=FALSE;                                   // -> ok, we have inited the frameskip func

-     iAdditionalSkip=0;                                // -> init additional skip

-     bSkipNextFrame=FALSE;                             // -> we don't skip the next frame

-     lastticks = timeGetTime();

-     dwLaceCnt=0;                                      // -> and we start to count the laces 

-     dwLastLace=0;      

-     _ticks_since_last_update=0;

-     return;                                           // -> done, the next frame will get drawn

-    }

-

-   bSkipNextFrame=FALSE;                               // init the frame skip signal to 'no skipping' first

-

-   curticks = timeGetTime();

-   _ticks_since_last_update = curticks - lastticks;

-

-   dwLastLace=dwLaceCnt;                               // store curr count (frame limitation helper)

-   dwWaitTime=dwLaceCnt*dwFrameRateTicks;              // calc the 'real psx lace time'

-

-   if(_ticks_since_last_update>dwWaitTime)             // hey, we needed way too long for that frame...

-    {

-     if(bUseFrameLimit)                                // if limitation, we skip just next frame,

-      {                                                // and decide after, if we need to do more

-       iNumSkips=0;

-      }

-     else

-      {

-       iNumSkips=_ticks_since_last_update/dwWaitTime;  // -> calc number of frames to skip to catch up

-       iNumSkips--;                                    // -> since we already skip next frame, one down

-       if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP;        // -> well, somewhere we have to draw a line

-      }

-     bSkipNextFrame = TRUE;                            // -> signal for skipping the next frame

-    }

-   else                                                // we were faster than real psx? fine :)

-   if(bUseFrameLimit)                                  // frame limit used? so we wait til the 'real psx time' has been reached

-    {

-     if(dwLaceCnt>MAXLACE)                             // -> security check

-      _ticks_since_last_update=dwWaitTime;

-

-     while(_ticks_since_last_update<dwWaitTime)        // just do a waiting loop...

-      {

-       curticks = timeGetTime();

-       _ticks_since_last_update = curticks - lastticks;

-      }

-    }

-

-   lastticks = timeGetTime();

-  }

-

- dwLaceCnt=0;                                          // init lace counter

-}

-

-void calcfps(void) 

-{ 

- static unsigned long curticks,_ticks_since_last_update,lastticks; 

- static long   fps_cnt = 0;

- static unsigned long  fps_tck = 1; 

- static long           fpsskip_cnt = 0;

- static unsigned long  fpsskip_tck = 1;

- 

-  { 

-   curticks = timeGetTime(); 

-   _ticks_since_last_update=curticks-lastticks; 

- 

-   if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update) 

-    fps_skip=min(fps_skip,((float)TIMEBASE/(float)_ticks_since_last_update+1.0f));

- 

-   lastticks = curticks; 

-  } 

- 

- if(bUseFrameSkip && bUseFrameLimit)

-  {

-   fpsskip_tck += _ticks_since_last_update;

-

-   if(++fpsskip_cnt==2)

-    {

-     fps_skip = (float)2000/(float)fpsskip_tck;

-

-     fps_skip +=6.0f;

-

-     fpsskip_cnt = 0;

-     fpsskip_tck = 1;

-    }

-  }

-

- fps_tck += _ticks_since_last_update; 

- 

- if(++fps_cnt==10) 

-  { 

-   fps_cur = (float)(TIMEBASE*10)/(float)fps_tck; 

-

-   fps_cnt = 0; 

-   fps_tck = 1; 

- 

-   if(bUseFrameLimit && fps_cur>fFrameRateHz)            // optical adjust ;) avoids flickering fps display 

-    fps_cur=fFrameRateHz; 

-  } 

-} 

-

-void PCFrameCap (void) 

-{

- static unsigned long curticks, lastticks, _ticks_since_last_update;

- static unsigned long TicksToWait = 0;

- bool Waiting = TRUE; 

- 

- while (Waiting) 

-  {

-   curticks = timeGetTime(); 

-   _ticks_since_last_update = curticks - lastticks; 

-   if ((_ticks_since_last_update > TicksToWait) ||  

-       (curticks < lastticks)) 

-    { 

-     Waiting = FALSE; 

-     lastticks = curticks; 

-     TicksToWait = (TIMEBASE / (unsigned long)fFrameRateHz); 

-    } 

-  } 

-} 

-

-void PCcalcfps(void) 

-{ 

- static unsigned long curticks,_ticks_since_last_update,lastticks; 

- static long  fps_cnt = 0; 

- static float fps_acc = 0;

- float CurrentFPS=0;     

-  

- curticks = timeGetTime(); 

- _ticks_since_last_update=curticks-lastticks;

- if(_ticks_since_last_update) 

-      CurrentFPS=(float)TIMEBASE/(float)_ticks_since_last_update;

- else CurrentFPS = 0;

- lastticks = curticks; 

- 

- fps_acc += CurrentFPS;

-

- if(++fps_cnt==10)

-  {

-   fps_cur = fps_acc / 10;

-   fps_acc = 0;

-   fps_cnt = 0;

-  }

-

- fps_skip=CurrentFPS+1.0f;

-}

-

-void SetAutoFrameCap(void)

-{

- if(iFrameLimit==1)

-  {

-   fFrameRateHz = fFrameRate;

-   dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);

-   return;

-  }

-

- if(dwActFixes&128)

-  {

-   if (PSXDisplay.Interlaced)

-        fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;

-   else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;

-  }

- else

-  {

-   //fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;

-

-   if(PSXDisplay.PAL)

-    {

-     if (STATUSREG&GPUSTATUS_INTERLACED)

-           fFrameRateHz=33868800.0f/677343.75f;        // 50.00238

-      else fFrameRateHz=33868800.0f/680595.00f;        // 49.76351

-    }                                                     

-   else

-    {

-     if (STATUSREG&GPUSTATUS_INTERLACED)

-           fFrameRateHz=33868800.0f/565031.25f;        // 59.94146

-      else fFrameRateHz=33868800.0f/566107.50f;        // 59.82750

-    }

-

-   dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);

-  }

-}

-

-void SetFrameRateConfig(void)

-{

- if(!fFrameRate) fFrameRate=200.0f;

-

- if(fFrameRateHz==0) 

-  {                                                    

-   if(iFrameLimit==2) fFrameRateHz=59.94f;             // auto framerate? set some init val (no pal/ntsc known yet)

-   else               fFrameRateHz=fFrameRate;         // else set user framerate

-  }

-

- dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);

-

- if(iFrameLimit==2) SetAutoFrameCap();

-}

-

-void InitFrameCap(void)

-{

-}

-

-void ReInitFrameCap(void)

-{

-}

-

-void CheckFrameRate(void)                              // called in updatelace (on every emulated psx vsync)

-{

- if(bUseFrameSkip) 

-  {

-   if(!(dwActFixes&0x100))

-    {

-     dwLaceCnt++;                                      // -> and store cnt of vsync between frames

-     if(dwLaceCnt>=MAXLACE && bUseFrameLimit) 

-      {

-       if(dwLaceCnt==MAXLACE) bInitCap=TRUE;

-       FrameCap();

-      }

-    }

-   else if(bUseFrameLimit) FrameCap();

-   calcfps();                                          // -> calc fps display in skipping mode

-  }                                                  

- else                                                  // -> non-skipping mode:

-  {

-   if(bUseFrameLimit) FrameCap();

-   if(ulKeybits&KEY_SHOWFPS) calcfps();  

-  }

-}

-

-void CALLBACK GPUsetframelimit(unsigned long option)   // new EPSXE interface func: main emu can enable/disable fps limitation this way

-{

- bInitCap = TRUE;

-

- if(option==1)                                         // emu says: limit

-  {

-   bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;

-   SetAutoFrameCap();

-  }

- else                                                  // emu says: no limit

-  {

-   bUseFrameLimit=FALSE;

-  }

-}

+/***************************************************************************
+                          fps.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+
+#define _IN_FPS
+
+#include "externals.h"
+#include "fps.h"
+
+////////////////////////////////////////////////////////////////////////
+// FPS stuff
+////////////////////////////////////////////////////////////////////////
+
+BOOL           bIsPerformanceCounter=FALSE;
+float          fFrameRateHz=0;
+DWORD          dwFrameRateTicks=16;
+float          fFrameRate;
+int            iFrameLimit;
+BOOL           bUseFrameLimit=FALSE;
+BOOL           bUseFrameSkip=0;
+DWORD          dwLaceCnt=0;
+
+////////////////////////////////////////////////////////////////////////
+// FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+
+BOOL         bInitCap = TRUE; 
+float        fps_skip = 0;
+float        fps_cur  = 0;
+
+#define TIMEBASE 100000
+
+unsigned long timeGetTime()
+{
+ struct timeval tv;
+ gettimeofday(&tv, 0);                                // well, maybe there are better ways
+ return tv.tv_sec * 100000 + tv.tv_usec/10;           // to do that in linux, but at least it works
+}
+
+static void FrameCap(void)
+{
+ static unsigned long curticks, lastticks, _ticks_since_last_update;
+ static unsigned long TicksToWait = 0;
+ bool Waiting = TRUE;
+
+  {
+   curticks = timeGetTime();
+   _ticks_since_last_update = curticks - lastticks;
+
+    if((_ticks_since_last_update > TicksToWait) ||
+       (curticks <lastticks))
+    {
+     lastticks = curticks;
+
+     if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+          TicksToWait=0;
+     else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+    }
+   else
+    {
+     while (Waiting) 
+      {
+       curticks = timeGetTime(); 
+       _ticks_since_last_update = curticks - lastticks; 
+       if ((_ticks_since_last_update > TicksToWait) ||
+           (curticks < lastticks)) 
+        { 
+         Waiting = FALSE;
+         lastticks = curticks;
+         TicksToWait = dwFrameRateTicks; 
+        } 
+      } 
+    } 
+  } 
+} 
+
+#define MAXSKIP 120
+#define MAXLACE 16
+
+void FrameSkip(void)
+{
+ static int   iNumSkips=0,iAdditionalSkip=0;           // number of additional frames to skip
+ static DWORD dwLastLace=0;                            // helper var for frame limitation
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+
+ if(!dwLaceCnt) return;                                // important: if no updatelace happened, we ignore it completely
+
+ if(iNumSkips)                                         // we are in skipping mode?
+  {
+   dwLastLace+=dwLaceCnt;                              // -> calc frame limit helper (number of laces)
+   bSkipNextFrame = TRUE;                              // -> we skip next frame
+   iNumSkips--;                                        // -> ok, one done
+  }
+ else                                                  // ok, no additional skipping has to be done... 
+  {                                                    // we check now, if some limitation is needed, or a new skipping has to get started
+   DWORD dwWaitTime;
+
+   if(bInitCap || bSkipNextFrame)                      // first time or we skipped before?
+    {
+     if(bUseFrameLimit && !bInitCap)                   // frame limit wanted and not first time called?
+      {
+       DWORD dwT=_ticks_since_last_update;             // -> that's the time of the last drawn frame
+       dwLastLace+=dwLaceCnt;                          // -> and that's the number of updatelace since the start of the last drawn frame
+
+       curticks = timeGetTime();
+       _ticks_since_last_update= dwT+curticks - lastticks;
+
+       dwWaitTime=dwLastLace*dwFrameRateTicks;         // -> and now we calc the time the real psx would have needed
+
+       if(_ticks_since_last_update<dwWaitTime)         // -> we were too fast?
+        {                                    
+         if((dwWaitTime-_ticks_since_last_update)>     // -> some more security, to prevent
+            (60*dwFrameRateTicks))                     //    wrong waiting times
+          _ticks_since_last_update=dwWaitTime;
+
+         while(_ticks_since_last_update<dwWaitTime)    // -> loop until we have reached the real psx time
+          {                                            //    (that's the additional limitation, yup)
+           curticks = timeGetTime();
+           _ticks_since_last_update = dwT+curticks - lastticks;
+          }
+        }
+       else                                            // we were still too slow ?!!?
+        {
+         if(iAdditionalSkip<MAXSKIP)                   // -> well, somewhen we really have to stop skipping on very slow systems
+          {
+           iAdditionalSkip++;                          // -> inc our watchdog var
+           dwLaceCnt=0;                                // -> reset lace count
+           lastticks = timeGetTime();
+           return;                                     // -> done, we will skip next frame to get more speed
+          }
+        }
+      }
+
+     bInitCap=FALSE;                                   // -> ok, we have inited the frameskip func
+     iAdditionalSkip=0;                                // -> init additional skip
+     bSkipNextFrame=FALSE;                             // -> we don't skip the next frame
+     lastticks = timeGetTime();
+     dwLaceCnt=0;                                      // -> and we start to count the laces 
+     dwLastLace=0;      
+     _ticks_since_last_update=0;
+     return;                                           // -> done, the next frame will get drawn
+    }
+
+   bSkipNextFrame=FALSE;                               // init the frame skip signal to 'no skipping' first
+
+   curticks = timeGetTime();
+   _ticks_since_last_update = curticks - lastticks;
+
+   dwLastLace=dwLaceCnt;                               // store curr count (frame limitation helper)
+   dwWaitTime=dwLaceCnt*dwFrameRateTicks;              // calc the 'real psx lace time'
+
+   if(_ticks_since_last_update>dwWaitTime)             // hey, we needed way too long for that frame...
+    {
+     if(bUseFrameLimit)                                // if limitation, we skip just next frame,
+      {                                                // and decide after, if we need to do more
+       iNumSkips=0;
+      }
+     else
+      {
+       iNumSkips=_ticks_since_last_update/dwWaitTime;  // -> calc number of frames to skip to catch up
+       iNumSkips--;                                    // -> since we already skip next frame, one down
+       if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP;        // -> well, somewhere we have to draw a line
+      }
+     bSkipNextFrame = TRUE;                            // -> signal for skipping the next frame
+    }
+   else                                                // we were faster than real psx? fine :)
+   if(bUseFrameLimit)                                  // frame limit used? so we wait til the 'real psx time' has been reached
+    {
+     if(dwLaceCnt>MAXLACE)                             // -> security check
+      _ticks_since_last_update=dwWaitTime;
+
+     while(_ticks_since_last_update<dwWaitTime)        // just do a waiting loop...
+      {
+       curticks = timeGetTime();
+       _ticks_since_last_update = curticks - lastticks;
+      }
+    }
+
+   lastticks = timeGetTime();
+  }
+
+ dwLaceCnt=0;                                          // init lace counter
+}
+
+static void calcfps(void) 
+{ 
+ static unsigned long curticks,_ticks_since_last_update,lastticks; 
+ static long   fps_cnt = 0;
+ static unsigned long  fps_tck = 1; 
+ static long           fpsskip_cnt = 0;
+ static unsigned long  fpsskip_tck = 1;
+ 
+  { 
+   curticks = timeGetTime(); 
+   _ticks_since_last_update=curticks-lastticks; 
+ 
+   if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update) 
+    fps_skip=min(fps_skip,((float)TIMEBASE/(float)_ticks_since_last_update+1.0f));
+ 
+   lastticks = curticks; 
+  } 
+ 
+ if(bUseFrameSkip && bUseFrameLimit)
+  {
+   fpsskip_tck += _ticks_since_last_update;
+
+   if(++fpsskip_cnt==2)
+    {
+     fps_skip = (float)2000/(float)fpsskip_tck;
+
+     fps_skip +=6.0f;
+
+     fpsskip_cnt = 0;
+     fpsskip_tck = 1;
+    }
+  }
+
+ fps_tck += _ticks_since_last_update; 
+ 
+ if(++fps_cnt==10) 
+  { 
+   fps_cur = (float)(TIMEBASE*10)/(float)fps_tck; 
+
+   fps_cnt = 0; 
+   fps_tck = 1; 
+ 
+   if(bUseFrameLimit && fps_cur>fFrameRateHz)            // optical adjust ;) avoids flickering fps display 
+    fps_cur=fFrameRateHz; 
+  } 
+} 
+
+void PCFrameCap (void) 
+{
+ static unsigned long curticks, lastticks, _ticks_since_last_update;
+ static unsigned long TicksToWait = 0;
+ bool Waiting = TRUE; 
+ 
+ while (Waiting) 
+  {
+   curticks = timeGetTime(); 
+   _ticks_since_last_update = curticks - lastticks; 
+   if ((_ticks_since_last_update > TicksToWait) ||  
+       (curticks < lastticks)) 
+    { 
+     Waiting = FALSE; 
+     lastticks = curticks; 
+     TicksToWait = (TIMEBASE / (unsigned long)fFrameRateHz); 
+    } 
+  } 
+} 
+
+void PCcalcfps(void) 
+{ 
+ static unsigned long curticks,_ticks_since_last_update,lastticks; 
+ static long  fps_cnt = 0; 
+ static float fps_acc = 0;
+ float CurrentFPS=0;     
+  
+ curticks = timeGetTime(); 
+ _ticks_since_last_update=curticks-lastticks;
+ if(_ticks_since_last_update) 
+      CurrentFPS=(float)TIMEBASE/(float)_ticks_since_last_update;
+ else CurrentFPS = 0;
+ lastticks = curticks; 
+ 
+ fps_acc += CurrentFPS;
+
+ if(++fps_cnt==10)
+  {
+   fps_cur = fps_acc / 10;
+   fps_acc = 0;
+   fps_cnt = 0;
+  }
+
+ fps_skip=CurrentFPS+1.0f;
+}
+
+void SetAutoFrameCap(void)
+{
+ if(iFrameLimit==1)
+  {
+   fFrameRateHz = fFrameRate;
+   dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+   return;
+  }
+
+ if(dwActFixes&128)
+  {
+   if (PSXDisplay.Interlaced)
+        fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;
+   else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;
+  }
+ else
+  {
+   //fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;
+
+   if(PSXDisplay.PAL)
+    {
+     if (STATUSREG&GPUSTATUS_INTERLACED)
+           fFrameRateHz=33868800.0f/677343.75f;        // 50.00238
+      else fFrameRateHz=33868800.0f/680595.00f;        // 49.76351
+    }                                                     
+   else
+    {
+     if (STATUSREG&GPUSTATUS_INTERLACED)
+           fFrameRateHz=33868800.0f/565031.25f;        // 59.94146
+      else fFrameRateHz=33868800.0f/566107.50f;        // 59.82750
+    }
+
+   dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+  }
+}
+
+void SetFrameRateConfig(void)
+{
+ if(!fFrameRate) fFrameRate=200.0f;
+
+ if(fFrameRateHz==0) 
+  {                                                    
+   if(iFrameLimit==2) fFrameRateHz=59.94f;             // auto framerate? set some init val (no pal/ntsc known yet)
+   else               fFrameRateHz=fFrameRate;         // else set user framerate
+  }
+
+ dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+
+ if(iFrameLimit==2) SetAutoFrameCap();
+}
+
+void InitFrameCap(void)
+{
+}
+
+void ReInitFrameCap(void)
+{
+}
+
+void CheckFrameRate(void)                              // called in updatelace (on every emulated psx vsync)
+{
+ if(bUseFrameSkip) 
+  {
+   if(!(dwActFixes&0x100))
+    {
+     dwLaceCnt++;                                      // -> and store cnt of vsync between frames
+     if(dwLaceCnt>=MAXLACE && bUseFrameLimit) 
+      {
+       if(dwLaceCnt==MAXLACE) bInitCap=TRUE;
+       FrameCap();
+      }
+    }
+   else if(bUseFrameLimit) FrameCap();
+   calcfps();                                          // -> calc fps display in skipping mode
+  }                                                  
+ else                                                  // -> non-skipping mode:
+  {
+   if(bUseFrameLimit) FrameCap();
+   if(ulKeybits&KEY_SHOWFPS) calcfps();  
+  }
+}
+
+#if 0 /* unused by pcsx */
+void CALLBACK GPUsetframelimit(unsigned long option)   // new EPSXE interface func: main emu can enable/disable fps limitation this way
+{
+ bInitCap = TRUE;
+
+ if(option==1)                                         // emu says: limit
+  {
+   bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;
+   SetAutoFrameCap();
+  }
+ else                                                  // emu says: no limit
+  {
+   bUseFrameLimit=FALSE;
+  }
+}
+#endif
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index f379372b..092d32a5 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -1,3529 +1,3527 @@
-/***************************************************************************

-                           gpu.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-// !!! enable this, if Linux XF86VidMode is not supported: 

-//#define NOVMODE

-

-#include "stdafx.h"

-

-#if !defined(_MACGL) && !defined(_WINDOWS)

-

-#include "config.h"

-

-#ifndef NOVMODE

-#include <X11/extensions/xf86vmode.h>

-static XF86VidModeModeInfo **modes=0;

-static int iOldMode=0;

-#endif

-

-#endif

-

-#define _IN_GPU

-

-#include "externals.h"

-#include "gpu.h"

-#include "draw.h"

-#include "cfg.h"

-#include "prim.h"

-#include "psemu_plugin_defs.h"

-#include "texture.h"

-#include "menu.h"

-#include "fps.h"

-#include "key.h"

-#ifdef _WINDOWS

-#include "resource.h"

-#include "ssave.h"

-#endif

-#ifdef ENABLE_NLS

-#include <libintl.h>

-#include <locale.h>

-#define _(x)  gettext(x)

-#define N_(x) (x)

-#else

-#define _(x)  (x)

-#define N_(x) (x)

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// PPDK developer must change libraryName field and can change revision and build

-////////////////////////////////////////////////////////////////////////

-

-const  unsigned char version  = 1;    // do not touch - library for PSEmu 1.x

-const  unsigned char revision = 1;

-const  unsigned char build    = 78;

-

-static char *libraryName     = N_("OpenGL Driver");

-

-static char *PluginAuthor    = N_("Pete Bernert");

-static char *libraryInfo     = N_("Based on P.E.Op.S. MesaGL Driver V1.78\nCoded by Pete Bernert\n");

-

-////////////////////////////////////////////////////////////////////////

-// memory image of the PSX vram

-////////////////////////////////////////////////////////////////////////

-

-unsigned char  *psxVSecure;

-unsigned char  *psxVub;

-signed   char  *psxVsb;

-unsigned short *psxVuw;

-unsigned short *psxVuw_eom;

-signed   short *psxVsw;

-uint32_t       *psxVul;

-signed   int   *psxVsl;

-

-// macro for easy access to packet information

-#define GPUCOMMAND(x) ((x>>24) & 0xff)

-

-GLfloat         gl_z=0.0f;

-BOOL            bNeedInterlaceUpdate=FALSE;

-BOOL            bNeedRGB24Update=FALSE;

-BOOL            bChangeWinMode=FALSE;

-

-#ifdef _WINDOWS

-extern HGLRC    GLCONTEXT;

-#endif

-

-uint32_t        ulStatusControl[256];

-

-////////////////////////////////////////////////////////////////////////

-// global GPU vars

-////////////////////////////////////////////////////////////////////////

-

-static int      GPUdataRet;

-int             lGPUstatusRet;

-char            szDispBuf[64];

-

-uint32_t        dwGPUVersion = 0;

-int             iGPUHeight = 512;

-int             iGPUHeightMask = 511;

-int             GlobalTextIL = 0;

-int             iTileCheat = 0;

-

-static uint32_t      gpuDataM[256];

-static unsigned char gpuCommand = 0;

-static int           gpuDataC = 0;

-static int           gpuDataP = 0;

-

-VRAMLoad_t      VRAMWrite;

-VRAMLoad_t      VRAMRead;

-int             iDataWriteMode;

-int             iDataReadMode;

-

-int             lClearOnSwap;

-int             lClearOnSwapColor;

-BOOL            bSkipNextFrame = FALSE;

-int             iColDepth;

-BOOL            bChangeRes;

-BOOL            bWindowMode;

-int             iWinSize;

-

-// possible psx display widths

-short dispWidths[8] = {256,320,512,640,368,384,512,640};

-

-PSXDisplay_t    PSXDisplay;

-PSXDisplay_t    PreviousPSXDisplay;

-TWin_t          TWin;

-short           imageX0,imageX1;

-short           imageY0,imageY1;

-BOOL            bDisplayNotSet = TRUE;

-GLuint          uiScanLine=0;

-int             iUseScanLines=0;

-float           iScanlineColor[] = {0,0,0, 0.3}; // easy on the eyes.

-int             lSelectedSlot=0;

-unsigned char * pGfxCardScreen=0;

-int             iBlurBuffer=0;

-int             iScanBlend=0;

-int             iRenderFVR=0;

-int             iNoScreenSaver=0;

-uint32_t        ulGPUInfoVals[16];

-int             iFakePrimBusy = 0;

-int             iRumbleVal    = 0;

-int             iRumbleTime   = 0;

-uint32_t        vBlank=0;

-

-////////////////////////////////////////////////////////////////////////

-// stuff to make this a true PDK module

-////////////////////////////////////////////////////////////////////////

-

-char * CALLBACK PSEgetLibName(void)

-{

- return _(libraryName);

-}

-

-unsigned long CALLBACK PSEgetLibType(void)

-{

- return  PSE_LT_GPU;

-}

-

-unsigned long CALLBACK PSEgetLibVersion(void)

-{

- return version<<16|revision<<8|build;

-}

-

-char * GPUgetLibInfos(void)

-{

- return _(libraryInfo);

-}

-

-////////////////////////////////////////////////////////////////////////

-// snapshot funcs (saves screen to bitmap / text infos into file)

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS

-char * GetConfigInfos(HWND hW)

-#else

-char * GetConfigInfos(int hW)

-#endif

-{

-#ifdef _WINDOWS

- HDC hdc;HGLRC hglrc;

-#endif

- char szO[2][4]={"off","on "};

- char szTxt[256];

- char * pB=(char *)malloc(32767);

-

- if(!pB) return NULL;

- *pB=0;

- //----------------------------------------------------//

- sprintf(szTxt,"Plugin: %s %d.%d.%d (mod)\r\n",libraryName,version,revision,build);

- strcat(pB,szTxt);

- sprintf(szTxt,"Author: %s\r\n",PluginAuthor);

- strcat(pB,szTxt);

-

-#ifdef _WINDOWS

- if(hW)

-  {

-   hdc = GetDC(hW);

-   bSetupPixelFormat(hdc);

-   hglrc = wglCreateContext(hdc);

-   wglMakeCurrent(hdc, hglrc);

-  }

-#endif

-

- sprintf(szTxt,"Card vendor: %s\r\n",(char *)glGetString(GL_VENDOR));

- strcat(pB,szTxt);

- sprintf(szTxt,"GFX card: %s\r\n",(char *)glGetString(GL_RENDERER));

- strcat(pB,szTxt);

- sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));

- strcat(pB,szTxt);

- //strcat(pB,(char *)glGetString(GL_EXTENSIONS));

- //strcat(pB,"\r\n\r\n");

-

-#ifdef _WINDOWS

- if(hW)

-  {

-   wglMakeCurrent(NULL, NULL);

-   wglDeleteContext(hglrc);

-   ReleaseDC(hW,hdc);

-  }

- //----------------------------------------------------//

-#endif

-

- if(hW && bWindowMode)

-  sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",LOWORD(iWinSize),HIWORD(iWinSize));

- else

-  sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",iResX,iResY);

- strcat(pB,szTxt);

- if(bWindowMode) sprintf(szTxt,"Window mode\r\n");

- else

-  {

-   sprintf(szTxt,"Fullscreen ");

-   strcat(pB,szTxt);

-   if(bChangeRes) sprintf(szTxt,"- Desktop changing [%d Bit]\r\n",iColDepth);

-   else           sprintf(szTxt,"- NO desktop changing\r\n");

-  }                                                                                   

- strcat(pB,szTxt);

-

- if(iForceVSync>=0) sprintf(szTxt,"- V-Sync: %s\r\n",szO[iForceVSync]);

- else               strcpy(szTxt,"- V-Sync: Driver\r\n");

- strcat(pB,szTxt); 

- sprintf(szTxt,"- Keep psx aspect ratio: %s\r\n\r\n",szO[bKeepRatio]);

- strcat(pB,szTxt);

- //----------------------------------------------------//

- strcpy(szTxt,"Textures:\r\n- ");

- if(iTexQuality==0)      strcat(szTxt,"Default");

- else if(iTexQuality==1) strcat(szTxt,"R4G4B4A4");

- else if(iTexQuality==2) strcat(szTxt,"R5G5B5A1");

- else if(iTexQuality==3) strcat(szTxt,"R8G8A8A8");

- else if(iTexQuality==4) strcat(szTxt,"B8G8R8A8");

- if(!hW && bGLExt) strcat(szTxt," (packed pixels)\r\n");

- else              strcat(szTxt,"\r\n");

- strcat(pB,szTxt);

- if(!hW)

-  {

-   sprintf(szTxt,"- Filtering: %d - edge clamping ",iFilterType);

-   if(iClampType==GL_TO_EDGE_CLAMP) strcat(szTxt,"supported\r\n");

-   else                             strcat(szTxt,"NOT supported\r\n");

-  }

- else sprintf(szTxt,"- iFiltering: %d\r\n",iFilterType);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Hi-Res textures: %d\r\n",iHiResTextures);

- strcat(pB,szTxt); 

- if(!hW)

-  {

-   sprintf(szTxt,"- Palettized tex windows: %s\r\n",szO[iUsePalTextures]);

-   strcat(pB,szTxt); 

-  }

- sprintf(szTxt,"- VRam size: %d MBytes",iVRamSize);

- if(!hW)

-      sprintf(szTxt+strlen(szTxt)," - %d textures usable\r\n\r\n",iSortTexCnt);

- else strcat(szTxt,"\r\n\r\n");

- strcat(pB,szTxt);

- //----------------------------------------------------//

- sprintf(szTxt,"Framerate:\r\n- FPS limitation: %s\r\n",szO[bUseFrameLimit]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Frame skipping: %s\r\n",szO[bUseFrameSkip]);

- strcat(pB,szTxt);

- if(iFrameLimit==2)

-      strcpy(szTxt,"- FPS limit: Auto\r\n\r\n");

- else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate);

- strcat(pB,szTxt);

- //----------------------------------------------------//

- sprintf(szTxt,"Compatibility:\r\n- Offscreen drawing: %d\r\n",iOffscreenDrawing);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Framebuffer texture: %d",iFrameTexType);

- if(!hW && iFrameTexType==2)

-  {

-   if(gTexFrameName) strcat(szTxt," - texture created\r\n");

-   else              strcat(szTxt," - not used yet\r\n");

-  }

- else strcat(szTxt,"\r\n");

- strcat(pB,szTxt);

- sprintf(szTxt,"- Framebuffer access: %d\r\n",iFrameReadType);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Alpha multipass: %s\r\n",szO[bOpaquePass]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Mask bit: %s\r\n",szO[iUseMask]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Advanced blending: %s",szO[bAdvancedBlend]);

- if(!hW && bAdvancedBlend)

-  {

-   if(bGLBlend) strcat(szTxt," (hardware)\r\n");

-   else         strcat(szTxt," (software)\r\n");

-  }

- else strcat(szTxt,"\r\n");

- strcat(pB,szTxt);

-

- if(!hW)

-  {

-   strcpy(szTxt,"- Subtractive blending: ");

-   if(glBlendEquationEXTEx)

-    {

-     if(bUseMultiPass) strcat(szTxt,"supported, but not used!");

-     else              strcat(szTxt,"activated");

-    }

-   else strcat(szTxt," NOT supported!");

-   strcat(szTxt,"\r\n\r\n");

-  }

- else strcpy(szTxt,"\r\n");

- 

- strcat(pB,szTxt);             

- //----------------------------------------------------//

- sprintf(szTxt,"Misc:\r\n- Scanlines: %s",szO[iUseScanLines]);

- strcat(pB,szTxt);

- if(iUseScanLines) sprintf(szTxt," [%d]\r\n",iScanBlend);

- else strcpy(szTxt,"\r\n");

- strcat(pB,szTxt);

- sprintf(szTxt,"- Line mode: %s\r\n",szO[bUseLines]);

- strcat(pB,szTxt);

-// sprintf(szTxt,"- Line AA: %s\r\n",szO[bUseAntiAlias]);

-// fwrite(szTxt,lstrlen(szTxt),1,txtfile);

- sprintf(szTxt,"- Unfiltered FB: %s\r\n",szO[bUseFastMdec]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- 15 bit FB: %s\r\n",szO[bUse15bitMdec]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Dithering: %s\r\n",szO[bDrawDither]);

- strcat(pB,szTxt);

- sprintf(szTxt,"- Screen smoothing: %s",szO[iBlurBuffer]);

- strcat(pB,szTxt);

- if(!hW && iBlurBuffer) 

-  {

-   if(gTexBlurName) strcat(pB," - supported\r\n");

-   else             strcat(pB," - not supported\r\n");

-  }

- else strcat(pB,"\r\n");

- sprintf(szTxt,"- Game fixes: %s [%08x]\r\n",szO[bUseFixes],dwCfgFixes);

- strcat(pB,szTxt);

- //----------------------------------------------------//

- return pB;

-}

-

-////////////////////////////////////////////////////////////////////////

-// save text infos to file

-////////////////////////////////////////////////////////////////////////

-

-void DoTextSnapShot(int iNum)

-{

- FILE *txtfile;char szTxt[256];char * pB;

-

-#ifdef _WINDOWS

- sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);

-#else

- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);

-#endif

-

- if((txtfile=fopen(szTxt,"wb"))==NULL)

-  return;                                              

-

- pB=GetConfigInfos(0);

- if(pB)

-  {

-   fwrite(pB,strlen(pB),1,txtfile);

-   free(pB);

-  }

- fclose(txtfile); 

-}

-

-////////////////////////////////////////////////////////////////////////

-// saves screen bitmap to file

-////////////////////////////////////////////////////////////////////////

-

-void DoSnapShot(void)

-{

- unsigned char * snapshotdumpmem=NULL,* p,c;

- FILE *bmpfile;char filename[256];

- unsigned char header[0x36];int size;

- unsigned char empty[2]={0,0};int i;

- unsigned int snapshotnr = 0;

- short SnapWidth;

- short SnapHeigth;

-

- bSnapShot=FALSE;

-

- SnapWidth  = iResX;

- SnapHeigth = iResY;

-

- size=SnapWidth * SnapHeigth * 3 + 0x38;

-

- if((snapshotdumpmem=(unsigned char *)

-   malloc(SnapWidth*SnapHeigth*3))==NULL)

-  return;

-    

-  // fill in proper values for BMP

- for(i=0;i<0x36;i++) header[i]=0;

- header[0]='B';

- header[1]='M';

- header[2]=(unsigned char)(size&0xff);

- header[3]=(unsigned char)((size>>8)&0xff);

- header[4]=(unsigned char)((size>>16)&0xff);

- header[5]=(unsigned char)((size>>24)&0xff);

- header[0x0a]=0x36;

- header[0x0e]=0x28;

- header[0x12]=(unsigned char)(SnapWidth%256);

- header[0x13]=(unsigned char)(SnapWidth/256);

- header[0x16]=(unsigned char)(SnapHeigth%256);

- header[0x17]=(unsigned char)(SnapHeigth/256);

- header[0x1a]=0x01;

- header[0x1c]=0x18;

- header[0x26]=0x12;

- header[0x27]=0x0B;

- header[0x2A]=0x12;

- header[0x2B]=0x0B;

-

- // increment snapshot value

- // get filename

- do

-  {

-   snapshotnr++;

-#ifdef _WINDOWS

-   sprintf(filename,"snap/pcsx%04d.bmp",snapshotnr);

-#else

-   sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr);

-#endif

-   bmpfile=fopen(filename,"rb");

-   if(bmpfile==NULL)break;

-   fclose(bmpfile);

-   if(snapshotnr==9999) break;

-  }

- while(TRUE);

-

- // try opening new snapshot file

- if((bmpfile=fopen(filename,"wb"))==NULL)

-  {free(snapshotdumpmem);return;}

-

- fwrite(header,0x36,1,bmpfile);

-

- glReadPixels(0,0,SnapWidth,SnapHeigth,GL_RGB,

-               GL_UNSIGNED_BYTE,snapshotdumpmem);

- p=snapshotdumpmem;

- size=SnapWidth * SnapHeigth;

-

- for(i=0;i<size;i++,p+=3)

-  {c=*p;*p=*(p+2);*(p+2)=c;}

-

- fwrite(snapshotdumpmem,size*3,1,bmpfile);

- fwrite(empty,0x2,1,bmpfile);

- fclose(bmpfile); 

- free(snapshotdumpmem);

-

- DoTextSnapShot(snapshotnr);

-#ifdef _WINDOWS

- MessageBeep((UINT)-1);

-#endif

-}       

-

-void CALLBACK GPUmakeSnapshot(void)

-{

- bSnapShot = TRUE;

-}        

-

-////////////////////////////////////////////////////////////////////////

-// GPU INIT... here starts it all (first func called by emu)

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK GPUinit()

-{

- memset(ulStatusControl,0,256*sizeof(uint32_t));

-

- // different ways of accessing PSX VRAM

-

- psxVSecure=(unsigned char *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security

- if(!psxVSecure) return -1;

-

- psxVub=psxVSecure+512*1024;                           // security offset into double sized psx vram!

- psxVsb=(signed char *)psxVub;

- psxVsw=(signed short *)psxVub;

- psxVsl=(signed int *)psxVub;

- psxVuw=(unsigned short *)psxVub;

- psxVul=(uint32_t *)psxVub;

-

- psxVuw_eom=psxVuw+1024*iGPUHeight;                    // pre-calc of end of vram

-

- memset(psxVSecure,0x00,(iGPUHeight*2)*1024 + (1024*1024));

- memset(ulGPUInfoVals,0x00,16*sizeof(uint32_t));

-

- InitFrameCap();                                       // init frame rate stuff

-

- PSXDisplay.RGB24        = 0;                          // init vars

- PreviousPSXDisplay.RGB24= 0;

- PSXDisplay.Interlaced   = 0;

- PSXDisplay.InterlacedTest=0;

- PSXDisplay.DrawOffset.x = 0;

- PSXDisplay.DrawOffset.y = 0;

- PSXDisplay.DrawArea.x0  = 0;

- PSXDisplay.DrawArea.y0  = 0;

- PSXDisplay.DrawArea.x1  = 320;

- PSXDisplay.DrawArea.y1  = 240;

- PSXDisplay.DisplayMode.x= 320;

- PSXDisplay.DisplayMode.y= 240;

- PSXDisplay.Disabled     = FALSE;

- PreviousPSXDisplay.Range.x0 =0;

- PreviousPSXDisplay.Range.x1 =0;

- PreviousPSXDisplay.Range.y0 =0;

- PreviousPSXDisplay.Range.y1 =0;

- PSXDisplay.Range.x0=0;

- PSXDisplay.Range.x1=0;

- PSXDisplay.Range.y0=0;

- PSXDisplay.Range.y1=0;

- PreviousPSXDisplay.DisplayPosition.x = 1;

- PreviousPSXDisplay.DisplayPosition.y = 1;

- PSXDisplay.DisplayPosition.x = 1;

- PSXDisplay.DisplayPosition.y = 1;

- PreviousPSXDisplay.DisplayModeNew.y=0;

- PSXDisplay.Double=1;

- GPUdataRet=0x400;

-

- PSXDisplay.DisplayModeNew.x=0;

- PSXDisplay.DisplayModeNew.y=0;

-

- //PreviousPSXDisplay.Height = PSXDisplay.Height = 239;

- 

- iDataWriteMode = DR_NORMAL;

-

- // Reset transfer values, to prevent mis-transfer of data

- memset(&VRAMWrite,0,sizeof(VRAMLoad_t));

- memset(&VRAMRead,0,sizeof(VRAMLoad_t));

- 

- // device initialised already !

- //lGPUstatusRet = 0x74000000;

- vBlank = 0;

-

- STATUSREG = 0x14802000;

- GPUIsIdle;

- GPUIsReadyForCommands;

-

- return 0;

-}                             

-

-////////////////////////////////////////////////////////////////////////

-// GPU OPEN: funcs to open up the gpu display (Windows)

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS

-

-void ChangeDesktop()                                   // change destop resolution

-{

- DEVMODE dv;long lRes,iTry=0;                       

-

- while(iTry<10)                                        // keep on hammering...

-  {

-   memset(&dv,0,sizeof(DEVMODE));

-   dv.dmSize=sizeof(DEVMODE);

-   dv.dmBitsPerPel=iColDepth;

-   dv.dmPelsWidth=iResX;

-   dv.dmPelsHeight=iResY;

-

-   dv.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;

-

-   lRes=ChangeDisplaySettings(&dv,0);                  // ...hammering the anvil

-

-   if(lRes==DISP_CHANGE_SUCCESSFUL) return;

-   iTry++;Sleep(10);

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// OPEN interface func: attention! 

-// some emus are calling this func in their main Window thread,

-// but all other interface funcs (to draw stuff) in a different thread!

-// that's a problem, since OGL is thread safe! Therefore we cannot 

-// initialize the OGL stuff right here, we simply set a "bIsFirstFrame = TRUE"

-// flag, to initialize OGL on the first real draw call.

-// btw, we also call this open func ourselfes, each time when the user 

-// is changing between fullscreen/window mode (ENTER key)

-// btw part 2: in windows the plugin gets the window handle from the

-// main emu, and doesn't create it's own window (if it would do it,

-// some PAD or SPU plugins would not work anymore)

-////////////////////////////////////////////////////////////////////////

-

-HMENU hPSEMenu=NULL;

-

-long CALLBACK GPUopen(HWND hwndGPU)                    

-{

- HDC hdc;RECT r;DEVMODE dv;

-

- hWWindow = hwndGPU;                                   // store hwnd globally

-

- InitKeyHandler();                                     // init key handler (subclass window)

-

- if(bChangeWinMode)                                    // user wants to change fullscreen/window mode?

-  {

-   ReadWinSizeConfig();                                // -> get sizes again

-  }

- else                                                  // first real startup

-  {

-   ReadConfig();                                       // -> read config from registry

-

-   SetFrameRateConfig();                               // -> setup frame rate stuff

-  }

-

- if(iNoScreenSaver) EnableScreenSaver(FALSE);          // at least we can try 

-

-

- memset(&dv,0,sizeof(DEVMODE));

- dv.dmSize=sizeof(DEVMODE);

- EnumDisplaySettings(NULL,ENUM_CURRENT_SETTINGS,&dv);

-

- bIsFirstFrame = TRUE;                                 // flag: we have to init OGL later in windows!

-

- if(bWindowMode)                                       // win mode?

-  {

-   DWORD dw=GetWindowLong(hWWindow, GWL_STYLE);        // -> adjust wnd style (owndc needed by some stupid ogl drivers)

-   dw&=~WS_THICKFRAME;

-   dw|=WS_BORDER|WS_CAPTION|CS_OWNDC;

-   SetWindowLong(hWWindow, GWL_STYLE, dw);

-

-   hPSEMenu=GetMenu(hWWindow);                         // -> hide emu menu (if any)

-   if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);

-

-   iResX=LOWORD(iWinSize);iResY=HIWORD(iWinSize);

-   ShowWindow(hWWindow,SW_SHOWNORMAL);

-

-   MoveWindow(hWWindow,                                // -> center wnd

-      GetSystemMetrics(SM_CXFULLSCREEN)/2-iResX/2,

-      GetSystemMetrics(SM_CYFULLSCREEN)/2-iResY/2,

-      iResX+GetSystemMetrics(SM_CXFIXEDFRAME)+3,

-      iResY+GetSystemMetrics(SM_CYFIXEDFRAME)+GetSystemMetrics(SM_CYCAPTION)+3,

-      TRUE);

-   UpdateWindow(hWWindow);                             // -> let windows do some update

-

-   if(dv.dmBitsPerPel==16 || dv.dmBitsPerPel==32)      // -> overwrite user color info with desktop color info

-    iColDepth=dv.dmBitsPerPel;

-  }

- else                                                  // fullscreen mode:

-  {

-   if(dv.dmBitsPerPel!=(unsigned int)iColDepth ||      // -> check, if we have to change resolution

-      dv.dmPelsWidth !=(unsigned int)iResX ||

-      dv.dmPelsHeight!=(unsigned int)iResY)

-    bChangeRes=TRUE; else bChangeRes=FALSE;

-

-   if(bChangeRes) ChangeDesktop();                     // -> change the res (had to do an own func because of some MS 'optimizations')

-

-   SetWindowLong(hWWindow, GWL_STYLE, CS_OWNDC);       // -> adjust wnd style as well (to be sure)

-                

-   hPSEMenu=GetMenu(hWWindow);                         // -> hide menu

-   if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);

-   ShowWindow(hWWindow,SW_SHOWMAXIMIZED);              // -> max mode

-  }

-

- rRatioRect.left   = rRatioRect.top=0;

- rRatioRect.right  = iResX;

- rRatioRect.bottom = iResY;

-

- r.left=r.top=0;r.right=iResX;r.bottom=iResY;          // hack for getting a clean black window until OGL gets initialized

- hdc = GetDC(hWWindow);

- FillRect(hdc,&r,(HBRUSH)GetStockObject(BLACK_BRUSH));

- bSetupPixelFormat(hdc);

- ReleaseDC(hWWindow,hdc);

-

- bDisplayNotSet = TRUE; 

- bSetClip=TRUE;

-

- SetFixes();                                           // setup game fixes

-

- InitializeTextureStore();                             // init texture mem

-

-// lGPUstatusRet = 0x74000000;

-

-// with some emus, we could do the OGL init right here... oh my

-// if(bIsFirstFrame) GLinitialize();

-

- return 0;

-}

-

-#elif !defined (_MACGL)

-

-////////////////////////////////////////////////////////////////////////

-// LINUX GPU OPEN: func to open up the gpu display (X stuff)

-// please note: in linux we are creating our own display, and we return

-// the display ID to the main emu... that's cleaner

-////////////////////////////////////////////////////////////////////////

-

-char * pCaptionText=0;

-int    bFullScreen=0;

-Display              *display;

-

-static Cursor        cursor;

-static XVisualInfo   *myvisual;

-static Colormap      colormap;

-static Window        window;

-

-static int bModeChanged=0;

-

-typedef struct

-{

-#define MWM_HINTS_DECORATIONS   2

-  long flags;

-  long functions;

-  long decorations;

-  long input_mode;

-} MotifWmHints;

-

-static int dbdepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,GLX_DEPTH_SIZE,16,None};

-static int dbnodepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,None};

-static GLXContext cx;

-

-static int fx=0;

-

-////////////////////////////////////////////////////////////////////////

-

-void osd_close_display (void)                          // close display

-{

- if(display)                                           // display exists?

-  {

-   glXDestroyContext(display,cx);                      // -> kill context

-   XFreeColormap(display, colormap);                   // -> kill colormap

-   XSync(display,False);                               // -> sync events

-

-#ifndef NOVMODE

-   if(bModeChanged)                                    // -> repair screen mode

-    {

-     int myscreen=DefaultScreen(display);

-     XF86VidModeSwitchToMode(display,myscreen,         // --> switch mode back

-                             modes[iOldMode]);

-     XF86VidModeSetViewPort(display,myscreen,0,0);     // --> set viewport upperleft

-     free(modes);                                      // --> finally kill mode infos

-     bModeChanged=0;                                   // --> done

-    }

-#endif

-

-   XCloseDisplay(display);                             // -> close display

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void sysdep_create_display(void)                       // create display

-{

- XSetWindowAttributes winattr;float fxgamma=2;

- int myscreen;char gammastr[14];

- Screen * screen;XEvent event;

- XSizeHints hints;XWMHints wm_hints;

- MotifWmHints mwmhints;Atom mwmatom;Atom delwindow;

- char *glxfx;

-

- glxfx=getenv("MESA_GLX_FX");                          // 3dfx mesa fullscreen flag

- if(glxfx)

-  {

-   if(glxfx[0]=='f')                                   // -> yup, fullscreen needed

-    {

-     fx=1;                                             // -> raise flag

-     putenv("FX_GLIDE_NO_SPLASH=");

-     sprintf(gammastr,"SST_GAMMA=%2.1f",fxgamma);      // -> set gamma

-     putenv(gammastr);

-    }

-  }

-

- display=XOpenDisplay(NULL);                           // open display

- if(!display)                                          // no display?

-  {

-   fprintf (stderr,"Failed to open display!!!\n");

-   osd_close_display();

-   return;                                             // -> bye

-  }

-

- myscreen=DefaultScreen(display);                      // get screen id

-

-#ifdef NOVMODE

- if(bFullScreen) {fx=1;bModeChanged=0;}

-#else

- if(bFullScreen)

-  {

-   XF86VidModeModeLine mode;

-   int nmodes,iC;

-   fx=1;                                               // raise flag

-   XF86VidModeGetModeLine(display,myscreen,&iC,&mode); // get actual mode info

-   if(mode.privsize) XFree(mode.private);              // no need for private stuff

-   bModeChanged=0;                                     // init mode change flag

-   if(iResX!=mode.hdisplay || iResY!=mode.vdisplay)    // wanted mode is different?

-    {

-     XF86VidModeGetAllModeLines(display,myscreen,      // -> enum all mode infos

-                                &nmodes,&modes);

-     if(modes)                                         // -> infos got?

-      {

-       for(iC=0;iC<nmodes;++iC)                        // -> loop modes

-        {

-         if(mode.hdisplay==modes[iC]->hdisplay &&      // -> act mode found?

-            mode.vdisplay==modes[iC]->vdisplay)        //    if yes: store mode id

-          iOldMode=iC;

-

-         if(iResX==modes[iC]->hdisplay &&              // -> wanted mode found?

-            iResY==modes[iC]->vdisplay)

-          {

-           XF86VidModeSwitchToMode(display,myscreen,   // --> switch to mode

-                                   modes[iC]);

-           XF86VidModeSetViewPort(display,myscreen,0,0);

-           bModeChanged=1;                             // --> raise flag for repairing mode on close

-          }

-        }

-

-       if(bModeChanged==0)                             // -> no mode found?

-        {

-         free(modes);                                  // --> free infos

-         printf("No proper fullscreen mode found!\n"); // --> some info output

-        }

-      }

-    }

-  }

-#endif

-

- screen=DefaultScreenOfDisplay(display);

-

- if(iZBufferDepth)                                      // visual (with or without zbuffer)

-      myvisual=glXChooseVisual(display,myscreen,dbdepat);

- else myvisual=glXChooseVisual(display,myscreen,dbnodepat);

-

- if(!myvisual)                                         // no visual?

-  {

-   fprintf(stderr,"Failed to obtain visual!!!\n");     // -> bye

-   osd_close_display();

-   return;

-  }

-

- cx=glXCreateContext(display,myvisual,0,GL_TRUE);      // create rendering context

-

- if(!cx)                                               // no context?

-  {

-   fprintf(stderr,"Failed to create OpenGL context!!!\n");

-   osd_close_display();                                // -> bxe

-   return;

-  }

-

- // pffff... much work for a simple blank cursor... oh, well...

- if(!bFullScreen) cursor=XCreateFontCursor(display,XC_trek);

- else

-  {

-   Pixmap p1,p2;XImage * img;

-   XColor b,w;unsigned char * idata;

-   XGCValues GCv;

-   GC        GCc;

-

-   memset(&b,0,sizeof(XColor));

-   memset(&w,0,sizeof(XColor));

-   idata=(unsigned char *)malloc(8);

-   memset(idata,0,8);

-

-   p1=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);

-   p2=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);

-

-   img = XCreateImage(display,myvisual->visual,

-                      1,XYBitmap,0,idata,8,8,8,1);

-

-   GCv.function   = GXcopy;

-   GCv.foreground = ~0;

-   GCv.background =  0;

-   GCv.plane_mask = AllPlanes;

-   GCc = XCreateGC(display,p1,

-                   (GCFunction|GCForeground|GCBackground|GCPlaneMask),&GCv);

-

-   XPutImage(display, p1,GCc,img,0,0,0,0,8,8);

-   XPutImage(display, p2,GCc,img,0,0,0,0,8,8);

-   XFreeGC(display, GCc);

-

-   cursor = XCreatePixmapCursor(display,p1,p2,&b,&w,0,0);

-

-   XFreePixmap(display,p1);

-   XFreePixmap(display,p2);

-   XDestroyImage(img);                                 // will free idata as well

-  }

-

- colormap=XCreateColormap(display,                     // create colormap

-                          RootWindow(display,myvisual->screen),

-                          myvisual->visual,AllocNone);

-

- winattr.background_pixel=0;

- winattr.border_pixel=WhitePixelOfScreen(screen);

- winattr.bit_gravity=ForgetGravity;

- winattr.win_gravity=NorthWestGravity;

- winattr.backing_store=NotUseful;

- winattr.override_redirect=False;

- winattr.save_under=False;

- winattr.event_mask=0;

- winattr.do_not_propagate_mask=0;

- winattr.colormap=colormap;

- winattr.cursor=None;

-

- window=XCreateWindow(display,                         // create own window

-             RootWindow(display,DefaultScreen(display)),

-             0,0,iResX,iResY,

-             0,myvisual->depth,

-             InputOutput,myvisual->visual,

-             CWBorderPixel | CWBackPixel |

-             CWEventMask | CWDontPropagate |

-             CWColormap | CWCursor,

-             &winattr);

-

- if(!window)                                           // no window?

-  {

-   fprintf(stderr,"Failed in XCreateWindow()!!!\n");

-   osd_close_display();                                // -> bye

-   return;

-  }

-

- delwindow = XInternAtom(display,"WM_DELETE_WINDOW",0);

- XSetWMProtocols(display, window, &delwindow, 1);

-

- hints.flags=PMinSize|PMaxSize;                        // hints

- if(fx) hints.flags|=USPosition|USSize;

- else   hints.flags|=PSize;

-

- hints.min_width   = hints.max_width  = hints.base_width  = iResX;

- hints.min_height  = hints.max_height = hints.base_height = iResY;

-

- wm_hints.input=1;

- wm_hints.flags=InputHint;

-

- XSetWMHints(display,window,&wm_hints);

- XSetWMNormalHints(display,window,&hints);

- if(pCaptionText)                                      // caption

-      XStoreName(display,window,pCaptionText);

- else XStoreName(display,window,"Pete MesaGL PSX Gpu");

-

- XDefineCursor(display,window,cursor);                 // cursor

-

- if(fx)                                                // window title bar hack

-  {

-   mwmhints.flags=MWM_HINTS_DECORATIONS;

-   mwmhints.decorations=0;

-   mwmatom=XInternAtom(display,"_MOTIF_WM_HINTS",0);

-   XChangeProperty(display,window,mwmatom,mwmatom,32,

-                   PropModeReplace,(unsigned char *)&mwmhints,4);

-  }

-

- XSelectInput(display,window,                          // input setup

-              FocusChangeMask | ExposureMask |

-              KeyPressMask | KeyReleaseMask);

-

- XMapRaised(display,window);

- XClearWindow(display,window);

- XWindowEvent(display,window,ExposureMask,&event);

- glXMakeCurrent(display,window,cx);

-

-/* 

- printf(glGetString(GL_VENDOR));

- printf("\n");

- printf(glGetString(GL_RENDERER));

- printf("\n");

-*/

-

- if (fx)                                               // after make current: fullscreen resize

-  {

-   XResizeWindow(display,window,screen->width,screen->height);

-   hints.min_width   = hints.max_width = hints.base_width = screen->width;

-   hints.min_height= hints.max_height = hints.base_height = screen->height;

-   XSetWMNormalHints(display,window,&hints);

-

-   // set the window layer for GNOME

-   {

-    XEvent xev;

-

-    memset(&xev, 0, sizeof(xev));

-    xev.xclient.type = ClientMessage;

-    xev.xclient.serial = 0;

-    xev.xclient.send_event = 1;

-    xev.xclient.message_type = XInternAtom(display, "_NET_WM_STATE", 0);

-    xev.xclient.window = window;

-    xev.xclient.format = 32;

-    xev.xclient.data.l[0] = 1;

-    xev.xclient.data.l[1] = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", 0);

-    xev.xclient.data.l[2] = 0;

-    xev.xclient.data.l[3] = 0;

-    xev.xclient.data.l[4] = 0;

-

-    XSendEvent(display, RootWindow(display, DefaultScreen(display)), 0,

-      SubstructureRedirectMask | SubstructureNotifyMask, &xev);

-   }

-  }

-}

-

-#endif // !defined(_MACGL)

-

-#ifndef _WINDOWS

-

-#if defined(_MACGL)

-extern char * pCaptionText;

-#endif

-

-////////////////////////////////////////////////////////////////////////

-

-long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)

-{

- pCaptionText=CapText;

- pConfigFile=CfgFile;

-

- ReadConfig();                                         // read text file for config

-

- SetFrameRateConfig();                                 // setup frame rate stuff

-

- bIsFirstFrame = TRUE;                                 // we have to init later (well, no really... in Linux we do all in GPUopen)

-

- #if defined (_MACGL)

- unsigned long display = ulInitDisplay();

- #else

- sysdep_create_display();                              // create display

- #endif 

- 

- InitializeTextureStore();                             // init texture mem

-

- rRatioRect.left   = rRatioRect.top=0;

- rRatioRect.right  = iResX;

- rRatioRect.bottom = iResY;

-

- GLinitialize();                                       // init opengl

-

- if(disp)

-  {

-  #if defined (_MACGL)

-  *disp = display;

-  #else

-   *disp=(unsigned long *)display;                       // return display ID to main emu

-  #endif

-  }

-

- if(display) return 0;

- return -1;

-}

-

-#endif // ndef _WINDOWS

-

-

-

-////////////////////////////////////////////////////////////////////////

-// close

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS

-

-long CALLBACK GPUclose()                               // WINDOWS CLOSE

-{

- ExitKeyHandler();

-

- GLcleanup();                                          // close OGL

-

- if(bChangeRes)                                        // change res back

-  ChangeDisplaySettings(NULL,0);

-

- if(hPSEMenu)                                          // set menu again

-  SetMenu(hWWindow,hPSEMenu);

-

- if(pGfxCardScreen) free(pGfxCardScreen);              // free helper memory

- pGfxCardScreen=0;

-

- if(iNoScreenSaver) EnableScreenSaver(TRUE);           // enable screen saver again

-

- return 0;

-}

-

-#else

-

-long GPUclose()                                        // LINUX CLOSE

-{

- GLcleanup();                                          // close OGL

-

- if(pGfxCardScreen) free(pGfxCardScreen);              // free helper memory

- pGfxCardScreen=0;

- #if defined (_MACGL)

- CloseDisplay();

- #else

- osd_close_display();                                  // destroy display

- #endif

- return 0;

-}

-

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// I shot the sheriff... last function called from emu 

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK GPUshutdown()

-{

- if(psxVSecure) free(psxVSecure);                      // kill emulated vram memory

- psxVSecure=0;

-

- return 0;

-}

-

-////////////////////////////////////////////////////////////////////////

-// paint it black: simple func to clean up optical border garbage

-////////////////////////////////////////////////////////////////////////

-

-void PaintBlackBorders(void)

-{

- short s;

-

- glDisable(GL_SCISSOR_TEST);

- if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}

- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}

- if(bBlendEnable)     {glDisable(GL_BLEND);bBlendEnable=FALSE;}

- glDisable(GL_ALPHA_TEST);

-

- glBegin(GL_QUADS);

-

- vertex[0].c.lcol=0xff000000;

- SETCOL(vertex[0]); 

-

- if(PreviousPSXDisplay.Range.x0)

-  {

-   s=PreviousPSXDisplay.Range.x0+1;

-   glVertex3f(0,0,0.99996f);

-   glVertex3f(0,PSXDisplay.DisplayMode.y,0.99996f);

-   glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);

-   glVertex3f(s,0,0.99996f);

-

-   s+=PreviousPSXDisplay.Range.x1-2;

-

-   glVertex3f(s,0,0.99996f);

-   glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);

-   glVertex3f(PSXDisplay.DisplayMode.x,PSXDisplay.DisplayMode.y,0.99996f);

-   glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);

-  }

-

- if(PreviousPSXDisplay.Range.y0)

-  {

-   s=PreviousPSXDisplay.Range.y0+1;

-   glVertex3f(0,0,0.99996f);

-   glVertex3f(0,s,0.99996f);

-   glVertex3f(PSXDisplay.DisplayMode.x,s,0.99996f);

-   glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);

-  }

-

- glEnd();

-

- glEnable(GL_ALPHA_TEST);

- glEnable(GL_SCISSOR_TEST);

-}

-

-////////////////////////////////////////////////////////////////////////

-// helper to draw scanlines

-////////////////////////////////////////////////////////////////////////

-

-__inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 

-                                    OGLVertex* vertex3, OGLVertex* vertex4) 

-{

-

- glBegin(GL_QUAD_STRIP);

-  glTexCoord2fv(&vertex1->sow);

-  glVertex3fv(&vertex1->x);

-  

-  glTexCoord2fv(&vertex2->sow);

-  glVertex3fv(&vertex2->x);

-  

-  glTexCoord2fv(&vertex4->sow);

-  glVertex3fv(&vertex4->x);

-  

-  glTexCoord2fv(&vertex3->sow);

-  glVertex3fv(&vertex3->x);

- glEnd();

-}

-

-////////////////////////////////////////////////////////////////////////

-// scanlines

-////////////////////////////////////////////////////////////////////////

-

-void SetScanLines(void)

-{

- glLoadIdentity();

- glOrtho(0,iResX,iResY, 0, -1, 1);

-

- if(bKeepRatio)

-  glViewport(0,0,iResX,iResY);

-

- glDisable(GL_SCISSOR_TEST);                       

- glDisable(GL_ALPHA_TEST);

- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}

-

- if(iScanBlend<0)                                      // special texture mask scanline mode

-  {

-   if(!bTexEnabled)    {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}

-   gTexName=gTexScanName;

-   glBindTexture(GL_TEXTURE_2D, gTexName);

-   if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    

-   if(!bBlendEnable)   {glEnable(GL_BLEND);bBlendEnable=TRUE;}

-   SetScanTexTrans();

-

-   vertex[0].x=0;

-   vertex[0].y=iResY;

-   vertex[0].z=0.99996f;

-

-   vertex[1].x=iResX;

-   vertex[1].y=iResY;

-   vertex[1].z=0.99996f;

-

-   vertex[2].x=iResX;

-   vertex[2].y=0;

-   vertex[2].z=0.99996f;

-

-   vertex[3].x=0;

-   vertex[3].y=0;

-   vertex[3].z=0.99996f;

-

-   vertex[0].sow=0;

-   vertex[0].tow=0;

-   vertex[1].sow=(float)iResX/4.0f;

-   vertex[1].tow=0;

-   vertex[2].sow=vertex[1].sow;

-   vertex[2].tow=(float)iResY/4.0f;

-   vertex[3].sow=0;

-   vertex[3].tow=vertex[2].tow;

-

-   vertex[0].c.lcol=0xffffffff;

-   SETCOL(vertex[0]); 

-

-   XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-

-   if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    

-  }

- else                                                  // typical line mode

-  {

-   if(bTexEnabled)     {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}

-

-   if(iScanBlend==0)

-    {

-     if(bBlendEnable)    {glDisable(GL_BLEND);bBlendEnable=FALSE;}

-     vertex[0].c.lcol=0xff000000;

-    }

-   else

-    {

-     if(!bBlendEnable)   {glEnable(GL_BLEND);bBlendEnable=TRUE;}

-     SetScanTrans();

-     vertex[0].c.lcol=iScanBlend<<24;

-    }

-

-   SETCOL(vertex[0]); 

-

-   glCallList(uiScanLine);

-  }

-

- glLoadIdentity();

- glOrtho(0,PSXDisplay.DisplayMode.x,

-         PSXDisplay.DisplayMode.y, 0, -1, 1);

-

- if(bKeepRatio)

-  glViewport(rRatioRect.left,

-             iResY-(rRatioRect.top+rRatioRect.bottom),

-             rRatioRect.right, 

-             rRatioRect.bottom);                         // init viewport

-

- glEnable(GL_ALPHA_TEST);

- glEnable(GL_SCISSOR_TEST);                       

-}

-

-////////////////////////////////////////////////////////////////////////

-// blur, babe, blur (heavy performance hit for a so-so fullscreen effect)

-////////////////////////////////////////////////////////////////////////

-

-void BlurBackBuffer(void)

-{

- if(!gTexBlurName) return;

-

- if(bKeepRatio) glViewport(0,0,iResX,iResY);

-

- glDisable(GL_SCISSOR_TEST);

- glDisable(GL_ALPHA_TEST);

- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}

- if(bBlendEnable)     {glDisable(GL_BLEND);bBlendEnable=FALSE;}

- if(!bTexEnabled)     {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}

- if(iZBufferDepth)    glDisable(GL_DEPTH_TEST);    

- if(bDrawDither)      glDisable(GL_DITHER); 

-

- gTexName=gTexBlurName;

- glBindTexture(GL_TEXTURE_2D, gTexName);

-

- glCopyTexSubImage2D( GL_TEXTURE_2D, 0,                // get back buffer in texture

-                      0,

-                      0,

-                      0,

-                      0,

-                      iResX,iResY);

-

- vertex[0].x=0;

- vertex[0].y=PSXDisplay.DisplayMode.y;

- vertex[1].x=PSXDisplay.DisplayMode.x;

- vertex[1].y=PSXDisplay.DisplayMode.y;

- vertex[2].x=PSXDisplay.DisplayMode.x;

- vertex[2].y=0;

- vertex[3].x=0;

- vertex[3].y=0;

- vertex[0].sow=0;

- vertex[0].tow=0;

-

-#ifdef OWNSCALE

- vertex[1].sow=((GLfloat)iFTexA)/256.0f;

- vertex[2].tow=((GLfloat)iFTexB)/256.0f;

-#else

- vertex[1].sow=iFTexA;

- vertex[2].tow=iFTexB;

-#endif

- vertex[1].tow=0;

- vertex[2].sow=vertex[1].sow;

- vertex[3].sow=0;

- vertex[3].tow=vertex[2].tow;

- 

- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    

- vertex[0].c.lcol=0x7fffffff;

- SETCOL(vertex[0]); 

-

- DrawMultiBlur();                                      // draw the backbuffer texture to create blur effect

-

- glEnable(GL_ALPHA_TEST);

- glEnable(GL_SCISSOR_TEST);

- if(iZBufferDepth)  glEnable(GL_DEPTH_TEST);    

- if(bDrawDither)    glEnable(GL_DITHER);    

- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    

-

- if(bKeepRatio)

-  glViewport(rRatioRect.left,                            // re-init viewport

-             iResY-(rRatioRect.top+rRatioRect.bottom),

-             rRatioRect.right, 

-             rRatioRect.bottom);            

-}

-

-////////////////////////////////////////////////////////////////////////

-// "unblur" repairs the backbuffer after a blur

-

-void UnBlurBackBuffer(void)

-{

- if(!gTexBlurName) return;

-

- if(bKeepRatio) glViewport(0,0,iResX,iResY);

-

- glDisable(GL_SCISSOR_TEST);

- glDisable(GL_ALPHA_TEST);

- if(bBlendEnable)    {glDisable(GL_BLEND);bBlendEnable=FALSE;}

- if(!bTexEnabled)    {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}

- if(iZBufferDepth)    glDisable(GL_DEPTH_TEST);    

- if(bDrawDither)      glDisable(GL_DITHER); 

-

- gTexName=gTexBlurName;

- glBindTexture(GL_TEXTURE_2D, gTexName);

-

- vertex[0].x=0;

- vertex[0].y=PSXDisplay.DisplayMode.y;

- vertex[1].x=PSXDisplay.DisplayMode.x;

- vertex[1].y=PSXDisplay.DisplayMode.y;

- vertex[2].x=PSXDisplay.DisplayMode.x;

- vertex[2].y=0;

- vertex[3].x=0;

- vertex[3].y=0;

- vertex[0].sow=0;

- vertex[0].tow=0;

-#ifdef OWNSCALE

- vertex[1].sow=((GLfloat)iFTexA)/256.0f;

- vertex[2].tow=((GLfloat)iFTexB)/256.0f;

-#else

- vertex[1].sow=iFTexA;

- vertex[2].tow=iFTexB;

-#endif

- vertex[1].tow=0;

- vertex[2].sow=vertex[1].sow;

- vertex[3].sow=0;

- vertex[3].tow=vertex[2].tow;

- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    

- vertex[0].c.lcol=0xffffffff;

- SETCOL(vertex[0]); 

-

- // simply draw the backbuffer texture (without blur)

- XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-

- glEnable(GL_ALPHA_TEST);

- glEnable(GL_SCISSOR_TEST);

- if(iZBufferDepth)  glEnable(GL_DEPTH_TEST);    

- if(bDrawDither)    glEnable(GL_DITHER);                  // dither mode

- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    

-

- if(bKeepRatio)

-  glViewport(rRatioRect.left,

-             iResY-(rRatioRect.top+rRatioRect.bottom),

-             rRatioRect.right, 

-             rRatioRect.bottom);                         // init viewport

-}

-

-////////////////////////////////////////////////////////////////////////

-// Update display (swap buffers)... called in interlaced mode on 

-// every emulated vsync, otherwise whenever the displayed screen region

-// has been changed

-////////////////////////////////////////////////////////////////////////

-

-int iLastRGB24=0;                                      // special vars for checking when to skip two display updates

-int iSkipTwo=0;

-

-void updateDisplay(void)                               // UPDATE DISPLAY

-{

- BOOL bBlur=FALSE;

-

-#ifdef _WINDOWS

- HDC hdc=GetDC(hWWindow);                              // windows:

- wglMakeCurrent(hdc,GLCONTEXT);                        // -> make context current again

-#endif

-#if defined (_MACGL)

-    BringContextForward();

-#endif

- bFakeFrontBuffer=FALSE;

- bRenderFrontBuffer=FALSE;

-

- if(iRenderFVR)                                        // frame buffer read fix mode still active?

-  {

-   iRenderFVR--;                                       // -> if some frames in a row without read access: turn off mode

-   if(!iRenderFVR) bFullVRam=FALSE;

-  }

-

- if(iLastRGB24 && iLastRGB24!=PSXDisplay.RGB24+1)      // (mdec) garbage check

-  {

-   iSkipTwo=2;                                         // -> skip two frames to avoid garbage if color mode changes

-  }

- iLastRGB24=0;

-

- if(PSXDisplay.RGB24)// && !bNeedUploadAfter)          // (mdec) upload wanted?

-  {

-   PrepareFullScreenUpload(-1);

-   UploadScreen(PSXDisplay.Interlaced);                // -> upload whole screen from psx vram

-   bNeedUploadTest=FALSE;

-   bNeedInterlaceUpdate=FALSE;

-   bNeedUploadAfter=FALSE;

-   bNeedRGB24Update=FALSE;

-  }

- else

- if(bNeedInterlaceUpdate)                              // smaller upload?

-  {

-   bNeedInterlaceUpdate=FALSE;

-   xrUploadArea=xrUploadAreaIL;                        // -> upload this rect

-   UploadScreen(TRUE);

-  }

-

- if(dwActFixes&512) bCheckFF9G4(NULL);                 // special game fix for FF9 

-

- if(PreviousPSXDisplay.Range.x0||                      // paint black borders around display area, if needed

-    PreviousPSXDisplay.Range.y0)

-  PaintBlackBorders();

-

- if(PSXDisplay.Disabled)                               // display disabled?

-  {

-   // moved here

-   glDisable(GL_SCISSOR_TEST);                       

-   glClearColor(0,0,0,128);                            // -> clear whole backbuffer

-   glClear(uiBufferBits);

-   glEnable(GL_SCISSOR_TEST);                       

-   gl_z=0.0f;

-   bDisplayNotSet = TRUE;

-  }

-

- if(iSkipTwo)                                          // we are in skipping mood?

-  {

-   iSkipTwo--;

-   iDrawnSomething=0;                                  // -> simply lie about something drawn

-  }

-

- if(iBlurBuffer && !bSkipNextFrame)                    // "blur display" activated?

-  {BlurBackBuffer();bBlur=TRUE;}                       // -> blur it

-

- if(iUseScanLines) SetScanLines();                     // "scan lines" activated? do it

-

- if(usCursorActive) ShowGunCursor();                   // "gun cursor" wanted? show 'em

-

- if(dwActFixes&128)                                    // special FPS limitation mode?

-  {

-   if(bUseFrameLimit) PCFrameCap();                    // -> ok, do it

-   if(bUseFrameSkip || ulKeybits&KEY_SHOWFPS)  

-    PCcalcfps();         

-  }

-

- if(gTexPicName) DisplayPic();                         // some gpu info picture active? display it

-

- if(bSnapShot) DoSnapShot();                           // snapshot key pressed? cheeeese :)

-

- if(ulKeybits&KEY_SHOWFPS)                             // wanna see FPS?

-  {

-   sprintf(szDispBuf,"%06.1f",fps_cur);

-   DisplayText();                                      // -> show it

-  }

-

- //----------------------------------------------------//

- // main buffer swapping (well, or skip it)

-

- if(bUseFrameSkip)                                     // frame skipping active ?

-  {

-   if(!bSkipNextFrame) 

-    {

-     if(iDrawnSomething)

-#ifdef _WINDOWS

-      SwapBuffers(wglGetCurrentDC());                  // -> to skip or not to skip

-#elif defined(_MACGL)

-        DoBufferSwap();

-#else

-      glXSwapBuffers(display,window);

-#endif

-    }

-   if(dwActFixes&0x180)                                // -> special old frame skipping: skip max one in a row

-    {

-     if((fps_skip < fFrameRateHz) && !(bSkipNextFrame)) 

-      {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}

-     else bSkipNextFrame = FALSE;

-    }

-   else FrameSkip();

-  }

- else                                                  // no skip ?

-  {

-   if(iDrawnSomething)

-#ifdef _WINDOWS

-    SwapBuffers(wglGetCurrentDC());                    // -> swap

-#elif defined(_MACGL)

-    DoBufferSwap();

-#else

-    glXSwapBuffers(display,window);

-#endif

-  }

-

- iDrawnSomething=0;

-

- //----------------------------------------------------//

-

- if(lClearOnSwap)                                      // clear buffer after swap?

-  {

-   GLclampf g,b,r;

-

-   if(bDisplayNotSet)                                  // -> set new vals

-    SetOGLDisplaySettings(1);

-

-   g=((GLclampf)GREEN(lClearOnSwapColor))/255.0f;      // -> get col

-   b=((GLclampf)BLUE(lClearOnSwapColor))/255.0f;

-   r=((GLclampf)RED(lClearOnSwapColor))/255.0f;

-   

-   glDisable(GL_SCISSOR_TEST);                       

-   glClearColor(r,g,b,128);                            // -> clear 

-   glClear(uiBufferBits);

-   glEnable(GL_SCISSOR_TEST);                       

-   lClearOnSwap=0;                                     // -> done

-  }

- else 

-  {

-   if(bBlur) UnBlurBackBuffer();                       // unblur buff, if blurred before

-

-   if(iZBufferDepth)                                   // clear zbuffer as well (if activated)

-    {

-     glDisable(GL_SCISSOR_TEST);                       

-     glClear(GL_DEPTH_BUFFER_BIT);

-     glEnable(GL_SCISSOR_TEST);                       

-    }

-  }

- gl_z=0.0f;

-

- //----------------------------------------------------//

- // additional uploads immediatly after swapping

-

- if(bNeedUploadAfter)                                  // upload wanted?

-  {

-   bNeedUploadAfter=FALSE;                           

-   bNeedUploadTest=FALSE;

-   UploadScreen(-1);                                   // -> upload

-  }

- 

- if(bNeedUploadTest)

-  {

-   bNeedUploadTest=FALSE;

-   if(PSXDisplay.InterlacedTest &&

-      //iOffscreenDrawing>2 &&

-      PreviousPSXDisplay.DisplayPosition.x==PSXDisplay.DisplayPosition.x &&

-      PreviousPSXDisplay.DisplayEnd.x==PSXDisplay.DisplayEnd.x &&

-      PreviousPSXDisplay.DisplayPosition.y==PSXDisplay.DisplayPosition.y &&

-      PreviousPSXDisplay.DisplayEnd.y==PSXDisplay.DisplayEnd.y)

-    {

-     PrepareFullScreenUpload(TRUE);

-     UploadScreen(TRUE);

-    }

-  }

-

- //----------------------------------------------------//

- // rumbling (main emu pad effect)

-

- if(iRumbleTime)                                       // shake screen by modifying view port

-  {

-   int i1=0,i2=0,i3=0,i4=0;

-

-   iRumbleTime--;

-   if(iRumbleTime) 

-    {

-     i1=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 

-     i2=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 

-     i3=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 

-     i4=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 

-    }

-

-   glViewport(rRatioRect.left+i1,                      

-              iResY-(rRatioRect.top+rRatioRect.bottom)+i2,

-              rRatioRect.right+i3, 

-              rRatioRect.bottom+i4);            

-  }

-

-#ifdef _WINDOWS

- ReleaseDC(hWWindow,hdc);                              // ! important !

-#endif

-

- if(ulKeybits&KEY_RESETTEXSTORE) ResetStuff();         // reset on gpu mode changes? do it before next frame is filled

-}

-

-////////////////////////////////////////////////////////////////////////

-// update front display: smaller update func, if something has changed 

-// in the frontbuffer... dirty, but hey... real men know no pain

-////////////////////////////////////////////////////////////////////////

-

-void updateFrontDisplay(void)

-{

- if(PreviousPSXDisplay.Range.x0||

-    PreviousPSXDisplay.Range.y0)

-  PaintBlackBorders();

-

- if(iBlurBuffer) BlurBackBuffer();

-

- if(iUseScanLines) SetScanLines();

-

- if(usCursorActive) ShowGunCursor();

-

- bFakeFrontBuffer=FALSE;

- bRenderFrontBuffer=FALSE;

-

- if(gTexPicName) DisplayPic();

- if(ulKeybits&KEY_SHOWFPS) DisplayText();

-

-#ifdef _WINDOWS

-  {                                                    // windows: 

-   HDC hdc=GetDC(hWWindow);

-   wglMakeCurrent(hdc,GLCONTEXT);                      // -> make current again

-   if(iDrawnSomething)

-    SwapBuffers(wglGetCurrentDC());                    // -> swap

-   ReleaseDC(hWWindow,hdc);                            // -> ! important !

-  }

-#elif defined (_MACGL)

-if (iDrawnSomething){

-    DoBufferSwap();

-    }

-#else

- if(iDrawnSomething)                                   // linux:

-  glXSwapBuffers(display,window);

-#endif

-

- if(iBlurBuffer) UnBlurBackBuffer();

-}

-                                             

-////////////////////////////////////////////////////////////////////////

-// check if update needed

-////////////////////////////////////////////////////////////////////////

-

-void ChangeDispOffsetsX(void)                          // CENTER X

-{

- int lx,l;short sO;

-

- if(!PSXDisplay.Range.x1) return;                      // some range given?

-

- l=PSXDisplay.DisplayMode.x;

-

- l*=(int)PSXDisplay.Range.x1;                          // some funky calculation

- l/=2560;lx=l;l&=0xfffffff8;

- 

- if(l==PreviousPSXDisplay.Range.x1) return;            // some change?

-

- sO=PreviousPSXDisplay.Range.x0;                       // store old

-

- if(lx>=PSXDisplay.DisplayMode.x)                      // range bigger?

-  {

-   PreviousPSXDisplay.Range.x1=                        // -> take display width

-    PSXDisplay.DisplayMode.x;

-   PreviousPSXDisplay.Range.x0=0;                      // -> start pos is 0

-  }

- else                                                  // range smaller? center it

-  {

-   PreviousPSXDisplay.Range.x1=l;                      // -> store width (8 pixel aligned)

-    PreviousPSXDisplay.Range.x0=                       // -> calc start pos

-    (PSXDisplay.Range.x0-500)/8;

-   if(PreviousPSXDisplay.Range.x0<0)                   // -> we don't support neg. values yet

-    PreviousPSXDisplay.Range.x0=0;

-

-   if((PreviousPSXDisplay.Range.x0+lx)>                // -> uhuu... that's too much

-      PSXDisplay.DisplayMode.x)

-    {

-     PreviousPSXDisplay.Range.x0=                      // -> adjust start

-      PSXDisplay.DisplayMode.x-lx;

-     PreviousPSXDisplay.Range.x1+=lx-l;                // -> adjust width

-    }                   

-  }

-

- if(sO!=PreviousPSXDisplay.Range.x0)                   // something changed?

-  {

-   bDisplayNotSet=TRUE;                                // -> recalc display stuff

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void ChangeDispOffsetsY(void)                          // CENTER Y

-{

- int iT;short sO;                                      // store previous y size

-

- if(PSXDisplay.PAL) iT=48; else iT=28;                 // different offsets on PAL/NTSC

-

- if(PSXDisplay.Range.y0>=iT)                           // crossed the security line? :)

-  {

-   PreviousPSXDisplay.Range.y1=                        // -> store width

-    PSXDisplay.DisplayModeNew.y;

-   

-   sO=(PSXDisplay.Range.y0-iT-4)*PSXDisplay.Double;    // -> calc offset

-   if(sO<0) sO=0;

-

-   PSXDisplay.DisplayModeNew.y+=sO;                    // -> add offset to y size, too

-  }

- else sO=0;                                            // else no offset

-

- if(sO!=PreviousPSXDisplay.Range.y0)                   // something changed?

-  {

-   PreviousPSXDisplay.Range.y0=sO;

-   bDisplayNotSet=TRUE;                                // -> recalc display stuff

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// Aspect ratio of ogl screen: simply adjusting ogl view port

-////////////////////////////////////////////////////////////////////////

-

-void SetAspectRatio(void)

-{

- float xs,ys,s;RECT r;

-

- if(!PSXDisplay.DisplayModeNew.x) return;

- if(!PSXDisplay.DisplayModeNew.y) return;

-

- xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;

- ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;

-

- s=min(xs,ys);

- r.right =(int)((float)PSXDisplay.DisplayModeNew.x*s);

- r.bottom=(int)((float)PSXDisplay.DisplayModeNew.y*s);

- if(r.right  > iResX) r.right  = iResX;

- if(r.bottom > iResY) r.bottom = iResY;

- if(r.right  < 1)     r.right  = 1;

- if(r.bottom < 1)     r.bottom = 1;

-

- r.left = (iResX-r.right)/2;

- r.top  = (iResY-r.bottom)/2;

-

- if(r.bottom<rRatioRect.bottom ||

-    r.right <rRatioRect.right)

-  {

-   RECT rC;

-   glClearColor(0,0,0,128);                         

-

-   if(r.right <rRatioRect.right)

-    {

-     rC.left=0;

-     rC.top=0;

-     rC.right=r.left;

-     rC.bottom=iResY;

-     glScissor(rC.left,rC.top,rC.right,rC.bottom);

-     glClear(uiBufferBits);

-     rC.left=iResX-rC.right;

-     glScissor(rC.left,rC.top,rC.right,rC.bottom);

-     glClear(uiBufferBits);

-    }

-

-   if(r.bottom <rRatioRect.bottom)

-    {

-     rC.left=0;

-     rC.top=0;

-     rC.right=iResX;

-     rC.bottom=r.top;

-     glScissor(rC.left,rC.top,rC.right,rC.bottom);

-     glClear(uiBufferBits);

-     rC.top=iResY-rC.bottom;

-     glScissor(rC.left,rC.top,rC.right,rC.bottom);

-     glClear(uiBufferBits);

-    }

-   

-   bSetClip=TRUE;

-   bDisplayNotSet=TRUE;

-  }

-

- rRatioRect=r;

-

-

- glViewport(rRatioRect.left,

-            iResY-(rRatioRect.top+rRatioRect.bottom),

-            rRatioRect.right,

-            rRatioRect.bottom);                         // init viewport

-}

-

-////////////////////////////////////////////////////////////////////////

-// big ass check, if an ogl swap buffer is needed

-////////////////////////////////////////////////////////////////////////

-

-void updateDisplayIfChanged(void)

-{

- BOOL bUp;

-

- if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) && 

-     (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))

-  {

-   if((PSXDisplay.RGB24      == PSXDisplay.RGB24New) && 

-      (PSXDisplay.Interlaced == PSXDisplay.InterlacedNew)) 

-      return;                                          // nothing has changed? fine, no swap buffer needed

-  }

- else                                                  // some res change?

-  {

-   glLoadIdentity();

-   glOrtho(0,PSXDisplay.DisplayModeNew.x,              // -> new psx resolution

-             PSXDisplay.DisplayModeNew.y, 0, -1, 1);

-   if(bKeepRatio) SetAspectRatio();

-  }

-

- bDisplayNotSet = TRUE;                                // re-calc offsets/display area

- 

- bUp=FALSE;

- if(PSXDisplay.RGB24!=PSXDisplay.RGB24New)             // clean up textures, if rgb mode change (usually mdec on/off)

-  {

-   PreviousPSXDisplay.RGB24=0;                         // no full 24 frame uploaded yet

-   ResetTextureArea(FALSE);

-   bUp=TRUE;

-  }

-

- PSXDisplay.RGB24         = PSXDisplay.RGB24New;       // get new infos

- PSXDisplay.DisplayMode.y = PSXDisplay.DisplayModeNew.y;

- PSXDisplay.DisplayMode.x = PSXDisplay.DisplayModeNew.x;

- PSXDisplay.Interlaced    = PSXDisplay.InterlacedNew;

-    

- PSXDisplay.DisplayEnd.x=                              // calc new ends

-  PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;

- PSXDisplay.DisplayEnd.y=

-  PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;

- PreviousPSXDisplay.DisplayEnd.x=

-  PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;

- PreviousPSXDisplay.DisplayEnd.y=

-  PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;

-

- ChangeDispOffsetsX();

-

- if(iFrameLimit==2) SetAutoFrameCap();                 // set new fps limit vals (depends on interlace)

-

- if(bUp) updateDisplay();                              // yeah, real update (swap buffer)

-}

-

-////////////////////////////////////////////////////////////////////////

-// window mode <-> fullscreen mode (windows)

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS

-void ChangeWindowMode(void)

- {

-  GPUclose();

-  bWindowMode=!bWindowMode;

-  GPUopen(hWWindow);

-  bChangeWinMode=FALSE;

- }

-#endif

-

-////////////////////////////////////////////////////////////////////////

-// swap update check (called by psx vsync function)

-////////////////////////////////////////////////////////////////////////

-

-BOOL bSwapCheck(void)

-{

- static int iPosCheck=0;

- static PSXPoint_t pO;

- static PSXPoint_t pD;

- static int iDoAgain=0;

-

- if(PSXDisplay.DisplayPosition.x==pO.x &&

-    PSXDisplay.DisplayPosition.y==pO.y &&

-    PSXDisplay.DisplayEnd.x==pD.x &&

-    PSXDisplay.DisplayEnd.y==pD.y)

-      iPosCheck++;

- else iPosCheck=0;

-

- pO=PSXDisplay.DisplayPosition;

- pD=PSXDisplay.DisplayEnd;

-

- if(iPosCheck<=4) return FALSE;

-

- iPosCheck=4;

-

- if(PSXDisplay.Interlaced) return FALSE;

-

- if (bNeedInterlaceUpdate||

-     bNeedRGB24Update ||

-     bNeedUploadAfter|| 

-     bNeedUploadTest || 

-     iDoAgain

-    )

-  {

-   iDoAgain=0;

-   if(bNeedUploadAfter) 

-    iDoAgain=1;

-   if(bNeedUploadTest && PSXDisplay.InterlacedTest)

-    iDoAgain=1;

-

-   bDisplayNotSet = TRUE;

-   updateDisplay();

-

-   PreviousPSXDisplay.DisplayPosition.x=PSXDisplay.DisplayPosition.x;

-   PreviousPSXDisplay.DisplayPosition.y=PSXDisplay.DisplayPosition.y;

-   PreviousPSXDisplay.DisplayEnd.x=PSXDisplay.DisplayEnd.x;

-   PreviousPSXDisplay.DisplayEnd.y=PSXDisplay.DisplayEnd.y;

-   pO=PSXDisplay.DisplayPosition;

-   pD=PSXDisplay.DisplayEnd;

-

-   return TRUE;

-  }

-

- return FALSE;

-} 

-

-////////////////////////////////////////////////////////////////////////

-// gun cursor func: player=0-7, x=0-511, y=0-255

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUcursor(int iPlayer,int x,int y)

-{

- if(iPlayer<0) return;

- if(iPlayer>7) return;

-

- usCursorActive|=(1<<iPlayer);

-

- if(x<0)              x=0;

- if(x>iGPUHeightMask) x=iGPUHeightMask;

- if(y<0)              y=0;

- if(y>255)            y=255;

-

- ptCursorPoint[iPlayer].x=x;

- ptCursorPoint[iPlayer].y=y;

-}

-

-////////////////////////////////////////////////////////////////////////

-// update lace is called every VSync. Basically we limit frame rate 

-// here, and in interlaced mode we swap ogl display buffers.

-////////////////////////////////////////////////////////////////////////

-

-static unsigned short usFirstPos=2;

-

-void CALLBACK GPUupdateLace(void)

-{

- //if(!(dwActFixes&0x1000))                               

- // STATUSREG^=0x80000000;                               // interlaced bit toggle, if the CC game fix is not active (see gpuReadStatus)

-

- if(!(dwActFixes&128))                                 // normal frame limit func

-  CheckFrameRate();

-

- if(iOffscreenDrawing==4)                              // special check if high offscreen drawing is on

-  {

-   if(bSwapCheck()) return;

-  }

-

- if(PSXDisplay.Interlaced)                             // interlaced mode?

-  {

-   STATUSREG^=0x80000000;

-   if(PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)

-    {

-     updateDisplay();                                  // -> swap buffers (new frame)

-    }

-  }

- else if(bRenderFrontBuffer)                           // no interlace mode? and some stuff in front has changed?

-  {

-   updateFrontDisplay();                               // -> update front buffer

-  }

- else if(usFirstPos==1)                                // initial updates (after startup)

-  {

-   updateDisplay();

-  }

-

-#if defined(_WINDOWS) || defined(_MACGL)

- if(bChangeWinMode) ChangeWindowMode();

-#endif

-}

-

-////////////////////////////////////////////////////////////////////////

-// process read request from GPU status register

-////////////////////////////////////////////////////////////////////////

-

-uint32_t CALLBACK GPUreadStatus(void)

-{

- if(dwActFixes&0x1000)                                 // CC game fix

-  {

-   static int iNumRead=0;

-   if((iNumRead++)==2)

-    {

-     iNumRead=0;

-     STATUSREG^=0x80000000;                            // interlaced bit toggle... we do it on every second read status... needed by some games (like ChronoCross)

-    }

-  }

-

- if(iFakePrimBusy)                                     // 27.10.2007 - emulating some 'busy' while drawing... pfff... not perfect, but since our emulated dma is not done in an extra thread...

-  {

-   iFakePrimBusy--;

-

-   if(iFakePrimBusy&1)                                 // we do a busy-idle-busy-idle sequence after/while drawing prims

-    {

-     GPUIsBusy;

-     GPUIsNotReadyForCommands;

-    }

-   else

-    {

-     GPUIsIdle;

-     GPUIsReadyForCommands;

-    }

-  }

-

- return STATUSREG | (vBlank ? 0x80000000 : 0 );;

-}

-

-////////////////////////////////////////////////////////////////////////

-// processes data send to GPU status register

-// these are always single packet commands.

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUwriteStatus(uint32_t gdata)

-{

- uint32_t lCommand=(gdata>>24)&0xff;

-

-#ifdef _WINDOWS

- if(bIsFirstFrame) GLinitialize();                     // real ogl startup (needed by some emus)

-#endif

-

- ulStatusControl[lCommand]=gdata;

-

- switch(lCommand)

-  {

-   //--------------------------------------------------//

-   // reset gpu

-   case 0x00:

-    memset(ulGPUInfoVals, 0x00, 16 * sizeof(uint32_t));

-    lGPUstatusRet = 0x14802000;

-    PSXDisplay.Disabled=1;

-    iDataWriteMode=iDataReadMode=DR_NORMAL;

-    PSXDisplay.DrawOffset.x=PSXDisplay.DrawOffset.y=0;

-    drawX=drawY=0;drawW=drawH=0;

-    sSetMask=0;lSetMask=0;bCheckMask=FALSE;iSetMask=0;

-    usMirror=0;

-    GlobalTextAddrX=0;GlobalTextAddrY=0;

-    GlobalTextTP=0;GlobalTextABR=0;

-    PSXDisplay.RGB24=FALSE;

-    PSXDisplay.Interlaced=FALSE;

-    bUsingTWin = FALSE;

-    return;

-

-   // dis/enable display

-   case 0x03:  

-    PreviousPSXDisplay.Disabled = PSXDisplay.Disabled;

-    PSXDisplay.Disabled = (gdata & 1);

-

-    if(PSXDisplay.Disabled) 

-         STATUSREG|=GPUSTATUS_DISPLAYDISABLED;

-    else STATUSREG&=~GPUSTATUS_DISPLAYDISABLED;

-

-    if (iOffscreenDrawing==4 &&

-         PreviousPSXDisplay.Disabled && 

-        !(PSXDisplay.Disabled))

-     {

-

-      if(!PSXDisplay.RGB24)

-       {

-        PrepareFullScreenUpload(TRUE);

-        UploadScreen(TRUE); 

-        updateDisplay();

-       }

-     }

-

-    return;

-

-   // setting transfer mode

-   case 0x04:

-    gdata &= 0x03;                                     // only want the lower two bits

-

-    iDataWriteMode=iDataReadMode=DR_NORMAL;

-    if(gdata==0x02) iDataWriteMode=DR_VRAMTRANSFER;

-    if(gdata==0x03) iDataReadMode =DR_VRAMTRANSFER;

-

-    STATUSREG&=~GPUSTATUS_DMABITS;                     // clear the current settings of the DMA bits

-    STATUSREG|=(gdata << 29);                          // set the DMA bits according to the received data

-

-    return;

-

-   // setting display position

-   case 0x05: 

-    {

-     short sx=(short)(gdata & 0x3ff);

-     short sy;

-

-     if(iGPUHeight==1024)

-      {

-       if(dwGPUVersion==2) 

-            sy = (short)((gdata>>12)&0x3ff);

-       else sy = (short)((gdata>>10)&0x3ff);

-      }

-     else sy = (short)((gdata>>10)&0x3ff);             // really: 0x1ff, but we adjust it later

-

-     if (sy & 0x200) 

-      {

-       sy|=0xfc00;

-       PreviousPSXDisplay.DisplayModeNew.y=sy/PSXDisplay.Double;

-       sy=0;

-      }

-     else PreviousPSXDisplay.DisplayModeNew.y=0;

-

-     if(sx>1000) sx=0;

-

-     if(usFirstPos)

-      {

-       usFirstPos--;

-       if(usFirstPos)

-        {

-         PreviousPSXDisplay.DisplayPosition.x = sx;

-         PreviousPSXDisplay.DisplayPosition.y = sy;

-         PSXDisplay.DisplayPosition.x = sx;

-         PSXDisplay.DisplayPosition.y = sy;

-        }

-      }

-

-     if(dwActFixes&8) 

-      {

-       if((!PSXDisplay.Interlaced) &&

-          PreviousPSXDisplay.DisplayPosition.x == sx  &&

-          PreviousPSXDisplay.DisplayPosition.y == sy)

-        return;

-

-       PSXDisplay.DisplayPosition.x = PreviousPSXDisplay.DisplayPosition.x;

-       PSXDisplay.DisplayPosition.y = PreviousPSXDisplay.DisplayPosition.y;

-       PreviousPSXDisplay.DisplayPosition.x = sx;

-       PreviousPSXDisplay.DisplayPosition.y = sy;

-      }

-     else

-      {

-       if((!PSXDisplay.Interlaced) &&

-          PSXDisplay.DisplayPosition.x == sx  &&

-          PSXDisplay.DisplayPosition.y == sy)

-        return;

-       PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;

-       PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;

-       PSXDisplay.DisplayPosition.x = sx;

-       PSXDisplay.DisplayPosition.y = sy;

-      }

-

-     PSXDisplay.DisplayEnd.x=

-      PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;

-     PSXDisplay.DisplayEnd.y=

-      PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;

-

-     PreviousPSXDisplay.DisplayEnd.x=

-      PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;

-     PreviousPSXDisplay.DisplayEnd.y=

-      PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;

-

-     bDisplayNotSet = TRUE;

-

-     if (!(PSXDisplay.Interlaced))

-      {

-       updateDisplay();

-      }

-     else

-     if(PSXDisplay.InterlacedTest && 

-        ((PreviousPSXDisplay.DisplayPosition.x != PSXDisplay.DisplayPosition.x)||

-         (PreviousPSXDisplay.DisplayPosition.y != PSXDisplay.DisplayPosition.y)))

-      PSXDisplay.InterlacedTest--;

- 

-     return;

-    }

-

-   // setting width

-   case 0x06:

-

-    PSXDisplay.Range.x0=gdata & 0x7ff;      //0x3ff;

-    PSXDisplay.Range.x1=(gdata>>12) & 0xfff;//0x7ff;

-

-    PSXDisplay.Range.x1-=PSXDisplay.Range.x0;

-

-    ChangeDispOffsetsX();

-

-    return;

-

-   // setting height

-   case 0x07:

-

-    PreviousPSXDisplay.Height = PSXDisplay.Height;

-

-    PSXDisplay.Range.y0=gdata & 0x3ff;

-    PSXDisplay.Range.y1=(gdata>>10) & 0x3ff;

-

-    PSXDisplay.Height = PSXDisplay.Range.y1 - 

-                        PSXDisplay.Range.y0 +

-                        PreviousPSXDisplay.DisplayModeNew.y;

-

-    if (PreviousPSXDisplay.Height != PSXDisplay.Height)

-     {

-      PSXDisplay.DisplayModeNew.y=PSXDisplay.Height*PSXDisplay.Double;

-      ChangeDispOffsetsY();

-      updateDisplayIfChanged();

-     }

-    return;

- 

-   // setting display infos

-   case 0x08:

-

-    PSXDisplay.DisplayModeNew.x = dispWidths[(gdata & 0x03) | ((gdata & 0x40) >> 4)];

-

-    if (gdata&0x04) PSXDisplay.Double=2;

-    else            PSXDisplay.Double=1;

-    PSXDisplay.DisplayModeNew.y = PSXDisplay.Height*PSXDisplay.Double;

-

-    ChangeDispOffsetsY();

-  

-    PSXDisplay.PAL           = (gdata & 0x08)?TRUE:FALSE; // if 1 - PAL mode, else NTSC

-    PSXDisplay.RGB24New      = (gdata & 0x10)?TRUE:FALSE; // if 1 - TrueColor

-    PSXDisplay.InterlacedNew = (gdata & 0x20)?TRUE:FALSE; // if 1 - Interlace

-

-    STATUSREG&=~GPUSTATUS_WIDTHBITS;                   // clear the width bits

-

-    STATUSREG|=

-               (((gdata & 0x03) << 17) | 

-               ((gdata & 0x40) << 10));                // set the width bits

-

-    PreviousPSXDisplay.InterlacedNew=FALSE;

-    if (PSXDisplay.InterlacedNew)

-     {

-      if(!PSXDisplay.Interlaced)

-       {

-        PSXDisplay.InterlacedTest=2;

-        PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;

-        PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;

-        PreviousPSXDisplay.InterlacedNew=TRUE;

-       }

-

-      STATUSREG|=GPUSTATUS_INTERLACED;

-     }

-    else 

-     {

-      PSXDisplay.InterlacedTest=0;

-      STATUSREG&=~GPUSTATUS_INTERLACED;

-     }

-

-    if (PSXDisplay.PAL)

-         STATUSREG|=GPUSTATUS_PAL;

-    else STATUSREG&=~GPUSTATUS_PAL;

-

-    if (PSXDisplay.Double==2)

-         STATUSREG|=GPUSTATUS_DOUBLEHEIGHT;

-    else STATUSREG&=~GPUSTATUS_DOUBLEHEIGHT;

-

-    if (PSXDisplay.RGB24New)

-         STATUSREG|=GPUSTATUS_RGB24;

-    else STATUSREG&=~GPUSTATUS_RGB24;

-

-    updateDisplayIfChanged();

-

-    return;

-

-   //--------------------------------------------------//

-   // ask about GPU version and other stuff

-   case 0x10: 

-

-    gdata&=0xff;

-

-    switch(gdata) 

-     {

-      case 0x02:

-       GPUdataRet=ulGPUInfoVals[INFO_TW];              // tw infos

-       return;

-      case 0x03:

-       GPUdataRet=ulGPUInfoVals[INFO_DRAWSTART];       // draw start

-       return;

-      case 0x04:

-       GPUdataRet=ulGPUInfoVals[INFO_DRAWEND];         // draw end

-       return;

-      case 0x05:

-      case 0x06:

-       GPUdataRet=ulGPUInfoVals[INFO_DRAWOFF];         // draw offset

-       return;

-      case 0x07:

-       if(dwGPUVersion==2)

-            GPUdataRet=0x01;

-       else GPUdataRet=0x02;                           // gpu type

-       return;

-      case 0x08:

-      case 0x0F:                                       // some bios addr?

-       GPUdataRet=0xBFC03720;

-       return;

-     }

-    return;

-   //--------------------------------------------------//

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// vram read/write helpers

-////////////////////////////////////////////////////////////////////////

-

-BOOL bNeedWriteUpload=FALSE;

-

-__inline void FinishedVRAMWrite(void)

-{

- if(bNeedWriteUpload)

-  {

-   bNeedWriteUpload=FALSE;

-   CheckWriteUpdate();

-  }

-

- // set register to NORMAL operation

- iDataWriteMode = DR_NORMAL;

-

- // reset transfer values, to prevent mis-transfer of data

- VRAMWrite.ColsRemaining = 0;

- VRAMWrite.RowsRemaining = 0;

-}

-

-__inline void FinishedVRAMRead(void)

-{

- // set register to NORMAL operation

- iDataReadMode = DR_NORMAL;

- // reset transfer values, to prevent mis-transfer of data

- VRAMRead.x = 0;

- VRAMRead.y = 0;

- VRAMRead.Width = 0;

- VRAMRead.Height = 0;

- VRAMRead.ColsRemaining = 0;

- VRAMRead.RowsRemaining = 0;

-

- // indicate GPU is no longer ready for VRAM data in the STATUS REGISTER

- STATUSREG&=~GPUSTATUS_READYFORVRAM;

-}

-

-////////////////////////////////////////////////////////////////////////

-// vram read check ex (reading from card's back/frontbuffer if needed...

-// slow!)

-////////////////////////////////////////////////////////////////////////

-

-void CheckVRamReadEx(int x, int y, int dx, int dy)

-{

- unsigned short sArea;

- int ux,uy,udx,udy,wx,wy;

- unsigned short * p1, *p2;

- float XS,YS;

- unsigned char * ps;

- unsigned char * px;

- unsigned short s,sx;

-

- if(STATUSREG&GPUSTATUS_RGB24) return;

-

- if(((dx  > PSXDisplay.DisplayPosition.x) &&

-     (x   < PSXDisplay.DisplayEnd.x) &&

-     (dy  > PSXDisplay.DisplayPosition.y) &&

-     (y   < PSXDisplay.DisplayEnd.y)))

-  sArea=0;

- else

- if((!(PSXDisplay.InterlacedTest) &&

-     (dx  > PreviousPSXDisplay.DisplayPosition.x) &&

-     (x   < PreviousPSXDisplay.DisplayEnd.x) &&

-     (dy  > PreviousPSXDisplay.DisplayPosition.y) &&

-     (y   < PreviousPSXDisplay.DisplayEnd.y)))

-  sArea=1;

- else 

-  {

-   return;

-  }

-

- //////////////

-

- if(iRenderFVR)

-  {

-   bFullVRam=TRUE;iRenderFVR=2;return;

-  }

- bFullVRam=TRUE;iRenderFVR=2;

-

- //////////////

-

- p2=0;

-

- if(sArea==0)

-  {

-   ux=PSXDisplay.DisplayPosition.x;

-   uy=PSXDisplay.DisplayPosition.y;

-   udx=PSXDisplay.DisplayEnd.x-ux;

-   udy=PSXDisplay.DisplayEnd.y-uy;

-   if((PreviousPSXDisplay.DisplayEnd.x-

-       PreviousPSXDisplay.DisplayPosition.x)==udx &&

-      (PreviousPSXDisplay.DisplayEnd.y-

-       PreviousPSXDisplay.DisplayPosition.y)==udy)

-    p2=(psxVuw + (1024*PreviousPSXDisplay.DisplayPosition.y) + 

-        PreviousPSXDisplay.DisplayPosition.x);

-  }

- else

-  {

-   ux=PreviousPSXDisplay.DisplayPosition.x;

-   uy=PreviousPSXDisplay.DisplayPosition.y;

-   udx=PreviousPSXDisplay.DisplayEnd.x-ux;

-   udy=PreviousPSXDisplay.DisplayEnd.y-uy;

-   if((PSXDisplay.DisplayEnd.x-

-       PSXDisplay.DisplayPosition.x)==udx &&

-      (PSXDisplay.DisplayEnd.y-

-       PSXDisplay.DisplayPosition.y)==udy)

-    p2=(psxVuw + (1024*PSXDisplay.DisplayPosition.y) + 

-        PSXDisplay.DisplayPosition.x);

-  }

-

- p1=(psxVuw + (1024*uy) + ux);

- if(p1==p2) p2=0;

-

- x=0;y=0;

- wx=dx=udx;wy=dy=udy;

-

- if(udx<=0) return;

- if(udy<=0) return;

- if(dx<=0)  return;

- if(dy<=0)  return;

- if(wx<=0)  return;

- if(wy<=0)  return;

-

- XS=(float)rRatioRect.right/(float)wx;

- YS=(float)rRatioRect.bottom/(float)wy;

-

- dx=(int)((float)(dx)*XS);

- dy=(int)((float)(dy)*YS);

-

- if(dx>iResX) dx=iResX;

- if(dy>iResY) dy=iResY;

-

- if(dx<=0) return;

- if(dy<=0) return;

-

- // ogl y adjust

- y=iResY-y-dy;

-

- x+=rRatioRect.left;

- y-=rRatioRect.top;

-

- if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;

-

- if(!pGfxCardScreen)

-  {

-   glPixelStorei(GL_PACK_ALIGNMENT,1);

-   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);

-  }

-

- ps=pGfxCardScreen;

- 

- if(!sArea) glReadBuffer(GL_FRONT);

-

- glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);

-               

- if(!sArea) glReadBuffer(GL_BACK);

-

- s=0;

-

- XS=(float)dx/(float)(udx);

- YS=(float)dy/(float)(udy+1);

-    

- for(y=udy;y>0;y--)

-  {

-   for(x=0;x<udx;x++)

-    {

-     if(p1>=psxVuw && p1<psxVuw_eom)

-      {

-       px=ps+(3*((int)((float)x * XS))+

-             (3*dx)*((int)((float)y*YS)));

-       sx=(*px)>>3;px++;

-       s=sx;

-       sx=(*px)>>3;px++;

-       s|=sx<<5;

-       sx=(*px)>>3;

-       s|=sx<<10;

-       s&=~0x8000;

-       *p1=s;

-      }

-     if(p2>=psxVuw && p2<psxVuw_eom) *p2=s;

-

-     p1++;

-     if(p2) p2++;

-    }

-

-   p1 += 1024 - udx;

-   if(p2) p2 += 1024 - udx;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// vram read check (reading from card's back/frontbuffer if needed... 

-// slow!)

-////////////////////////////////////////////////////////////////////////

-

-void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront)

-{

- unsigned short sArea;unsigned short * p;

- int ux,uy,udx,udy,wx,wy;float XS,YS;

- unsigned char * ps, * px;

- unsigned short s=0,sx;

-

- if(STATUSREG&GPUSTATUS_RGB24) return;

-

- if(((dx  > PSXDisplay.DisplayPosition.x) &&

-     (x   < PSXDisplay.DisplayEnd.x) &&

-     (dy  > PSXDisplay.DisplayPosition.y) &&

-     (y   < PSXDisplay.DisplayEnd.y)))

-  sArea=0;

- else

- if((!(PSXDisplay.InterlacedTest) &&

-     (dx  > PreviousPSXDisplay.DisplayPosition.x) &&

-     (x   < PreviousPSXDisplay.DisplayEnd.x) &&

-     (dy  > PreviousPSXDisplay.DisplayPosition.y) &&

-     (y   < PreviousPSXDisplay.DisplayEnd.y)))

-  sArea=1;

- else 

-  {

-   return;

-  }

-

- if(dwActFixes&0x40)

-  {

-   if(iRenderFVR)

-    {

-     bFullVRam=TRUE;iRenderFVR=2;return;

-    }

-   bFullVRam=TRUE;iRenderFVR=2;

-  }

-

- ux=x;uy=y;udx=dx;udy=dy;

-

- if(sArea==0)

-  {

-   x -=PSXDisplay.DisplayPosition.x;

-   dx-=PSXDisplay.DisplayPosition.x;

-   y -=PSXDisplay.DisplayPosition.y;

-   dy-=PSXDisplay.DisplayPosition.y;

-   wx=PSXDisplay.DisplayEnd.x-PSXDisplay.DisplayPosition.x;

-   wy=PSXDisplay.DisplayEnd.y-PSXDisplay.DisplayPosition.y;

-  }

- else

-  {

-   x -=PreviousPSXDisplay.DisplayPosition.x;

-   dx-=PreviousPSXDisplay.DisplayPosition.x;

-   y -=PreviousPSXDisplay.DisplayPosition.y;

-   dy-=PreviousPSXDisplay.DisplayPosition.y;

-   wx=PreviousPSXDisplay.DisplayEnd.x-PreviousPSXDisplay.DisplayPosition.x;

-   wy=PreviousPSXDisplay.DisplayEnd.y-PreviousPSXDisplay.DisplayPosition.y;

-  }

- if(x<0) {ux-=x;x=0;}

- if(y<0) {uy-=y;y=0;}

- if(dx>wx) {udx-=(dx-wx);dx=wx;}

- if(dy>wy) {udy-=(dy-wy);dy=wy;}

- udx-=ux;

- udy-=uy;

-  

- p=(psxVuw + (1024*uy) + ux);

-

- if(udx<=0) return;

- if(udy<=0) return;

- if(dx<=0)  return;

- if(dy<=0)  return;

- if(wx<=0)  return;

- if(wy<=0)  return;

-

- XS=(float)rRatioRect.right/(float)wx;

- YS=(float)rRatioRect.bottom/(float)wy;

-

- dx=(int)((float)(dx)*XS);

- dy=(int)((float)(dy)*YS);

- x=(int)((float)x*XS);

- y=(int)((float)y*YS);

-

- dx-=x;

- dy-=y;

-

- if(dx>iResX) dx=iResX;

- if(dy>iResY) dy=iResY;

-

- if(dx<=0) return;

- if(dy<=0) return;

-

- // ogl y adjust

- y=iResY-y-dy;

-

- x+=rRatioRect.left;

- y-=rRatioRect.top;

-

- if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;

-

- if(!pGfxCardScreen)

-  {

-   glPixelStorei(GL_PACK_ALIGNMENT,1);

-   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);

-  }

-

- ps=pGfxCardScreen;

- 

- if(bFront) glReadBuffer(GL_FRONT);

-

- glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);

-               

- if(bFront) glReadBuffer(GL_BACK);

-

- XS=(float)dx/(float)(udx);

- YS=(float)dy/(float)(udy+1);

-    

- for(y=udy;y>0;y--)

-  {

-   for(x=0;x<udx;x++)

-    {

-     if(p>=psxVuw && p<psxVuw_eom)

-      {

-       px=ps+(3*((int)((float)x * XS))+

-             (3*dx)*((int)((float)y*YS)));

-       sx=(*px)>>3;px++;

-       s=sx;

-       sx=(*px)>>3;px++;

-       s|=sx<<5;

-       sx=(*px)>>3;

-       s|=sx<<10;

-       s&=~0x8000;

-       *p=s;

-      }

-     p++;

-    }

-   p += 1024 - udx;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// core read from vram

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUreadDataMem(uint32_t *pMem, int iSize)

-{

- int i;

-

- if(iDataReadMode!=DR_VRAMTRANSFER) return;

-

- GPUIsBusy;

-

- // adjust read ptr, if necessary

- while(VRAMRead.ImagePtr>=psxVuw_eom)

-  VRAMRead.ImagePtr-=iGPUHeight*1024;

- while(VRAMRead.ImagePtr<psxVuw)

-  VRAMRead.ImagePtr+=iGPUHeight*1024;

-

- if((iFrameReadType&1 && iSize>1) &&

-    !(iDrawnSomething==2 &&

-      VRAMRead.x      == VRAMWrite.x     &&

-      VRAMRead.y      == VRAMWrite.y     &&

-      VRAMRead.Width  == VRAMWrite.Width &&

-      VRAMRead.Height == VRAMWrite.Height))

-  CheckVRamRead(VRAMRead.x,VRAMRead.y,

-                VRAMRead.x+VRAMRead.RowsRemaining,

-                VRAMRead.y+VRAMRead.ColsRemaining,

-                TRUE);

-

- for(i=0;i<iSize;i++)

-  {

-   // do 2 seperate 16bit reads for compatibility (wrap issues)

-   if ((VRAMRead.ColsRemaining > 0) && (VRAMRead.RowsRemaining > 0))

-    {

-     // lower 16 bit

-     GPUdataRet=(uint32_t)*VRAMRead.ImagePtr;

-

-     VRAMRead.ImagePtr++;

-     if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;

-     VRAMRead.RowsRemaining --;

-

-     if(VRAMRead.RowsRemaining<=0)

-      {

-       VRAMRead.RowsRemaining = VRAMRead.Width;

-       VRAMRead.ColsRemaining--;

-       VRAMRead.ImagePtr += 1024 - VRAMRead.Width;

-       if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;

-      }

-

-     // higher 16 bit (always, even if it's an odd width)

-     GPUdataRet|=(uint32_t)(*VRAMRead.ImagePtr)<<16;

-     *pMem++=GPUdataRet;

-

-     if(VRAMRead.ColsRemaining <= 0)

-      {FinishedVRAMRead();goto ENDREAD;}

-

-     VRAMRead.ImagePtr++;

-     if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;

-     VRAMRead.RowsRemaining--;

-     if(VRAMRead.RowsRemaining<=0)

-      {

-       VRAMRead.RowsRemaining = VRAMRead.Width;

-       VRAMRead.ColsRemaining--;

-       VRAMRead.ImagePtr += 1024 - VRAMRead.Width;

-       if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;

-      }

-     if(VRAMRead.ColsRemaining <= 0)

-      {FinishedVRAMRead();goto ENDREAD;}

-    }

-   else {FinishedVRAMRead();goto ENDREAD;}

-  }

-

-ENDREAD:

- GPUIsIdle;

-}

-

-uint32_t CALLBACK GPUreadData(void)

-{

- uint32_t l;

- GPUreadDataMem(&l,1);

- return GPUdataRet;

-}

-

-////////////////////////////////////////////////////////////////////////

-// helper table to know how much data is used by drawing commands

-////////////////////////////////////////////////////////////////////////

-

-const unsigned char primTableCX[256] =

-{

-    // 00

-    0,0,3,0,0,0,0,0,

-    // 08

-    0,0,0,0,0,0,0,0,

-    // 10

-    0,0,0,0,0,0,0,0,

-    // 18

-    0,0,0,0,0,0,0,0,

-    // 20

-    4,4,4,4,7,7,7,7,

-    // 28

-    5,5,5,5,9,9,9,9,

-    // 30

-    6,6,6,6,9,9,9,9,

-    // 38

-    8,8,8,8,12,12,12,12,

-    // 40

-    3,3,3,3,0,0,0,0,

-    // 48

-//    5,5,5,5,6,6,6,6,      //FLINE

-    254,254,254,254,254,254,254,254,

-    // 50

-    4,4,4,4,0,0,0,0,

-    // 58

-//    7,7,7,7,9,9,9,9,    //    LINEG3    LINEG4

-    255,255,255,255,255,255,255,255,

-    // 60

-    3,3,3,3,4,4,4,4,    //    TILE    SPRT

-    // 68

-    2,2,2,2,3,3,3,3,    //    TILE1

-    // 70

-    2,2,2,2,3,3,3,3,

-    // 78

-    2,2,2,2,3,3,3,3,

-    // 80

-    4,0,0,0,0,0,0,0,

-    // 88

-    0,0,0,0,0,0,0,0,

-    // 90

-    0,0,0,0,0,0,0,0,

-    // 98

-    0,0,0,0,0,0,0,0,

-    // a0

-    3,0,0,0,0,0,0,0,

-    // a8

-    0,0,0,0,0,0,0,0,

-    // b0

-    0,0,0,0,0,0,0,0,

-    // b8

-    0,0,0,0,0,0,0,0,

-    // c0

-    3,0,0,0,0,0,0,0,

-    // c8

-    0,0,0,0,0,0,0,0,

-    // d0

-    0,0,0,0,0,0,0,0,

-    // d8

-    0,0,0,0,0,0,0,0,

-    // e0

-    0,1,1,1,1,1,1,0,

-    // e8

-    0,0,0,0,0,0,0,0,

-    // f0

-    0,0,0,0,0,0,0,0,

-    // f8

-    0,0,0,0,0,0,0,0

-};

-

-////////////////////////////////////////////////////////////////////////

-// processes data send to GPU data register

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUwriteDataMem(uint32_t *pMem, int iSize)

-{

- unsigned char command;

- uint32_t gdata=0;

- int i=0;

- GPUIsBusy;

- GPUIsNotReadyForCommands;

-

-STARTVRAM:

-

- if(iDataWriteMode==DR_VRAMTRANSFER)

-  {

-   // make sure we are in vram

-   while(VRAMWrite.ImagePtr>=psxVuw_eom)

-    VRAMWrite.ImagePtr-=iGPUHeight*1024;

-   while(VRAMWrite.ImagePtr<psxVuw)

-    VRAMWrite.ImagePtr+=iGPUHeight*1024;

-

-   // now do the loop

-   while(VRAMWrite.ColsRemaining>0)

-    {

-     while(VRAMWrite.RowsRemaining>0)

-      {

-       if(i>=iSize) {goto ENDVRAM;}

-       i++;

-

-       gdata=*pMem++;

-

-       *VRAMWrite.ImagePtr++ = (unsigned short)gdata;

-       if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;

-       VRAMWrite.RowsRemaining --;

-

-       if(VRAMWrite.RowsRemaining <= 0)

-        {

-         VRAMWrite.ColsRemaining--;

-         if (VRAMWrite.ColsRemaining <= 0)             // last pixel is odd width

-          {

-           gdata=(gdata&0xFFFF)|(((uint32_t)(*VRAMWrite.ImagePtr))<<16);

-           FinishedVRAMWrite();

-           goto ENDVRAM;

-          }

-         VRAMWrite.RowsRemaining = VRAMWrite.Width;

-         VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;

-        }

-

-       *VRAMWrite.ImagePtr++ = (unsigned short)(gdata>>16);

-       if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;

-       VRAMWrite.RowsRemaining --;

-      }

-

-     VRAMWrite.RowsRemaining = VRAMWrite.Width;

-     VRAMWrite.ColsRemaining--;

-     VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;

-    }

-

-   FinishedVRAMWrite();

-  }

-

-ENDVRAM:

-

- if(iDataWriteMode==DR_NORMAL)

-  {

-   void (* *primFunc)(unsigned char *);

-   if(bSkipNextFrame) primFunc=primTableSkip;

-   else               primFunc=primTableJ;

-

-   for(;i<iSize;)

-    {

-     if(iDataWriteMode==DR_VRAMTRANSFER) goto STARTVRAM;

-

-     gdata=*pMem++;i++;

- 

-     if(gpuDataC == 0)

-      {

-       command = (unsigned char)((gdata>>24) & 0xff);

- 

-       if(primTableCX[command])

-        {

-         gpuDataC = primTableCX[command];

-         gpuCommand = command;

-         gpuDataM[0] = gdata;

-         gpuDataP = 1;

-        }

-       else continue;

-      }

-     else

-      {

-       gpuDataM[gpuDataP] = gdata;

-       if(gpuDataC>128)

-        {

-         if((gpuDataC==254 && gpuDataP>=3) ||

-            (gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))

-          {

-           if((gpuDataM[gpuDataP] & 0xF000F000) == 0x50005000)

-            gpuDataP=gpuDataC-1;

-          }

-        }

-       gpuDataP++;

-      }

- 

-     if(gpuDataP == gpuDataC)

-      {

-       gpuDataC=gpuDataP=0;

-       primFunc[gpuCommand]((unsigned char *)gpuDataM);

-

-       if(dwEmuFixes&0x0001 || dwActFixes&0x20000)     // hack for emulating "gpu busy" in some games

-        iFakePrimBusy=4;

-      }

-    } 

-  }

-

- GPUdataRet=gdata;

-

- GPUIsReadyForCommands;

- GPUIsIdle;                

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUwriteData(uint32_t gdata)

-{

- GPUwriteDataMem(&gdata,1);

-}

-

-////////////////////////////////////////////////////////////////////////

-// call config dlg

-////////////////////////////////////////////////////////////////////////

-

-#ifdef _WINDOWS

-

-long CALLBACK GPUconfigure(void)

-{

- HWND hWP=GetActiveWindow();

- DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),

-           hWP,(DLGPROC)CfgDlgProc);

-

- return 0;

-}

-

-#elif defined(_MACGL)

-long CALLBACK GPUconfigure(void)

-{

- DlgProc();

-   return 0;

-}

-#else

-

-void StartCfgTool(char *arg) // linux: start external cfg tool

-{

-	char cfg[256];

-	struct stat buf;

-

-	strcpy(cfg, "./cfgpeopsxgl");

-	if (stat(cfg, &buf) != -1) {

-		if (fork() == 0) {

-			execl(cfg, "cfgpeopsxgl", arg, NULL);

-			exit(0);

-		}

-		return;

-	}

-

-	strcpy(cfg, "./cfg/cfgpeopsxgl");

-	if (stat(cfg, &buf) != -1) {

-		if (fork() == 0) {

-			execl(cfg, "cfgpeopsxgl", arg, NULL);

-			exit(0);

-		}

-		return;

-	}

-

-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME"));

-	if (stat(cfg, &buf) != -1) {

-		if (fork() == 0) {

-			execl(cfg, "cfgpeopsxgl", arg, NULL);

-			exit(0);

-		}

-		return;

-	}

-

-	printf("ERROR: cfgpeopsxgl file not found!\n");

-}

-

-long CALLBACK GPUconfigure(void)

-{

- StartCfgTool("CFG");

- return 0;

-}

-

-#endif // def _WINDOWS / _MACGL

-

-////////////////////////////////////////////////////////////////////////

-// sets all kind of act fixes

-////////////////////////////////////////////////////////////////////////

-

-void SetFixes(void)

-{

- ReInitFrameCap();

-

- if(dwActFixes & 0x2000) 

-      dispWidths[4]=384;

- else dispWidths[4]=368;

-}

-

-////////////////////////////////////////////////////////////////////////

-// Pete Special: make an 'intelligent' dma chain check (<-Tekken3)

-////////////////////////////////////////////////////////////////////////

-

-uint32_t lUsedAddr[3];

-

-__inline BOOL CheckForEndlessLoop(uint32_t laddr)

-{

- if(laddr==lUsedAddr[1]) return TRUE;

- if(laddr==lUsedAddr[2]) return TRUE;

-

- if(laddr<lUsedAddr[0]) lUsedAddr[1]=laddr;

- else                   lUsedAddr[2]=laddr;

- lUsedAddr[0]=laddr;

- return FALSE;

-}

-

-////////////////////////////////////////////////////////////////////////

-// core gives a dma chain to gpu: same as the gpuwrite interface funcs

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK GPUdmaChain(uint32_t *baseAddrL, uint32_t addr)

-{

- uint32_t dmaMem;

- unsigned char * baseAddrB;

- short count;unsigned int DMACommandCounter = 0;

-

- if(bIsFirstFrame) GLinitialize();

-

- GPUIsBusy;

-

- lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;

-

- baseAddrB = (unsigned char*) baseAddrL;

-

- do

-  {

-   if(iGPUHeight==512) addr&=0x1FFFFC;

-

-   if(DMACommandCounter++ > 2000000) break;

-   if(CheckForEndlessLoop(addr)) break;

-

-   count = baseAddrB[addr+3];

-

-   dmaMem=addr+4;

-

-   if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);

-

-   addr = baseAddrL[addr>>2]&0xffffff;

-  }

- while (addr != 0xffffff);

-

- GPUIsIdle;

-

- return 0;

-}

-           

-////////////////////////////////////////////////////////////////////////

-// show about dlg

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUabout(void)

-{

-#ifdef _WINDOWS

- HWND hWP=GetActiveWindow();                           // to be sure

- DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT),

-           hWP,(DLGPROC)AboutDlgProc);

-#elif defined(_MACGL)

-

-    AboutDlgProc();

-#else

-

- StartCfgTool("ABOUT");

-

-#endif

-}

-

-////////////////////////////////////////////////////////////////////////

-// We are ever fine ;)

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK GPUtest(void)

-{

- // if test fails this function should return negative value for error (unable to continue)

- // and positive value for warning (can continue but output might be crappy)

-

- return 0;

-}

-

-////////////////////////////////////////////////////////////////////////

-// save state funcs

-////////////////////////////////////////////////////////////////////////

-

-typedef struct GPUFREEZETAG

-{

- uint32_t ulFreezeVersion;      // should be always 1 for now (set by main emu)

- uint32_t ulStatus;             // current gpu status

- uint32_t ulControl[256];       // latest control register values

- unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN)

-} GPUFreeze_t;

-

-////////////////////////////////////////////////////////////////////////

-

-long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)

-{

- if(ulGetFreezeData==2) 

-  {

-   int lSlotNum=*((int *)pF);

-   if(lSlotNum<0) return 0;

-   if(lSlotNum>8) return 0;

-   lSelectedSlot=lSlotNum+1;

-   return 1;

-  }

-

- if(!pF)                    return 0; 

- if(pF->ulFreezeVersion!=1) return 0;

-

- if(ulGetFreezeData==1)

-  {

-   pF->ulStatus=STATUSREG;

-   memcpy(pF->ulControl,ulStatusControl,256*sizeof(uint32_t));

-   memcpy(pF->psxVRam,  psxVub,         1024*iGPUHeight*2);

-

-   return 1;

-  }

-

- if(ulGetFreezeData!=0) return 0;

-

- STATUSREG=pF->ulStatus;

- memcpy(ulStatusControl,pF->ulControl,256*sizeof(uint32_t));

- memcpy(psxVub,         pF->psxVRam,  1024*iGPUHeight*2);

-

- ResetTextureArea(TRUE);

-

- GPUwriteStatus(ulStatusControl[0]);

- GPUwriteStatus(ulStatusControl[1]);

- GPUwriteStatus(ulStatusControl[2]);

- GPUwriteStatus(ulStatusControl[3]);

- GPUwriteStatus(ulStatusControl[8]);

- GPUwriteStatus(ulStatusControl[6]);

- GPUwriteStatus(ulStatusControl[7]);

- GPUwriteStatus(ulStatusControl[5]);

- GPUwriteStatus(ulStatusControl[4]);

-

- return 1;

-}

-

-////////////////////////////////////////////////////////////////////////

-// special "emu infos" / "emu effects" functions

-////////////////////////////////////////////////////////////////////////

-

-//00 = black

-//01 = white

-//10 = red

-//11 = transparent

-

-unsigned char cFont[10][120]=

-{

-// 0

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 1

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x05,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x05,0x55,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 2

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x01,0x40,0x00,0x00,

- 0x80,0x00,0x05,0x00,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x15,0x55,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 3

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x01,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 4

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x54,0x00,0x00,

- 0x80,0x00,0x01,0x54,0x00,0x00,

- 0x80,0x00,0x01,0x54,0x00,0x00,

- 0x80,0x00,0x05,0x14,0x00,0x00,

- 0x80,0x00,0x14,0x14,0x00,0x00,

- 0x80,0x00,0x15,0x55,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x55,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 5

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x15,0x55,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x15,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 6

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x01,0x54,0x00,0x00,

- 0x80,0x00,0x05,0x00,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x14,0x00,0x00,0x00,

- 0x80,0x00,0x15,0x54,0x00,0x00,

- 0x80,0x00,0x15,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 7

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x15,0x55,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x50,0x00,0x00,

- 0x80,0x00,0x01,0x40,0x00,0x00,

- 0x80,0x00,0x01,0x40,0x00,0x00,

- 0x80,0x00,0x05,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 8

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-},

-// 9

-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x05,0x54,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x05,0x00,0x00,

- 0x80,0x00,0x14,0x15,0x00,0x00,

- 0x80,0x00,0x05,0x55,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x05,0x00,0x00,

- 0x80,0x00,0x00,0x14,0x00,0x00,

- 0x80,0x00,0x05,0x50,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0x80,0x00,0x00,0x00,0x00,0x00,

- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa

-}

-};

-

-////////////////////////////////////////////////////////////////////////

-

-void PaintPicDot(unsigned char * p,unsigned char c)

-{

- if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}

- if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}

- if(c==2) {*p++=0x00;*p++=0x00;*p=0xff;return;}

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUgetScreenPic(unsigned char * pMem)

-{

- float XS,YS;int x,y,v;

- unsigned char * ps, * px, * pf;

- unsigned char c;

-

- if(!pGfxCardScreen)

-  {

-   glPixelStorei(GL_PACK_ALIGNMENT,1);

-   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);

-  }

-

- ps=pGfxCardScreen;

-

- glReadBuffer(GL_FRONT);

-

- glReadPixels(0,0,iResX,iResY,GL_RGB,GL_UNSIGNED_BYTE,ps);

-               

- glReadBuffer(GL_BACK);

-

- XS=(float)iResX/128;

- YS=(float)iResY/96;

- pf=pMem;

-

- for(y=96;y>0;y--)

-  {

-   for(x=0;x<128;x++)

-    {

-     px=ps+(3*((int)((float)x * XS))+

-           (3*iResX)*((int)((float)y*YS)));

-     *(pf+0)=*(px+2);

-     *(pf+1)=*(px+1);

-     *(pf+2)=*(px+0);

-     pf+=3;

-    }

-  }

-

- /////////////////////////////////////////////////////////////////////

- // generic number/border painter

-

- pf=pMem+(103*3);

-

- for(y=0;y<20;y++)

-  {

-   for(x=0;x<6;x++)

-    {

-     c=cFont[lSelectedSlot][x+y*6];

-     v=(c&0xc0)>>6;

-     PaintPicDot(pf,(unsigned char)v);pf+=3;                // paint the dots into the rect

-     v=(c&0x30)>>4;

-     PaintPicDot(pf,(unsigned char)v);pf+=3;

-     v=(c&0x0c)>>2;

-     PaintPicDot(pf,(unsigned char)v);pf+=3;

-     v=c&0x03;

-     PaintPicDot(pf,(unsigned char)v);pf+=3;

-    }

-   pf+=104*3;

-  }

-

- pf=pMem;

- for(x=0;x<128;x++)

-  {

-   *(pf+(95*128*3))=0x00;*pf++=0x00;

-   *(pf+(95*128*3))=0x00;*pf++=0x00;

-   *(pf+(95*128*3))=0xff;*pf++=0xff;

-  }

- pf=pMem;

- for(y=0;y<96;y++)

-  {

-   *(pf+(127*3))=0x00;*pf++=0x00;

-   *(pf+(127*3))=0x00;*pf++=0x00;

-   *(pf+(127*3))=0xff;*pf++=0xff;

-   pf+=127*3;

-  }

-

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUshowScreenPic(unsigned char * pMem)

-{

- DestroyPic();

- if(pMem==0) return;

- CreatePic(pMem);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUsetfix(uint32_t dwFixBits)

-{

- dwEmuFixes=dwFixBits;

-}

-

-////////////////////////////////////////////////////////////////////////

- 

-void CALLBACK GPUvisualVibration(uint32_t iSmall, uint32_t iBig)

-{

- int iVibVal;

-

- if(PSXDisplay.DisplayModeNew.x)                       // calc min "shake pixel" from screen width

-      iVibVal=max(1,iResX/PSXDisplay.DisplayModeNew.x);

- else iVibVal=1;

-                                                       // big rumble: 4...15 sp ; small rumble 1...3 sp

- if(iBig) iRumbleVal=max(4*iVibVal,min(15*iVibVal,((int)iBig  *iVibVal)/10));

- else     iRumbleVal=max(1*iVibVal,min( 3*iVibVal,((int)iSmall*iVibVal)/10));

-

- srand(timeGetTime());                                 // init rand (will be used in BufferSwap)

-

- iRumbleTime=15;                                       // let the rumble last 16 buffer swaps

-}

-                                                       

-////////////////////////////////////////////////////////////////////////

-// main emu can set display infos (A/M/G/D) 

-////////////////////////////////////////////////////////////////////////

-

-void CALLBACK GPUdisplayFlags(uint32_t dwFlags)

-{

- dwCoreFlags=dwFlags;

-}

-

-void CALLBACK GPUvBlank( int val )

-{

-    vBlank = val;

-}

+/***************************************************************************
+                           gpu.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+// !!! enable this, if Linux XF86VidMode is not supported: 
+//#define NOVMODE
+
+#include "stdafx.h"
+
+#if !defined(_MACGL) && !defined(_WINDOWS)
+
+#include "config.h"
+
+#ifndef NOVMODE
+#include <X11/extensions/xf86vmode.h>
+static XF86VidModeModeInfo **modes=0;
+static int iOldMode=0;
+#endif
+
+#endif
+
+#define _IN_GPU
+
+#include "externals.h"
+#include "psemu_plugin_defs.h"
+#include "gpu.h"
+#include "draw.h"
+#include "cfg.h"
+#include "prim.h"
+#include "psemu_plugin_defs.h"
+#include "texture.h"
+#include "menu.h"
+#include "fps.h"
+#include "key.h"
+#ifdef _WINDOWS
+#include "resource.h"
+#include "ssave.h"
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// PPDK developer must change libraryName field and can change revision and build
+////////////////////////////////////////////////////////////////////////
+
+const  unsigned char version  = 1;    // do not touch - library for PSEmu 1.x
+const  unsigned char revision = 1;
+const  unsigned char build    = 78;
+
+static char *libraryName     = N_("OpenGL Driver");
+
+static char *PluginAuthor    = N_("Pete Bernert");
+#if 0
+static char *libraryInfo     = N_("Based on P.E.Op.S. MesaGL Driver V1.78\nCoded by Pete Bernert\n");
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// memory image of the PSX vram
+////////////////////////////////////////////////////////////////////////
+
+unsigned char  *psxVSecure;
+unsigned char  *psxVub;
+signed   char  *psxVsb;
+unsigned short *psxVuw;
+unsigned short *psxVuw_eom;
+signed   short *psxVsw;
+uint32_t       *psxVul;
+signed   int   *psxVsl;
+
+// macro for easy access to packet information
+#define GPUCOMMAND(x) ((x>>24) & 0xff)
+
+GLfloat         gl_z=0.0f;
+BOOL            bNeedInterlaceUpdate=FALSE;
+BOOL            bNeedRGB24Update=FALSE;
+BOOL            bChangeWinMode=FALSE;
+
+uint32_t        ulStatusControl[256];
+
+////////////////////////////////////////////////////////////////////////
+// global GPU vars
+////////////////////////////////////////////////////////////////////////
+
+static int      GPUdataRet;
+int             lGPUstatusRet;
+char            szDispBuf[64];
+
+uint32_t        dwGPUVersion = 0;
+int             iGPUHeight = 512;
+int             iGPUHeightMask = 511;
+int             GlobalTextIL = 0;
+int             iTileCheat = 0;
+
+static uint32_t      gpuDataM[256];
+static unsigned char gpuCommand = 0;
+static int           gpuDataC = 0;
+static int           gpuDataP = 0;
+
+VRAMLoad_t      VRAMWrite;
+VRAMLoad_t      VRAMRead;
+int             iDataWriteMode;
+int             iDataReadMode;
+
+int             lClearOnSwap;
+int             lClearOnSwapColor;
+BOOL            bSkipNextFrame = FALSE;
+int             iColDepth;
+BOOL            bChangeRes;
+BOOL            bWindowMode;
+int             iWinSize;
+
+// possible psx display widths
+short dispWidths[8] = {256,320,512,640,368,384,512,640};
+
+PSXDisplay_t    PSXDisplay;
+PSXDisplay_t    PreviousPSXDisplay;
+TWin_t          TWin;
+short           imageX0,imageX1;
+short           imageY0,imageY1;
+BOOL            bDisplayNotSet = TRUE;
+GLuint          uiScanLine=0;
+int             iUseScanLines=0;
+float           iScanlineColor[] = {0,0,0, 0.3}; // easy on the eyes.
+int             lSelectedSlot=0;
+unsigned char * pGfxCardScreen=0;
+int             iBlurBuffer=0;
+int             iScanBlend=0;
+int             iRenderFVR=0;
+int             iNoScreenSaver=0;
+uint32_t        ulGPUInfoVals[16];
+int             iFakePrimBusy = 0;
+int             iRumbleVal    = 0;
+int             iRumbleTime   = 0;
+uint32_t        vBlank=0;
+
+////////////////////////////////////////////////////////////////////////
+// stuff to make this a true PDK module
+////////////////////////////////////////////////////////////////////////
+
+char * CALLBACK PSEgetLibName(void)
+{
+ return _(libraryName);
+}
+
+unsigned long CALLBACK PSEgetLibType(void)
+{
+ return  PSE_LT_GPU;
+}
+
+unsigned long CALLBACK PSEgetLibVersion(void)
+{
+ return version<<16|revision<<8|build;
+}
+
+#if 0
+char * GPUgetLibInfos(void)
+{
+ return _(libraryInfo);
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// snapshot funcs (saves screen to bitmap / text infos into file)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+static char * GetConfigInfos(HWND hW)
+#else
+static char * GetConfigInfos(int hW)
+#endif
+{
+#ifdef _WINDOWS
+ HDC hdc;HGLRC hglrc;
+#endif
+ char szO[2][4]={"off","on "};
+ char szTxt[256];
+ char * pB=(char *)malloc(32767);
+
+ if(!pB) return NULL;
+ *pB=0;
+ //----------------------------------------------------//
+ sprintf(szTxt,"Plugin: %s %d.%d.%d (mod)\r\n",libraryName,version,revision,build);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"Author: %s\r\n",PluginAuthor);
+ strcat(pB,szTxt);
+
+#ifdef _WINDOWS
+ if(hW)
+  {
+   hdc = GetDC(hW);
+   bSetupPixelFormat(hdc);
+   hglrc = wglCreateContext(hdc);
+   wglMakeCurrent(hdc, hglrc);
+  }
+#endif
+
+ sprintf(szTxt,"Card vendor: %s\r\n",(char *)glGetString(GL_VENDOR));
+ strcat(pB,szTxt);
+ sprintf(szTxt,"GFX card: %s\r\n",(char *)glGetString(GL_RENDERER));
+ strcat(pB,szTxt);
+ sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));
+ strcat(pB,szTxt);
+ //strcat(pB,(char *)glGetString(GL_EXTENSIONS));
+ //strcat(pB,"\r\n\r\n");
+
+#ifdef _WINDOWS
+ if(hW)
+  {
+   wglMakeCurrent(NULL, NULL);
+   wglDeleteContext(hglrc);
+   ReleaseDC(hW,hdc);
+  }
+ //----------------------------------------------------//
+#endif
+
+ if(hW && bWindowMode)
+  sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",LOWORD(iWinSize),HIWORD(iWinSize));
+ else
+  sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",iResX,iResY);
+ strcat(pB,szTxt);
+ if(bWindowMode) sprintf(szTxt,"Window mode\r\n");
+ else
+  {
+   sprintf(szTxt,"Fullscreen ");
+   strcat(pB,szTxt);
+   if(bChangeRes) sprintf(szTxt,"- Desktop changing [%d Bit]\r\n",iColDepth);
+   else           sprintf(szTxt,"- NO desktop changing\r\n");
+  }                                                                                   
+ strcat(pB,szTxt);
+
+ if(iForceVSync>=0) sprintf(szTxt,"- V-Sync: %s\r\n",szO[iForceVSync]);
+ else               strcpy(szTxt,"- V-Sync: Driver\r\n");
+ strcat(pB,szTxt); 
+ sprintf(szTxt,"- Keep psx aspect ratio: %s\r\n\r\n",szO[bKeepRatio]);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ strcpy(szTxt,"Textures:\r\n- ");
+ if(iTexQuality==0)      strcat(szTxt,"Default");
+ else if(iTexQuality==1) strcat(szTxt,"R4G4B4A4");
+ else if(iTexQuality==2) strcat(szTxt,"R5G5B5A1");
+ else if(iTexQuality==3) strcat(szTxt,"R8G8A8A8");
+ else if(iTexQuality==4) strcat(szTxt,"B8G8R8A8");
+ if(!hW && bGLExt) strcat(szTxt," (packed pixels)\r\n");
+ else              strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ if(!hW)
+  {
+   sprintf(szTxt,"- Filtering: %d - edge clamping ",iFilterType);
+   if(iClampType==GL_TO_EDGE_CLAMP) strcat(szTxt,"supported\r\n");
+   else                             strcat(szTxt,"NOT supported\r\n");
+  }
+ else sprintf(szTxt,"- iFiltering: %d\r\n",iFilterType);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Hi-Res textures: %d\r\n",iHiResTextures);
+ strcat(pB,szTxt); 
+ if(!hW)
+  {
+   sprintf(szTxt,"- Palettized tex windows: %s\r\n",szO[iUsePalTextures]);
+   strcat(pB,szTxt); 
+  }
+ sprintf(szTxt,"- VRam size: %d MBytes",iVRamSize);
+ if(!hW)
+      sprintf(szTxt+strlen(szTxt)," - %d textures usable\r\n\r\n",iSortTexCnt);
+ else strcat(szTxt,"\r\n\r\n");
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ sprintf(szTxt,"Framerate:\r\n- FPS limitation: %s\r\n",szO[bUseFrameLimit]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Frame skipping: %s\r\n",szO[bUseFrameSkip]);
+ strcat(pB,szTxt);
+ if(iFrameLimit==2)
+      strcpy(szTxt,"- FPS limit: Auto\r\n\r\n");
+ else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ sprintf(szTxt,"Compatibility:\r\n- Offscreen drawing: %d\r\n",iOffscreenDrawing);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Framebuffer texture: %d",iFrameTexType);
+ if(!hW && iFrameTexType==2)
+  {
+   if(gTexFrameName) strcat(szTxt," - texture created\r\n");
+   else              strcat(szTxt," - not used yet\r\n");
+  }
+ else strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Framebuffer access: %d\r\n",iFrameReadType);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Alpha multipass: %s\r\n",szO[bOpaquePass]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Mask bit: %s\r\n",szO[iUseMask]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Advanced blending: %s",szO[bAdvancedBlend]);
+ if(!hW && bAdvancedBlend)
+  {
+   if(bGLBlend) strcat(szTxt," (hardware)\r\n");
+   else         strcat(szTxt," (software)\r\n");
+  }
+ else strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+
+ if(!hW)
+  {
+   strcpy(szTxt,"- Subtractive blending: ");
+   if(glBlendEquationEXTEx)
+    {
+     if(bUseMultiPass) strcat(szTxt,"supported, but not used!");
+     else              strcat(szTxt,"activated");
+    }
+   else strcat(szTxt," NOT supported!");
+   strcat(szTxt,"\r\n\r\n");
+  }
+ else strcpy(szTxt,"\r\n");
+ 
+ strcat(pB,szTxt);             
+ //----------------------------------------------------//
+ sprintf(szTxt,"Misc:\r\n- Scanlines: %s",szO[iUseScanLines]);
+ strcat(pB,szTxt);
+ if(iUseScanLines) sprintf(szTxt," [%d]\r\n",iScanBlend);
+ else strcpy(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Line mode: %s\r\n",szO[bUseLines]);
+ strcat(pB,szTxt);
+// sprintf(szTxt,"- Line AA: %s\r\n",szO[bUseAntiAlias]);
+// fwrite(szTxt,lstrlen(szTxt),1,txtfile);
+ sprintf(szTxt,"- Unfiltered FB: %s\r\n",szO[bUseFastMdec]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- 15 bit FB: %s\r\n",szO[bUse15bitMdec]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Dithering: %s\r\n",szO[bDrawDither]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Screen smoothing: %s",szO[iBlurBuffer]);
+ strcat(pB,szTxt);
+ if(!hW && iBlurBuffer) 
+  {
+   if(gTexBlurName) strcat(pB," - supported\r\n");
+   else             strcat(pB," - not supported\r\n");
+  }
+ else strcat(pB,"\r\n");
+ sprintf(szTxt,"- Game fixes: %s [%08x]\r\n",szO[bUseFixes],dwCfgFixes);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ return pB;
+}
+
+////////////////////////////////////////////////////////////////////////
+// save text infos to file
+////////////////////////////////////////////////////////////////////////
+
+static void DoTextSnapShot(int iNum)
+{
+ FILE *txtfile;char szTxt[256];char * pB;
+
+#ifdef _WINDOWS
+ sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);
+#else
+ sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);
+#endif
+
+ if((txtfile=fopen(szTxt,"wb"))==NULL)
+  return;                                              
+
+ pB=GetConfigInfos(0);
+ if(pB)
+  {
+   if(fwrite(pB,strlen(pB),1,txtfile) != 1) {
+    free(pB);
+    fclose(txtfile);
+    remove(szTxt);
+    return;
+   }
+   free(pB);
+  }
+ fclose(txtfile); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// saves screen bitmap to file
+////////////////////////////////////////////////////////////////////////
+
+void DoSnapShot(void)
+{
+ unsigned char * snapshotdumpmem=NULL,* p,c;
+ FILE *bmpfile;char filename[256];
+ unsigned char header[0x36];int size;
+ unsigned char empty[2]={0,0};int i;
+ unsigned int snapshotnr = 0;
+ short SnapWidth;
+ short SnapHeigth;
+
+ bSnapShot=FALSE;
+
+ SnapWidth  = iResX;
+ SnapHeigth = iResY;
+
+ size=SnapWidth * SnapHeigth * 3 + 0x38;
+
+ if((snapshotdumpmem=(unsigned char *)
+   malloc(SnapWidth*SnapHeigth*3))==NULL)
+  return;
+    
+  // fill in proper values for BMP
+ for(i=0;i<0x36;i++) header[i]=0;
+ header[0]='B';
+ header[1]='M';
+ header[2]=(unsigned char)(size&0xff);
+ header[3]=(unsigned char)((size>>8)&0xff);
+ header[4]=(unsigned char)((size>>16)&0xff);
+ header[5]=(unsigned char)((size>>24)&0xff);
+ header[0x0a]=0x36;
+ header[0x0e]=0x28;
+ header[0x12]=(unsigned char)(SnapWidth%256);
+ header[0x13]=(unsigned char)(SnapWidth/256);
+ header[0x16]=(unsigned char)(SnapHeigth%256);
+ header[0x17]=(unsigned char)(SnapHeigth/256);
+ header[0x1a]=0x01;
+ header[0x1c]=0x18;
+ header[0x26]=0x12;
+ header[0x27]=0x0B;
+ header[0x2A]=0x12;
+ header[0x2B]=0x0B;
+
+ // increment snapshot value
+ // get filename
+ do
+  {
+   snapshotnr++;
+#ifdef _WINDOWS
+   sprintf(filename,"snap/pcsx%04d.bmp",snapshotnr);
+#else
+   sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr);
+#endif
+   bmpfile=fopen(filename,"rb");
+   if(bmpfile==NULL)break;
+   fclose(bmpfile);
+   if(snapshotnr==9999) break;
+  }
+ while(TRUE);
+
+ // try opening new snapshot file
+ if((bmpfile=fopen(filename,"wb"))==NULL)
+  {free(snapshotdumpmem);return;}
+
+ if(fwrite(header,0x36,1,bmpfile) != 1) {
+  free(snapshotdumpmem);
+  fclose(bmpfile);
+  remove(filename);
+  return;
+ }
+
+ glReadPixels(0,0,SnapWidth,SnapHeigth,GL_RGB,
+               GL_UNSIGNED_BYTE,snapshotdumpmem);
+ p=snapshotdumpmem;
+ size=SnapWidth * SnapHeigth;
+
+ for(i=0;i<size;i++,p+=3)
+  {c=*p;*p=*(p+2);*(p+2)=c;}
+
+ if(fwrite(snapshotdumpmem,size*3,1,bmpfile) != 1 ||
+    fwrite(empty,0x2,1,bmpfile) != 1) {
+  free(snapshotdumpmem);
+  fclose(bmpfile);
+  remove(filename);
+  return;
+ }
+ fclose(bmpfile); 
+ free(snapshotdumpmem);
+
+ DoTextSnapShot(snapshotnr);
+#ifdef _WINDOWS
+ MessageBeep((UINT)-1);
+#endif
+}       
+
+void CALLBACK GPUmakeSnapshot(void)
+{
+ bSnapShot = TRUE;
+}        
+
+////////////////////////////////////////////////////////////////////////
+// GPU INIT... here starts it all (first func called by emu)
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUinit()
+{
+ memset(ulStatusControl,0,256*sizeof(uint32_t));
+
+ // different ways of accessing PSX VRAM
+
+ psxVSecure=(unsigned char *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security
+ if(!psxVSecure) return -1;
+
+ psxVub=psxVSecure+512*1024;                           // security offset into double sized psx vram!
+ psxVsb=(signed char *)psxVub;
+ psxVsw=(signed short *)psxVub;
+ psxVsl=(signed int *)psxVub;
+ psxVuw=(unsigned short *)psxVub;
+ psxVul=(uint32_t *)psxVub;
+
+ psxVuw_eom=psxVuw+1024*iGPUHeight;                    // pre-calc of end of vram
+
+ memset(psxVSecure,0x00,(iGPUHeight*2)*1024 + (1024*1024));
+ memset(ulGPUInfoVals,0x00,16*sizeof(uint32_t));
+
+ InitFrameCap();                                       // init frame rate stuff
+
+ PSXDisplay.RGB24        = 0;                          // init vars
+ PreviousPSXDisplay.RGB24= 0;
+ PSXDisplay.Interlaced   = 0;
+ PSXDisplay.InterlacedTest=0;
+ PSXDisplay.DrawOffset.x = 0;
+ PSXDisplay.DrawOffset.y = 0;
+ PSXDisplay.DrawArea.x0  = 0;
+ PSXDisplay.DrawArea.y0  = 0;
+ PSXDisplay.DrawArea.x1  = 320;
+ PSXDisplay.DrawArea.y1  = 240;
+ PSXDisplay.DisplayMode.x= 320;
+ PSXDisplay.DisplayMode.y= 240;
+ PSXDisplay.Disabled     = FALSE;
+ PreviousPSXDisplay.Range.x0 =0;
+ PreviousPSXDisplay.Range.x1 =0;
+ PreviousPSXDisplay.Range.y0 =0;
+ PreviousPSXDisplay.Range.y1 =0;
+ PSXDisplay.Range.x0=0;
+ PSXDisplay.Range.x1=0;
+ PSXDisplay.Range.y0=0;
+ PSXDisplay.Range.y1=0;
+ PreviousPSXDisplay.DisplayPosition.x = 1;
+ PreviousPSXDisplay.DisplayPosition.y = 1;
+ PSXDisplay.DisplayPosition.x = 1;
+ PSXDisplay.DisplayPosition.y = 1;
+ PreviousPSXDisplay.DisplayModeNew.y=0;
+ PSXDisplay.Double=1;
+ GPUdataRet=0x400;
+
+ PSXDisplay.DisplayModeNew.x=0;
+ PSXDisplay.DisplayModeNew.y=0;
+
+ //PreviousPSXDisplay.Height = PSXDisplay.Height = 239;
+ 
+ iDataWriteMode = DR_NORMAL;
+
+ // Reset transfer values, to prevent mis-transfer of data
+ memset(&VRAMWrite,0,sizeof(VRAMLoad_t));
+ memset(&VRAMRead,0,sizeof(VRAMLoad_t));
+ 
+ // device initialised already !
+ //lGPUstatusRet = 0x74000000;
+ vBlank = 0;
+
+ STATUSREG = 0x14802000;
+ GPUIsIdle;
+ GPUIsReadyForCommands;
+
+ return 0;
+}                             
+
+////////////////////////////////////////////////////////////////////////
+// GPU OPEN: funcs to open up the gpu display (Windows)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+void ChangeDesktop()                                   // change destop resolution
+{
+ DEVMODE dv;long lRes,iTry=0;                       
+
+ while(iTry<10)                                        // keep on hammering...
+  {
+   memset(&dv,0,sizeof(DEVMODE));
+   dv.dmSize=sizeof(DEVMODE);
+   dv.dmBitsPerPel=iColDepth;
+   dv.dmPelsWidth=iResX;
+   dv.dmPelsHeight=iResY;
+
+   dv.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
+
+   lRes=ChangeDisplaySettings(&dv,0);                  // ...hammering the anvil
+
+   if(lRes==DISP_CHANGE_SUCCESSFUL) return;
+   iTry++;Sleep(10);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// OPEN interface func: attention! 
+// some emus are calling this func in their main Window thread,
+// but all other interface funcs (to draw stuff) in a different thread!
+// that's a problem, since OGL is thread safe! Therefore we cannot 
+// initialize the OGL stuff right here, we simply set a "bIsFirstFrame = TRUE"
+// flag, to initialize OGL on the first real draw call.
+// btw, we also call this open func ourselfes, each time when the user 
+// is changing between fullscreen/window mode (ENTER key)
+// btw part 2: in windows the plugin gets the window handle from the
+// main emu, and doesn't create it's own window (if it would do it,
+// some PAD or SPU plugins would not work anymore)
+////////////////////////////////////////////////////////////////////////
+
+HMENU hPSEMenu=NULL;
+
+long CALLBACK GPUopen(HWND hwndGPU)                    
+{
+ HDC hdc;RECT r;DEVMODE dv;
+
+ hWWindow = hwndGPU;                                   // store hwnd globally
+
+ InitKeyHandler();                                     // init key handler (subclass window)
+
+ if(bChangeWinMode)                                    // user wants to change fullscreen/window mode?
+  {
+   ReadWinSizeConfig();                                // -> get sizes again
+  }
+ else                                                  // first real startup
+  {
+   ReadConfig();                                       // -> read config from registry
+
+   SetFrameRateConfig();                               // -> setup frame rate stuff
+  }
+
+ if(iNoScreenSaver) EnableScreenSaver(FALSE);          // at least we can try 
+
+
+ memset(&dv,0,sizeof(DEVMODE));
+ dv.dmSize=sizeof(DEVMODE);
+ EnumDisplaySettings(NULL,ENUM_CURRENT_SETTINGS,&dv);
+
+ bIsFirstFrame = TRUE;                                 // flag: we have to init OGL later in windows!
+
+ if(bWindowMode)                                       // win mode?
+  {
+   DWORD dw=GetWindowLong(hWWindow, GWL_STYLE);        // -> adjust wnd style (owndc needed by some stupid ogl drivers)
+   dw&=~WS_THICKFRAME;
+   dw|=WS_BORDER|WS_CAPTION|CS_OWNDC;
+   SetWindowLong(hWWindow, GWL_STYLE, dw);
+
+   hPSEMenu=GetMenu(hWWindow);                         // -> hide emu menu (if any)
+   if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
+
+   iResX=LOWORD(iWinSize);iResY=HIWORD(iWinSize);
+   ShowWindow(hWWindow,SW_SHOWNORMAL);
+
+   MoveWindow(hWWindow,                                // -> center wnd
+      GetSystemMetrics(SM_CXFULLSCREEN)/2-iResX/2,
+      GetSystemMetrics(SM_CYFULLSCREEN)/2-iResY/2,
+      iResX+GetSystemMetrics(SM_CXFIXEDFRAME)+3,
+      iResY+GetSystemMetrics(SM_CYFIXEDFRAME)+GetSystemMetrics(SM_CYCAPTION)+3,
+      TRUE);
+   UpdateWindow(hWWindow);                             // -> let windows do some update
+
+   if(dv.dmBitsPerPel==16 || dv.dmBitsPerPel==32)      // -> overwrite user color info with desktop color info
+    iColDepth=dv.dmBitsPerPel;
+  }
+ else                                                  // fullscreen mode:
+  {
+   if(dv.dmBitsPerPel!=(unsigned int)iColDepth ||      // -> check, if we have to change resolution
+      dv.dmPelsWidth !=(unsigned int)iResX ||
+      dv.dmPelsHeight!=(unsigned int)iResY)
+    bChangeRes=TRUE; else bChangeRes=FALSE;
+
+   if(bChangeRes) ChangeDesktop();                     // -> change the res (had to do an own func because of some MS 'optimizations')
+
+   SetWindowLong(hWWindow, GWL_STYLE, CS_OWNDC);       // -> adjust wnd style as well (to be sure)
+                
+   hPSEMenu=GetMenu(hWWindow);                         // -> hide menu
+   if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
+   ShowWindow(hWWindow,SW_SHOWMAXIMIZED);              // -> max mode
+  }
+
+ rRatioRect.left   = rRatioRect.top=0;
+ rRatioRect.right  = iResX;
+ rRatioRect.bottom = iResY;
+
+ r.left=r.top=0;r.right=iResX;r.bottom=iResY;          // hack for getting a clean black window until OGL gets initialized
+ hdc = GetDC(hWWindow);
+ FillRect(hdc,&r,(HBRUSH)GetStockObject(BLACK_BRUSH));
+ bSetupPixelFormat(hdc);
+ ReleaseDC(hWWindow,hdc);
+
+ bDisplayNotSet = TRUE; 
+ bSetClip=TRUE;
+
+ SetFixes();                                           // setup game fixes
+
+ InitializeTextureStore();                             // init texture mem
+
+// lGPUstatusRet = 0x74000000;
+
+// with some emus, we could do the OGL init right here... oh my
+// if(bIsFirstFrame) GLinitialize();
+
+ return 0;
+}
+
+#elif !defined (_MACGL)
+
+////////////////////////////////////////////////////////////////////////
+// LINUX GPU OPEN: func to open up the gpu display (X stuff)
+// please note: in linux we are creating our own display, and we return
+// the display ID to the main emu... that's cleaner
+////////////////////////////////////////////////////////////////////////
+
+char * pCaptionText=0;
+int    bFullScreen=0;
+Display              *display;
+
+static Cursor        cursor;
+static XVisualInfo   *myvisual;
+static Colormap      colormap;
+static Window        window;
+
+static int bModeChanged=0;
+
+typedef struct
+{
+#define MWM_HINTS_DECORATIONS   2
+  long flags;
+  long functions;
+  long decorations;
+  long input_mode;
+} MotifWmHints;
+
+static int dbdepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,GLX_DEPTH_SIZE,16,None};
+static int dbnodepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,None};
+static GLXContext cx;
+
+static int fx=0;
+
+////////////////////////////////////////////////////////////////////////
+
+static void osd_close_display (void)                          // close display
+{
+ if(display)                                           // display exists?
+  {
+   glXDestroyContext(display,cx);                      // -> kill context
+   XFreeColormap(display, colormap);                   // -> kill colormap
+   XSync(display,False);                               // -> sync events
+
+#ifndef NOVMODE
+   if(bModeChanged)                                    // -> repair screen mode
+    {
+     int myscreen=DefaultScreen(display);
+     XF86VidModeSwitchToMode(display,myscreen,         // --> switch mode back
+                             modes[iOldMode]);
+     XF86VidModeSetViewPort(display,myscreen,0,0);     // --> set viewport upperleft
+     free(modes);                                      // --> finally kill mode infos
+     bModeChanged=0;                                   // --> done
+    }
+#endif
+
+   XCloseDisplay(display);                             // -> close display
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void sysdep_create_display(void)                       // create display
+{
+ XSetWindowAttributes winattr;float fxgamma=2;
+ int myscreen;char gammastr[14];
+ Screen * screen;XEvent event;
+ XSizeHints hints;XWMHints wm_hints;
+ MotifWmHints mwmhints;Atom mwmatom;Atom delwindow;
+ char *glxfx;
+
+ glxfx=getenv("MESA_GLX_FX");                          // 3dfx mesa fullscreen flag
+ if(glxfx)
+  {
+   if(glxfx[0]=='f')                                   // -> yup, fullscreen needed
+    {
+     fx=1;                                             // -> raise flag
+     putenv("FX_GLIDE_NO_SPLASH=");
+     sprintf(gammastr,"SST_GAMMA=%2.1f",fxgamma);      // -> set gamma
+     putenv(gammastr);
+    }
+  }
+
+ display=XOpenDisplay(NULL);                           // open display
+ if(!display)                                          // no display?
+  {
+   fprintf (stderr,"Failed to open display!!!\n");
+   osd_close_display();
+   return;                                             // -> bye
+  }
+
+ myscreen=DefaultScreen(display);                      // get screen id
+
+#ifdef NOVMODE
+ if(bFullScreen) {fx=1;bModeChanged=0;}
+#else
+ if(bFullScreen)
+  {
+   XF86VidModeModeLine mode;
+   int nmodes,iC;
+   fx=1;                                               // raise flag
+   XF86VidModeGetModeLine(display,myscreen,&iC,&mode); // get actual mode info
+   if(mode.privsize) XFree(mode.private);              // no need for private stuff
+   bModeChanged=0;                                     // init mode change flag
+   if(iResX!=mode.hdisplay || iResY!=mode.vdisplay)    // wanted mode is different?
+    {
+     XF86VidModeGetAllModeLines(display,myscreen,      // -> enum all mode infos
+                                &nmodes,&modes);
+     if(modes)                                         // -> infos got?
+      {
+       for(iC=0;iC<nmodes;++iC)                        // -> loop modes
+        {
+         if(mode.hdisplay==modes[iC]->hdisplay &&      // -> act mode found?
+            mode.vdisplay==modes[iC]->vdisplay)        //    if yes: store mode id
+          iOldMode=iC;
+
+         if(iResX==modes[iC]->hdisplay &&              // -> wanted mode found?
+            iResY==modes[iC]->vdisplay)
+          {
+           XF86VidModeSwitchToMode(display,myscreen,   // --> switch to mode
+                                   modes[iC]);
+           XF86VidModeSetViewPort(display,myscreen,0,0);
+           bModeChanged=1;                             // --> raise flag for repairing mode on close
+          }
+        }
+
+       if(bModeChanged==0)                             // -> no mode found?
+        {
+         free(modes);                                  // --> free infos
+         printf("No proper fullscreen mode found!\n"); // --> some info output
+        }
+      }
+    }
+  }
+#endif
+
+ screen=DefaultScreenOfDisplay(display);
+
+ if(iZBufferDepth)                                      // visual (with or without zbuffer)
+      myvisual=glXChooseVisual(display,myscreen,dbdepat);
+ else myvisual=glXChooseVisual(display,myscreen,dbnodepat);
+
+ if(!myvisual)                                         // no visual?
+  {
+   fprintf(stderr,"Failed to obtain visual!!!\n");     // -> bye
+   osd_close_display();
+   return;
+  }
+
+ cx=glXCreateContext(display,myvisual,0,GL_TRUE);      // create rendering context
+
+ if(!cx)                                               // no context?
+  {
+   fprintf(stderr,"Failed to create OpenGL context!!!\n");
+   osd_close_display();                                // -> bxe
+   return;
+  }
+
+ // pffff... much work for a simple blank cursor... oh, well...
+ if(!bFullScreen) cursor=XCreateFontCursor(display,XC_trek);
+ else
+  {
+   Pixmap p1,p2;XImage * img;
+   XColor b,w;unsigned char * idata;
+   XGCValues GCv;
+   GC        GCc;
+
+   memset(&b,0,sizeof(XColor));
+   memset(&w,0,sizeof(XColor));
+   idata=(unsigned char *)malloc(8);
+   memset(idata,0,8);
+
+   p1=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
+   p2=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
+
+   img = XCreateImage(display,myvisual->visual,
+                      1,XYBitmap,0,(char *)idata,8,8,8,1);
+
+   GCv.function   = GXcopy;
+   GCv.foreground = ~0;
+   GCv.background =  0;
+   GCv.plane_mask = AllPlanes;
+   GCc = XCreateGC(display,p1,
+                   (GCFunction|GCForeground|GCBackground|GCPlaneMask),&GCv);
+
+   XPutImage(display, p1,GCc,img,0,0,0,0,8,8);
+   XPutImage(display, p2,GCc,img,0,0,0,0,8,8);
+   XFreeGC(display, GCc);
+
+   cursor = XCreatePixmapCursor(display,p1,p2,&b,&w,0,0);
+
+   XFreePixmap(display,p1);
+   XFreePixmap(display,p2);
+   XDestroyImage(img);                                 // will free idata as well
+  }
+
+ colormap=XCreateColormap(display,                     // create colormap
+                          RootWindow(display,myvisual->screen),
+                          myvisual->visual,AllocNone);
+
+ winattr.background_pixel=0;
+ winattr.border_pixel=WhitePixelOfScreen(screen);
+ winattr.bit_gravity=ForgetGravity;
+ winattr.win_gravity=NorthWestGravity;
+ winattr.backing_store=NotUseful;
+ winattr.override_redirect=False;
+ winattr.save_under=False;
+ winattr.event_mask=0;
+ winattr.do_not_propagate_mask=0;
+ winattr.colormap=colormap;
+ winattr.cursor=None;
+
+ window=XCreateWindow(display,                         // create own window
+             RootWindow(display,DefaultScreen(display)),
+             0,0,iResX,iResY,
+             0,myvisual->depth,
+             InputOutput,myvisual->visual,
+             CWBorderPixel | CWBackPixel |
+             CWEventMask | CWDontPropagate |
+             CWColormap | CWCursor,
+             &winattr);
+
+ if(!window)                                           // no window?
+  {
+   fprintf(stderr,"Failed in XCreateWindow()!!!\n");
+   osd_close_display();                                // -> bye
+   return;
+  }
+
+ delwindow = XInternAtom(display,"WM_DELETE_WINDOW",0);
+ XSetWMProtocols(display, window, &delwindow, 1);
+
+ hints.flags=PMinSize|PMaxSize;                        // hints
+ if(fx) hints.flags|=USPosition|USSize;
+ else   hints.flags|=PSize;
+
+ hints.min_width   = hints.max_width  = hints.base_width  = iResX;
+ hints.min_height  = hints.max_height = hints.base_height = iResY;
+
+ wm_hints.input=1;
+ wm_hints.flags=InputHint;
+
+ XSetWMHints(display,window,&wm_hints);
+ XSetWMNormalHints(display,window,&hints);
+ if(pCaptionText)                                      // caption
+      XStoreName(display,window,pCaptionText);
+ else XStoreName(display,window,"Pete MesaGL PSX Gpu");
+
+ XDefineCursor(display,window,cursor);                 // cursor
+
+ if(fx)                                                // window title bar hack
+  {
+   mwmhints.flags=MWM_HINTS_DECORATIONS;
+   mwmhints.decorations=0;
+   mwmatom=XInternAtom(display,"_MOTIF_WM_HINTS",0);
+   XChangeProperty(display,window,mwmatom,mwmatom,32,
+                   PropModeReplace,(unsigned char *)&mwmhints,4);
+  }
+
+ XSelectInput(display,window,                          // input setup
+              FocusChangeMask | ExposureMask |
+              KeyPressMask | KeyReleaseMask);
+
+ XMapRaised(display,window);
+ XClearWindow(display,window);
+ XWindowEvent(display,window,ExposureMask,&event);
+ glXMakeCurrent(display,window,cx);
+
+/* 
+ printf(glGetString(GL_VENDOR));
+ printf("\n");
+ printf(glGetString(GL_RENDERER));
+ printf("\n");
+*/
+
+ if (fx)                                               // after make current: fullscreen resize
+  {
+   XResizeWindow(display,window,screen->width,screen->height);
+   hints.min_width   = hints.max_width = hints.base_width = screen->width;
+   hints.min_height= hints.max_height = hints.base_height = screen->height;
+   XSetWMNormalHints(display,window,&hints);
+
+   // set the window layer for GNOME
+   {
+    XEvent xev;
+
+    memset(&xev, 0, sizeof(xev));
+    xev.xclient.type = ClientMessage;
+    xev.xclient.serial = 0;
+    xev.xclient.send_event = 1;
+    xev.xclient.message_type = XInternAtom(display, "_NET_WM_STATE", 0);
+    xev.xclient.window = window;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = 1;
+    xev.xclient.data.l[1] = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", 0);
+    xev.xclient.data.l[2] = 0;
+    xev.xclient.data.l[3] = 0;
+    xev.xclient.data.l[4] = 0;
+
+    XSendEvent(display, RootWindow(display, DefaultScreen(display)), 0,
+      SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+   }
+  }
+}
+
+#endif // !defined(_MACGL)
+
+#ifndef _WINDOWS
+
+#if defined(_MACGL)
+extern char * pCaptionText;
+#endif
+
+////////////////////////////////////////////////////////////////////////
+
+long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
+{
+ pCaptionText=CapText;
+ pConfigFile=CfgFile;
+
+ ReadConfig();                                         // read text file for config
+
+ SetFrameRateConfig();                                 // setup frame rate stuff
+
+ bIsFirstFrame = TRUE;                                 // we have to init later (well, no really... in Linux we do all in GPUopen)
+
+ #if defined (_MACGL)
+ unsigned long display = ulInitDisplay();
+ #else
+ sysdep_create_display();                              // create display
+ #endif 
+ 
+ InitializeTextureStore();                             // init texture mem
+
+ rRatioRect.left   = rRatioRect.top=0;
+ rRatioRect.right  = iResX;
+ rRatioRect.bottom = iResY;
+
+ GLinitialize();                                       // init opengl
+
+ if(disp)
+  {
+  *disp = display;
+  }
+
+ if(display) return 0;
+ return -1;
+}
+
+#endif // ndef _WINDOWS
+
+
+
+////////////////////////////////////////////////////////////////////////
+// close
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+long CALLBACK GPUclose()                               // WINDOWS CLOSE
+{
+ ExitKeyHandler();
+
+ GLcleanup();                                          // close OGL
+
+ if(bChangeRes)                                        // change res back
+  ChangeDisplaySettings(NULL,0);
+
+ if(hPSEMenu)                                          // set menu again
+  SetMenu(hWWindow,hPSEMenu);
+
+ if(pGfxCardScreen) free(pGfxCardScreen);              // free helper memory
+ pGfxCardScreen=0;
+
+ if(iNoScreenSaver) EnableScreenSaver(TRUE);           // enable screen saver again
+
+ return 0;
+}
+
+#else
+
+long GPUclose()                                        // LINUX CLOSE
+{
+ GLcleanup();                                          // close OGL
+
+ if(pGfxCardScreen) free(pGfxCardScreen);              // free helper memory
+ pGfxCardScreen=0;
+ #if defined (_MACGL)
+ CloseDisplay();
+ #else
+ osd_close_display();                                  // destroy display
+ #endif
+ return 0;
+}
+
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// I shot the sheriff... last function called from emu 
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUshutdown()
+{
+ if(psxVSecure) free(psxVSecure);                      // kill emulated vram memory
+ psxVSecure=0;
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// paint it black: simple func to clean up optical border garbage
+////////////////////////////////////////////////////////////////////////
+
+static void PaintBlackBorders(void)
+{
+ short s;
+
+ glDisable(GL_SCISSOR_TEST);
+ if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable)     {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ glDisable(GL_ALPHA_TEST);
+
+ glBegin(GL_QUADS);
+
+ vertex[0].c.lcol=0xff000000;
+ SETCOL(vertex[0]); 
+
+ if(PreviousPSXDisplay.Range.x0)
+  {
+   s=PreviousPSXDisplay.Range.x0+1;
+   glVertex3f(0,0,0.99996f);
+   glVertex3f(0,PSXDisplay.DisplayMode.y,0.99996f);
+   glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
+   glVertex3f(s,0,0.99996f);
+
+   s+=PreviousPSXDisplay.Range.x1-2;
+
+   glVertex3f(s,0,0.99996f);
+   glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
+   glVertex3f(PSXDisplay.DisplayMode.x,PSXDisplay.DisplayMode.y,0.99996f);
+   glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
+  }
+
+ if(PreviousPSXDisplay.Range.y0)
+  {
+   s=PreviousPSXDisplay.Range.y0+1;
+   glVertex3f(0,0,0.99996f);
+   glVertex3f(0,s,0.99996f);
+   glVertex3f(PSXDisplay.DisplayMode.x,s,0.99996f);
+   glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
+  }
+
+ glEnd();
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+}
+
+////////////////////////////////////////////////////////////////////////
+// helper to draw scanlines
+////////////////////////////////////////////////////////////////////////
+
+static __inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+                                    OGLVertex* vertex3, OGLVertex* vertex4) 
+{
+
+ glBegin(GL_QUAD_STRIP);
+  glTexCoord2fv(&vertex1->sow);
+  glVertex3fv(&vertex1->x);
+  
+  glTexCoord2fv(&vertex2->sow);
+  glVertex3fv(&vertex2->x);
+  
+  glTexCoord2fv(&vertex4->sow);
+  glVertex3fv(&vertex4->x);
+  
+  glTexCoord2fv(&vertex3->sow);
+  glVertex3fv(&vertex3->x);
+ glEnd();
+}
+
+////////////////////////////////////////////////////////////////////////
+// scanlines
+////////////////////////////////////////////////////////////////////////
+
+static void SetScanLines(void)
+{
+ glLoadIdentity();
+ glOrtho(0,iResX,iResY, 0, -1, 1);
+
+ if(bKeepRatio)
+  glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST);                       
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+
+ if(iScanBlend<0)                                      // special texture mask scanline mode
+  {
+   if(!bTexEnabled)    {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+   gTexName=gTexScanName;
+   glBindTexture(GL_TEXTURE_2D, gTexName);
+   if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    
+   if(!bBlendEnable)   {glEnable(GL_BLEND);bBlendEnable=TRUE;}
+   SetScanTexTrans();
+
+   vertex[0].x=0;
+   vertex[0].y=iResY;
+   vertex[0].z=0.99996f;
+
+   vertex[1].x=iResX;
+   vertex[1].y=iResY;
+   vertex[1].z=0.99996f;
+
+   vertex[2].x=iResX;
+   vertex[2].y=0;
+   vertex[2].z=0.99996f;
+
+   vertex[3].x=0;
+   vertex[3].y=0;
+   vertex[3].z=0.99996f;
+
+   vertex[0].sow=0;
+   vertex[0].tow=0;
+   vertex[1].sow=(float)iResX/4.0f;
+   vertex[1].tow=0;
+   vertex[2].sow=vertex[1].sow;
+   vertex[2].tow=(float)iResY/4.0f;
+   vertex[3].sow=0;
+   vertex[3].tow=vertex[2].tow;
+
+   vertex[0].c.lcol=0xffffffff;
+   SETCOL(vertex[0]); 
+
+   XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+
+   if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    
+  }
+ else                                                  // typical line mode
+  {
+   if(bTexEnabled)     {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
+
+   if(iScanBlend==0)
+    {
+     if(bBlendEnable)    {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+     vertex[0].c.lcol=0xff000000;
+    }
+   else
+    {
+     if(!bBlendEnable)   {glEnable(GL_BLEND);bBlendEnable=TRUE;}
+     SetScanTrans();
+     vertex[0].c.lcol=iScanBlend<<24;
+    }
+
+   SETCOL(vertex[0]); 
+
+   glCallList(uiScanLine);
+  }
+
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+         PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ if(bKeepRatio)
+  glViewport(rRatioRect.left,
+             iResY-(rRatioRect.top+rRatioRect.bottom),
+             rRatioRect.right, 
+             rRatioRect.bottom);                         // init viewport
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);                       
+}
+
+////////////////////////////////////////////////////////////////////////
+// blur, babe, blur (heavy performance hit for a so-so fullscreen effect)
+////////////////////////////////////////////////////////////////////////
+
+static void BlurBackBuffer(void)
+{
+ if(!gTexBlurName) return;
+
+ if(bKeepRatio) glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST);
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable)     {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled)     {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ if(iZBufferDepth)    glDisable(GL_DEPTH_TEST);    
+ if(bDrawDither)      glDisable(GL_DITHER); 
+
+ gTexName=gTexBlurName;
+ glBindTexture(GL_TEXTURE_2D, gTexName);
+
+ glCopyTexSubImage2D( GL_TEXTURE_2D, 0,                // get back buffer in texture
+                      0,
+                      0,
+                      0,
+                      0,
+                      iResX,iResY);
+
+ vertex[0].x=0;
+ vertex[0].y=PSXDisplay.DisplayMode.y;
+ vertex[1].x=PSXDisplay.DisplayMode.x;
+ vertex[1].y=PSXDisplay.DisplayMode.y;
+ vertex[2].x=PSXDisplay.DisplayMode.x;
+ vertex[2].y=0;
+ vertex[3].x=0;
+ vertex[3].y=0;
+ vertex[0].sow=0;
+ vertex[0].tow=0;
+
+#ifdef OWNSCALE
+ vertex[1].sow=((GLfloat)iFTexA)/256.0f;
+ vertex[2].tow=((GLfloat)iFTexB)/256.0f;
+#else
+ vertex[1].sow=iFTexA;
+ vertex[2].tow=iFTexB;
+#endif
+ vertex[1].tow=0;
+ vertex[2].sow=vertex[1].sow;
+ vertex[3].sow=0;
+ vertex[3].tow=vertex[2].tow;
+ 
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    
+ vertex[0].c.lcol=0x7fffffff;
+ SETCOL(vertex[0]); 
+
+ DrawMultiBlur();                                      // draw the backbuffer texture to create blur effect
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+ if(iZBufferDepth)  glEnable(GL_DEPTH_TEST);    
+ if(bDrawDither)    glEnable(GL_DITHER);    
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    
+
+ if(bKeepRatio)
+  glViewport(rRatioRect.left,                            // re-init viewport
+             iResY-(rRatioRect.top+rRatioRect.bottom),
+             rRatioRect.right, 
+             rRatioRect.bottom);            
+}
+
+////////////////////////////////////////////////////////////////////////
+// "unblur" repairs the backbuffer after a blur
+
+static void UnBlurBackBuffer(void)
+{
+ if(!gTexBlurName) return;
+
+ if(bKeepRatio) glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST);
+ glDisable(GL_ALPHA_TEST);
+ if(bBlendEnable)    {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled)    {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ if(iZBufferDepth)    glDisable(GL_DEPTH_TEST);    
+ if(bDrawDither)      glDisable(GL_DITHER); 
+
+ gTexName=gTexBlurName;
+ glBindTexture(GL_TEXTURE_2D, gTexName);
+
+ vertex[0].x=0;
+ vertex[0].y=PSXDisplay.DisplayMode.y;
+ vertex[1].x=PSXDisplay.DisplayMode.x;
+ vertex[1].y=PSXDisplay.DisplayMode.y;
+ vertex[2].x=PSXDisplay.DisplayMode.x;
+ vertex[2].y=0;
+ vertex[3].x=0;
+ vertex[3].y=0;
+ vertex[0].sow=0;
+ vertex[0].tow=0;
+#ifdef OWNSCALE
+ vertex[1].sow=((GLfloat)iFTexA)/256.0f;
+ vertex[2].tow=((GLfloat)iFTexB)/256.0f;
+#else
+ vertex[1].sow=iFTexA;
+ vertex[2].tow=iFTexB;
+#endif
+ vertex[1].tow=0;
+ vertex[2].sow=vertex[1].sow;
+ vertex[3].sow=0;
+ vertex[3].tow=vertex[2].tow;
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);    
+ vertex[0].c.lcol=0xffffffff;
+ SETCOL(vertex[0]); 
+
+ // simply draw the backbuffer texture (without blur)
+ XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+ if(iZBufferDepth)  glEnable(GL_DEPTH_TEST);    
+ if(bDrawDither)    glEnable(GL_DITHER);                  // dither mode
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT);    
+
+ if(bKeepRatio)
+  glViewport(rRatioRect.left,
+             iResY-(rRatioRect.top+rRatioRect.bottom),
+             rRatioRect.right, 
+             rRatioRect.bottom);                         // init viewport
+}
+
+////////////////////////////////////////////////////////////////////////
+// Update display (swap buffers)... called in interlaced mode on 
+// every emulated vsync, otherwise whenever the displayed screen region
+// has been changed
+////////////////////////////////////////////////////////////////////////
+
+int iLastRGB24=0;                                      // special vars for checking when to skip two display updates
+int iSkipTwo=0;
+
+void updateDisplay(void)                               // UPDATE DISPLAY
+{
+ BOOL bBlur=FALSE;
+
+#ifdef _WINDOWS
+ HDC hdc=GetDC(hWWindow);                              // windows:
+ wglMakeCurrent(hdc,GLCONTEXT);                        // -> make context current again
+#endif
+#if defined (_MACGL)
+    BringContextForward();
+#endif
+ bFakeFrontBuffer=FALSE;
+ bRenderFrontBuffer=FALSE;
+
+ if(iRenderFVR)                                        // frame buffer read fix mode still active?
+  {
+   iRenderFVR--;                                       // -> if some frames in a row without read access: turn off mode
+   if(!iRenderFVR) bFullVRam=FALSE;
+  }
+
+ if(iLastRGB24 && iLastRGB24!=PSXDisplay.RGB24+1)      // (mdec) garbage check
+  {
+   iSkipTwo=2;                                         // -> skip two frames to avoid garbage if color mode changes
+  }
+ iLastRGB24=0;
+
+ if(PSXDisplay.RGB24)// && !bNeedUploadAfter)          // (mdec) upload wanted?
+  {
+   PrepareFullScreenUpload(-1);
+   UploadScreen(PSXDisplay.Interlaced);                // -> upload whole screen from psx vram
+   bNeedUploadTest=FALSE;
+   bNeedInterlaceUpdate=FALSE;
+   bNeedUploadAfter=FALSE;
+   bNeedRGB24Update=FALSE;
+  }
+ else
+ if(bNeedInterlaceUpdate)                              // smaller upload?
+  {
+   bNeedInterlaceUpdate=FALSE;
+   xrUploadArea=xrUploadAreaIL;                        // -> upload this rect
+   UploadScreen(TRUE);
+  }
+
+ if(dwActFixes&512) bCheckFF9G4(NULL);                 // special game fix for FF9 
+
+ if(PreviousPSXDisplay.Range.x0||                      // paint black borders around display area, if needed
+    PreviousPSXDisplay.Range.y0)
+  PaintBlackBorders();
+
+ if(PSXDisplay.Disabled)                               // display disabled?
+  {
+   // moved here
+   glDisable(GL_SCISSOR_TEST);                       
+   glClearColor(0,0,0,128);                            // -> clear whole backbuffer
+   glClear(uiBufferBits);
+   glEnable(GL_SCISSOR_TEST);                       
+   gl_z=0.0f;
+   bDisplayNotSet = TRUE;
+  }
+
+ if(iSkipTwo)                                          // we are in skipping mood?
+  {
+   iSkipTwo--;
+   iDrawnSomething=0;                                  // -> simply lie about something drawn
+  }
+
+ if(iBlurBuffer && !bSkipNextFrame)                    // "blur display" activated?
+  {BlurBackBuffer();bBlur=TRUE;}                       // -> blur it
+
+ if(iUseScanLines) SetScanLines();                     // "scan lines" activated? do it
+
+ if(usCursorActive) ShowGunCursor();                   // "gun cursor" wanted? show 'em
+
+ if(dwActFixes&128)                                    // special FPS limitation mode?
+  {
+   if(bUseFrameLimit) PCFrameCap();                    // -> ok, do it
+   if(bUseFrameSkip || ulKeybits&KEY_SHOWFPS)  
+    PCcalcfps();         
+  }
+
+ if(gTexPicName) DisplayPic();                         // some gpu info picture active? display it
+
+ if(bSnapShot) DoSnapShot();                           // snapshot key pressed? cheeeese :)
+
+ if(ulKeybits&KEY_SHOWFPS)                             // wanna see FPS?
+  {
+   sprintf(szDispBuf,"%06.1f",fps_cur);
+   DisplayText();                                      // -> show it
+  }
+
+ //----------------------------------------------------//
+ // main buffer swapping (well, or skip it)
+
+ if(bUseFrameSkip)                                     // frame skipping active ?
+  {
+   if(!bSkipNextFrame) 
+    {
+     if(iDrawnSomething)
+#ifdef _WINDOWS
+      SwapBuffers(wglGetCurrentDC());                  // -> to skip or not to skip
+#elif defined(_MACGL)
+        DoBufferSwap();
+#else
+      glXSwapBuffers(display,window);
+#endif
+    }
+   if(dwActFixes&0x180)                                // -> special old frame skipping: skip max one in a row
+    {
+     if((fps_skip < fFrameRateHz) && !(bSkipNextFrame)) 
+      {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
+     else bSkipNextFrame = FALSE;
+    }
+   else FrameSkip();
+  }
+ else                                                  // no skip ?
+  {
+   if(iDrawnSomething)
+#ifdef _WINDOWS
+    SwapBuffers(wglGetCurrentDC());                    // -> swap
+#elif defined(_MACGL)
+    DoBufferSwap();
+#else
+    glXSwapBuffers(display,window);
+#endif
+  }
+
+ iDrawnSomething=0;
+
+ //----------------------------------------------------//
+
+ if(lClearOnSwap)                                      // clear buffer after swap?
+  {
+   GLclampf g,b,r;
+
+   if(bDisplayNotSet)                                  // -> set new vals
+    SetOGLDisplaySettings(1);
+
+   g=((GLclampf)GREEN(lClearOnSwapColor))/255.0f;      // -> get col
+   b=((GLclampf)BLUE(lClearOnSwapColor))/255.0f;
+   r=((GLclampf)RED(lClearOnSwapColor))/255.0f;
+   
+   glDisable(GL_SCISSOR_TEST);                       
+   glClearColor(r,g,b,128);                            // -> clear 
+   glClear(uiBufferBits);
+   glEnable(GL_SCISSOR_TEST);                       
+   lClearOnSwap=0;                                     // -> done
+  }
+ else 
+  {
+   if(bBlur) UnBlurBackBuffer();                       // unblur buff, if blurred before
+
+   if(iZBufferDepth)                                   // clear zbuffer as well (if activated)
+    {
+     glDisable(GL_SCISSOR_TEST);                       
+     glClear(GL_DEPTH_BUFFER_BIT);
+     glEnable(GL_SCISSOR_TEST);                       
+    }
+  }
+ gl_z=0.0f;
+
+ //----------------------------------------------------//
+ // additional uploads immediatly after swapping
+
+ if(bNeedUploadAfter)                                  // upload wanted?
+  {
+   bNeedUploadAfter=FALSE;                           
+   bNeedUploadTest=FALSE;
+   UploadScreen(-1);                                   // -> upload
+  }
+ 
+ if(bNeedUploadTest)
+  {
+   bNeedUploadTest=FALSE;
+   if(PSXDisplay.InterlacedTest &&
+      //iOffscreenDrawing>2 &&
+      PreviousPSXDisplay.DisplayPosition.x==PSXDisplay.DisplayPosition.x &&
+      PreviousPSXDisplay.DisplayEnd.x==PSXDisplay.DisplayEnd.x &&
+      PreviousPSXDisplay.DisplayPosition.y==PSXDisplay.DisplayPosition.y &&
+      PreviousPSXDisplay.DisplayEnd.y==PSXDisplay.DisplayEnd.y)
+    {
+     PrepareFullScreenUpload(TRUE);
+     UploadScreen(TRUE);
+    }
+  }
+
+ //----------------------------------------------------//
+ // rumbling (main emu pad effect)
+
+ if(iRumbleTime)                                       // shake screen by modifying view port
+  {
+   int i1=0,i2=0,i3=0,i4=0;
+
+   iRumbleTime--;
+   if(iRumbleTime) 
+    {
+     i1=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+     i2=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+     i3=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+     i4=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+    }
+
+   glViewport(rRatioRect.left+i1,                      
+              iResY-(rRatioRect.top+rRatioRect.bottom)+i2,
+              rRatioRect.right+i3, 
+              rRatioRect.bottom+i4);            
+  }
+
+#ifdef _WINDOWS
+ ReleaseDC(hWWindow,hdc);                              // ! important !
+#endif
+
+ if(ulKeybits&KEY_RESETTEXSTORE) ResetStuff();         // reset on gpu mode changes? do it before next frame is filled
+}
+
+////////////////////////////////////////////////////////////////////////
+// update front display: smaller update func, if something has changed 
+// in the frontbuffer... dirty, but hey... real men know no pain
+////////////////////////////////////////////////////////////////////////
+
+void updateFrontDisplay(void)
+{
+ if(PreviousPSXDisplay.Range.x0||
+    PreviousPSXDisplay.Range.y0)
+  PaintBlackBorders();
+
+ if(iBlurBuffer) BlurBackBuffer();
+
+ if(iUseScanLines) SetScanLines();
+
+ if(usCursorActive) ShowGunCursor();
+
+ bFakeFrontBuffer=FALSE;
+ bRenderFrontBuffer=FALSE;
+
+ if(gTexPicName) DisplayPic();
+ if(ulKeybits&KEY_SHOWFPS) DisplayText();
+
+#ifdef _WINDOWS
+  {                                                    // windows: 
+   HDC hdc=GetDC(hWWindow);
+   wglMakeCurrent(hdc,GLCONTEXT);                      // -> make current again
+   if(iDrawnSomething)
+    SwapBuffers(wglGetCurrentDC());                    // -> swap
+   ReleaseDC(hWWindow,hdc);                            // -> ! important !
+  }
+#elif defined (_MACGL)
+if (iDrawnSomething){
+    DoBufferSwap();
+    }
+#else
+ if(iDrawnSomething)                                   // linux:
+  glXSwapBuffers(display,window);
+#endif
+
+ if(iBlurBuffer) UnBlurBackBuffer();
+}
+                                             
+////////////////////////////////////////////////////////////////////////
+// check if update needed
+////////////////////////////////////////////////////////////////////////
+
+static void ChangeDispOffsetsX(void)                          // CENTER X
+{
+ int lx,l;short sO;
+
+ if(!PSXDisplay.Range.x1) return;                      // some range given?
+
+ l=PSXDisplay.DisplayMode.x;
+
+ l*=(int)PSXDisplay.Range.x1;                          // some funky calculation
+ l/=2560;lx=l;l&=0xfffffff8;
+ 
+ if(l==PreviousPSXDisplay.Range.x1) return;            // some change?
+
+ sO=PreviousPSXDisplay.Range.x0;                       // store old
+
+ if(lx>=PSXDisplay.DisplayMode.x)                      // range bigger?
+  {
+   PreviousPSXDisplay.Range.x1=                        // -> take display width
+    PSXDisplay.DisplayMode.x;
+   PreviousPSXDisplay.Range.x0=0;                      // -> start pos is 0
+  }
+ else                                                  // range smaller? center it
+  {
+   PreviousPSXDisplay.Range.x1=l;                      // -> store width (8 pixel aligned)
+    PreviousPSXDisplay.Range.x0=                       // -> calc start pos
+    (PSXDisplay.Range.x0-500)/8;
+   if(PreviousPSXDisplay.Range.x0<0)                   // -> we don't support neg. values yet
+    PreviousPSXDisplay.Range.x0=0;
+
+   if((PreviousPSXDisplay.Range.x0+lx)>                // -> uhuu... that's too much
+      PSXDisplay.DisplayMode.x)
+    {
+     PreviousPSXDisplay.Range.x0=                      // -> adjust start
+      PSXDisplay.DisplayMode.x-lx;
+     PreviousPSXDisplay.Range.x1+=lx-l;                // -> adjust width
+    }                   
+  }
+
+ if(sO!=PreviousPSXDisplay.Range.x0)                   // something changed?
+  {
+   bDisplayNotSet=TRUE;                                // -> recalc display stuff
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void ChangeDispOffsetsY(void)                          // CENTER Y
+{
+ int iT;short sO;                                      // store previous y size
+
+ if(PSXDisplay.PAL) iT=48; else iT=28;                 // different offsets on PAL/NTSC
+
+ if(PSXDisplay.Range.y0>=iT)                           // crossed the security line? :)
+  {
+   PreviousPSXDisplay.Range.y1=                        // -> store width
+    PSXDisplay.DisplayModeNew.y;
+   
+   sO=(PSXDisplay.Range.y0-iT-4)*PSXDisplay.Double;    // -> calc offset
+   if(sO<0) sO=0;
+
+   PSXDisplay.DisplayModeNew.y+=sO;                    // -> add offset to y size, too
+  }
+ else sO=0;                                            // else no offset
+
+ if(sO!=PreviousPSXDisplay.Range.y0)                   // something changed?
+  {
+   PreviousPSXDisplay.Range.y0=sO;
+   bDisplayNotSet=TRUE;                                // -> recalc display stuff
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Aspect ratio of ogl screen: simply adjusting ogl view port
+////////////////////////////////////////////////////////////////////////
+
+void SetAspectRatio(void)
+{
+ float xs,ys,s;RECT r;
+
+ if(!PSXDisplay.DisplayModeNew.x) return;
+ if(!PSXDisplay.DisplayModeNew.y) return;
+
+ xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;
+ ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;
+
+ s=min(xs,ys);
+ r.right =(int)((float)PSXDisplay.DisplayModeNew.x*s);
+ r.bottom=(int)((float)PSXDisplay.DisplayModeNew.y*s);
+ if(r.right  > iResX) r.right  = iResX;
+ if(r.bottom > iResY) r.bottom = iResY;
+ if(r.right  < 1)     r.right  = 1;
+ if(r.bottom < 1)     r.bottom = 1;
+
+ r.left = (iResX-r.right)/2;
+ r.top  = (iResY-r.bottom)/2;
+
+ if(r.bottom<rRatioRect.bottom ||
+    r.right <rRatioRect.right)
+  {
+   RECT rC;
+   glClearColor(0,0,0,128);                         
+
+   if(r.right <rRatioRect.right)
+    {
+     rC.left=0;
+     rC.top=0;
+     rC.right=r.left;
+     rC.bottom=iResY;
+     glScissor(rC.left,rC.top,rC.right,rC.bottom);
+     glClear(uiBufferBits);
+     rC.left=iResX-rC.right;
+     glScissor(rC.left,rC.top,rC.right,rC.bottom);
+     glClear(uiBufferBits);
+    }
+
+   if(r.bottom <rRatioRect.bottom)
+    {
+     rC.left=0;
+     rC.top=0;
+     rC.right=iResX;
+     rC.bottom=r.top;
+     glScissor(rC.left,rC.top,rC.right,rC.bottom);
+     glClear(uiBufferBits);
+     rC.top=iResY-rC.bottom;
+     glScissor(rC.left,rC.top,rC.right,rC.bottom);
+     glClear(uiBufferBits);
+    }
+   
+   bSetClip=TRUE;
+   bDisplayNotSet=TRUE;
+  }
+
+ rRatioRect=r;
+
+
+ glViewport(rRatioRect.left,
+            iResY-(rRatioRect.top+rRatioRect.bottom),
+            rRatioRect.right,
+            rRatioRect.bottom);                         // init viewport
+}
+
+////////////////////////////////////////////////////////////////////////
+// big ass check, if an ogl swap buffer is needed
+////////////////////////////////////////////////////////////////////////
+
+static void updateDisplayIfChanged(void)
+{
+ BOOL bUp;
+
+ if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) && 
+     (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))
+  {
+   if((PSXDisplay.RGB24      == PSXDisplay.RGB24New) && 
+      (PSXDisplay.Interlaced == PSXDisplay.InterlacedNew)) 
+      return;                                          // nothing has changed? fine, no swap buffer needed
+  }
+ else                                                  // some res change?
+  {
+   glLoadIdentity();
+   glOrtho(0,PSXDisplay.DisplayModeNew.x,              // -> new psx resolution
+             PSXDisplay.DisplayModeNew.y, 0, -1, 1);
+   if(bKeepRatio) SetAspectRatio();
+  }
+
+ bDisplayNotSet = TRUE;                                // re-calc offsets/display area
+ 
+ bUp=FALSE;
+ if(PSXDisplay.RGB24!=PSXDisplay.RGB24New)             // clean up textures, if rgb mode change (usually mdec on/off)
+  {
+   PreviousPSXDisplay.RGB24=0;                         // no full 24 frame uploaded yet
+   ResetTextureArea(FALSE);
+   bUp=TRUE;
+  }
+
+ PSXDisplay.RGB24         = PSXDisplay.RGB24New;       // get new infos
+ PSXDisplay.DisplayMode.y = PSXDisplay.DisplayModeNew.y;
+ PSXDisplay.DisplayMode.x = PSXDisplay.DisplayModeNew.x;
+ PSXDisplay.Interlaced    = PSXDisplay.InterlacedNew;
+    
+ PSXDisplay.DisplayEnd.x=                              // calc new ends
+  PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PSXDisplay.DisplayEnd.y=
+  PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+ PreviousPSXDisplay.DisplayEnd.x=
+  PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PreviousPSXDisplay.DisplayEnd.y=
+  PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+ ChangeDispOffsetsX();
+
+ if(iFrameLimit==2) SetAutoFrameCap();                 // set new fps limit vals (depends on interlace)
+
+ if(bUp) updateDisplay();                              // yeah, real update (swap buffer)
+}
+
+////////////////////////////////////////////////////////////////////////
+// window mode <-> fullscreen mode (windows)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+void ChangeWindowMode(void)
+ {
+  GPUclose();
+  bWindowMode=!bWindowMode;
+  GPUopen(hWWindow);
+  bChangeWinMode=FALSE;
+ }
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// swap update check (called by psx vsync function)
+////////////////////////////////////////////////////////////////////////
+
+static BOOL bSwapCheck(void)
+{
+ static int iPosCheck=0;
+ static PSXPoint_t pO;
+ static PSXPoint_t pD;
+ static int iDoAgain=0;
+
+ if(PSXDisplay.DisplayPosition.x==pO.x &&
+    PSXDisplay.DisplayPosition.y==pO.y &&
+    PSXDisplay.DisplayEnd.x==pD.x &&
+    PSXDisplay.DisplayEnd.y==pD.y)
+      iPosCheck++;
+ else iPosCheck=0;
+
+ pO=PSXDisplay.DisplayPosition;
+ pD=PSXDisplay.DisplayEnd;
+
+ if(iPosCheck<=4) return FALSE;
+
+ iPosCheck=4;
+
+ if(PSXDisplay.Interlaced) return FALSE;
+
+ if (bNeedInterlaceUpdate||
+     bNeedRGB24Update ||
+     bNeedUploadAfter|| 
+     bNeedUploadTest || 
+     iDoAgain
+    )
+  {
+   iDoAgain=0;
+   if(bNeedUploadAfter) 
+    iDoAgain=1;
+   if(bNeedUploadTest && PSXDisplay.InterlacedTest)
+    iDoAgain=1;
+
+   bDisplayNotSet = TRUE;
+   updateDisplay();
+
+   PreviousPSXDisplay.DisplayPosition.x=PSXDisplay.DisplayPosition.x;
+   PreviousPSXDisplay.DisplayPosition.y=PSXDisplay.DisplayPosition.y;
+   PreviousPSXDisplay.DisplayEnd.x=PSXDisplay.DisplayEnd.x;
+   PreviousPSXDisplay.DisplayEnd.y=PSXDisplay.DisplayEnd.y;
+   pO=PSXDisplay.DisplayPosition;
+   pD=PSXDisplay.DisplayEnd;
+
+   return TRUE;
+  }
+
+ return FALSE;
+} 
+
+////////////////////////////////////////////////////////////////////////
+// gun cursor func: player=0-7, x=0-511, y=0-255
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUcursor(int iPlayer,int x,int y)
+{
+ if(iPlayer<0) return;
+ if(iPlayer>7) return;
+
+ usCursorActive|=(1<<iPlayer);
+
+ if(x<0)              x=0;
+ if(x>iGPUHeightMask) x=iGPUHeightMask;
+ if(y<0)              y=0;
+ if(y>255)            y=255;
+
+ ptCursorPoint[iPlayer].x=x;
+ ptCursorPoint[iPlayer].y=y;
+}
+
+////////////////////////////////////////////////////////////////////////
+// update lace is called every VSync. Basically we limit frame rate 
+// here, and in interlaced mode we swap ogl display buffers.
+////////////////////////////////////////////////////////////////////////
+
+static unsigned short usFirstPos=2;
+
+void CALLBACK GPUupdateLace(void)
+{
+ //if(!(dwActFixes&0x1000))                               
+ // STATUSREG^=0x80000000;                               // interlaced bit toggle, if the CC game fix is not active (see gpuReadStatus)
+
+ if(!(dwActFixes&128))                                 // normal frame limit func
+  CheckFrameRate();
+
+ if(iOffscreenDrawing==4)                              // special check if high offscreen drawing is on
+  {
+   if(bSwapCheck()) return;
+  }
+
+ if(PSXDisplay.Interlaced)                             // interlaced mode?
+  {
+   STATUSREG^=0x80000000;
+   if(PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)
+    {
+     updateDisplay();                                  // -> swap buffers (new frame)
+    }
+  }
+ else if(bRenderFrontBuffer)                           // no interlace mode? and some stuff in front has changed?
+  {
+   updateFrontDisplay();                               // -> update front buffer
+  }
+ else if(usFirstPos==1)                                // initial updates (after startup)
+  {
+   updateDisplay();
+  }
+
+#if defined(_WINDOWS) || defined(_MACGL)
+ if(bChangeWinMode) ChangeWindowMode();
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// process read request from GPU status register
+////////////////////////////////////////////////////////////////////////
+
+uint32_t CALLBACK GPUreadStatus(void)
+{
+ if(dwActFixes&0x1000)                                 // CC game fix
+  {
+   static int iNumRead=0;
+   if((iNumRead++)==2)
+    {
+     iNumRead=0;
+     STATUSREG^=0x80000000;                            // interlaced bit toggle... we do it on every second read status... needed by some games (like ChronoCross)
+    }
+  }
+
+ if(iFakePrimBusy)                                     // 27.10.2007 - emulating some 'busy' while drawing... pfff... not perfect, but since our emulated dma is not done in an extra thread...
+  {
+   iFakePrimBusy--;
+
+   if(iFakePrimBusy&1)                                 // we do a busy-idle-busy-idle sequence after/while drawing prims
+    {
+     GPUIsBusy;
+     GPUIsNotReadyForCommands;
+    }
+   else
+    {
+     GPUIsIdle;
+     GPUIsReadyForCommands;
+    }
+  }
+
+ return STATUSREG | (vBlank ? 0x80000000 : 0 );;
+}
+
+////////////////////////////////////////////////////////////////////////
+// processes data send to GPU status register
+// these are always single packet commands.
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteStatus(uint32_t gdata)
+{
+ uint32_t lCommand=(gdata>>24)&0xff;
+
+#ifdef _WINDOWS
+ if(bIsFirstFrame) GLinitialize();                     // real ogl startup (needed by some emus)
+#endif
+
+ ulStatusControl[lCommand]=gdata;
+
+ switch(lCommand)
+  {
+   //--------------------------------------------------//
+   // reset gpu
+   case 0x00:
+    memset(ulGPUInfoVals, 0x00, 16 * sizeof(uint32_t));
+    lGPUstatusRet = 0x14802000;
+    PSXDisplay.Disabled=1;
+    iDataWriteMode=iDataReadMode=DR_NORMAL;
+    PSXDisplay.DrawOffset.x=PSXDisplay.DrawOffset.y=0;
+    drawX=drawY=0;drawW=drawH=0;
+    sSetMask=0;lSetMask=0;bCheckMask=FALSE;iSetMask=0;
+    usMirror=0;
+    GlobalTextAddrX=0;GlobalTextAddrY=0;
+    GlobalTextTP=0;GlobalTextABR=0;
+    PSXDisplay.RGB24=FALSE;
+    PSXDisplay.Interlaced=FALSE;
+    bUsingTWin = FALSE;
+    return;
+
+   // dis/enable display
+   case 0x03:  
+    PreviousPSXDisplay.Disabled = PSXDisplay.Disabled;
+    PSXDisplay.Disabled = (gdata & 1);
+
+    if(PSXDisplay.Disabled) 
+         STATUSREG|=GPUSTATUS_DISPLAYDISABLED;
+    else STATUSREG&=~GPUSTATUS_DISPLAYDISABLED;
+
+    if (iOffscreenDrawing==4 &&
+         PreviousPSXDisplay.Disabled && 
+        !(PSXDisplay.Disabled))
+     {
+
+      if(!PSXDisplay.RGB24)
+       {
+        PrepareFullScreenUpload(TRUE);
+        UploadScreen(TRUE); 
+        updateDisplay();
+       }
+     }
+
+    return;
+
+   // setting transfer mode
+   case 0x04:
+    gdata &= 0x03;                                     // only want the lower two bits
+
+    iDataWriteMode=iDataReadMode=DR_NORMAL;
+    if(gdata==0x02) iDataWriteMode=DR_VRAMTRANSFER;
+    if(gdata==0x03) iDataReadMode =DR_VRAMTRANSFER;
+
+    STATUSREG&=~GPUSTATUS_DMABITS;                     // clear the current settings of the DMA bits
+    STATUSREG|=(gdata << 29);                          // set the DMA bits according to the received data
+
+    return;
+
+   // setting display position
+   case 0x05: 
+    {
+     short sx=(short)(gdata & 0x3ff);
+     short sy;
+
+     if(iGPUHeight==1024)
+      {
+       if(dwGPUVersion==2) 
+            sy = (short)((gdata>>12)&0x3ff);
+       else sy = (short)((gdata>>10)&0x3ff);
+      }
+     else sy = (short)((gdata>>10)&0x3ff);             // really: 0x1ff, but we adjust it later
+
+     if (sy & 0x200) 
+      {
+       sy|=0xfc00;
+       PreviousPSXDisplay.DisplayModeNew.y=sy/PSXDisplay.Double;
+       sy=0;
+      }
+     else PreviousPSXDisplay.DisplayModeNew.y=0;
+
+     if(sx>1000) sx=0;
+
+     if(usFirstPos)
+      {
+       usFirstPos--;
+       if(usFirstPos)
+        {
+         PreviousPSXDisplay.DisplayPosition.x = sx;
+         PreviousPSXDisplay.DisplayPosition.y = sy;
+         PSXDisplay.DisplayPosition.x = sx;
+         PSXDisplay.DisplayPosition.y = sy;
+        }
+      }
+
+     if(dwActFixes&8) 
+      {
+       if((!PSXDisplay.Interlaced) &&
+          PreviousPSXDisplay.DisplayPosition.x == sx  &&
+          PreviousPSXDisplay.DisplayPosition.y == sy)
+        return;
+
+       PSXDisplay.DisplayPosition.x = PreviousPSXDisplay.DisplayPosition.x;
+       PSXDisplay.DisplayPosition.y = PreviousPSXDisplay.DisplayPosition.y;
+       PreviousPSXDisplay.DisplayPosition.x = sx;
+       PreviousPSXDisplay.DisplayPosition.y = sy;
+      }
+     else
+      {
+       if((!PSXDisplay.Interlaced) &&
+          PSXDisplay.DisplayPosition.x == sx  &&
+          PSXDisplay.DisplayPosition.y == sy)
+        return;
+       PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
+       PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
+       PSXDisplay.DisplayPosition.x = sx;
+       PSXDisplay.DisplayPosition.y = sy;
+      }
+
+     PSXDisplay.DisplayEnd.x=
+      PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+     PSXDisplay.DisplayEnd.y=
+      PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+     PreviousPSXDisplay.DisplayEnd.x=
+      PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+     PreviousPSXDisplay.DisplayEnd.y=
+      PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+     bDisplayNotSet = TRUE;
+
+     if (!(PSXDisplay.Interlaced))
+      {
+       updateDisplay();
+      }
+     else
+     if(PSXDisplay.InterlacedTest && 
+        ((PreviousPSXDisplay.DisplayPosition.x != PSXDisplay.DisplayPosition.x)||
+         (PreviousPSXDisplay.DisplayPosition.y != PSXDisplay.DisplayPosition.y)))
+      PSXDisplay.InterlacedTest--;
+ 
+     return;
+    }
+
+   // setting width
+   case 0x06:
+
+    PSXDisplay.Range.x0=gdata & 0x7ff;      //0x3ff;
+    PSXDisplay.Range.x1=(gdata>>12) & 0xfff;//0x7ff;
+
+    PSXDisplay.Range.x1-=PSXDisplay.Range.x0;
+
+    ChangeDispOffsetsX();
+
+    return;
+
+   // setting height
+   case 0x07:
+
+    PreviousPSXDisplay.Height = PSXDisplay.Height;
+
+    PSXDisplay.Range.y0=gdata & 0x3ff;
+    PSXDisplay.Range.y1=(gdata>>10) & 0x3ff;
+
+    PSXDisplay.Height = PSXDisplay.Range.y1 - 
+                        PSXDisplay.Range.y0 +
+                        PreviousPSXDisplay.DisplayModeNew.y;
+
+    if (PreviousPSXDisplay.Height != PSXDisplay.Height)
+     {
+      PSXDisplay.DisplayModeNew.y=PSXDisplay.Height*PSXDisplay.Double;
+      ChangeDispOffsetsY();
+      updateDisplayIfChanged();
+     }
+    return;
+ 
+   // setting display infos
+   case 0x08:
+
+    PSXDisplay.DisplayModeNew.x = dispWidths[(gdata & 0x03) | ((gdata & 0x40) >> 4)];
+
+    if (gdata&0x04) PSXDisplay.Double=2;
+    else            PSXDisplay.Double=1;
+    PSXDisplay.DisplayModeNew.y = PSXDisplay.Height*PSXDisplay.Double;
+
+    ChangeDispOffsetsY();
+  
+    PSXDisplay.PAL           = (gdata & 0x08)?TRUE:FALSE; // if 1 - PAL mode, else NTSC
+    PSXDisplay.RGB24New      = (gdata & 0x10)?TRUE:FALSE; // if 1 - TrueColor
+    PSXDisplay.InterlacedNew = (gdata & 0x20)?TRUE:FALSE; // if 1 - Interlace
+
+    STATUSREG&=~GPUSTATUS_WIDTHBITS;                   // clear the width bits
+
+    STATUSREG|=
+               (((gdata & 0x03) << 17) | 
+               ((gdata & 0x40) << 10));                // set the width bits
+
+    PreviousPSXDisplay.InterlacedNew=FALSE;
+    if (PSXDisplay.InterlacedNew)
+     {
+      if(!PSXDisplay.Interlaced)
+       {
+        PSXDisplay.InterlacedTest=2;
+        PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
+        PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
+        PreviousPSXDisplay.InterlacedNew=TRUE;
+       }
+
+      STATUSREG|=GPUSTATUS_INTERLACED;
+     }
+    else 
+     {
+      PSXDisplay.InterlacedTest=0;
+      STATUSREG&=~GPUSTATUS_INTERLACED;
+     }
+
+    if (PSXDisplay.PAL)
+         STATUSREG|=GPUSTATUS_PAL;
+    else STATUSREG&=~GPUSTATUS_PAL;
+
+    if (PSXDisplay.Double==2)
+         STATUSREG|=GPUSTATUS_DOUBLEHEIGHT;
+    else STATUSREG&=~GPUSTATUS_DOUBLEHEIGHT;
+
+    if (PSXDisplay.RGB24New)
+         STATUSREG|=GPUSTATUS_RGB24;
+    else STATUSREG&=~GPUSTATUS_RGB24;
+
+    updateDisplayIfChanged();
+
+    return;
+
+   //--------------------------------------------------//
+   // ask about GPU version and other stuff
+   case 0x10: 
+
+    gdata&=0xff;
+
+    switch(gdata) 
+     {
+      case 0x02:
+       GPUdataRet=ulGPUInfoVals[INFO_TW];              // tw infos
+       return;
+      case 0x03:
+       GPUdataRet=ulGPUInfoVals[INFO_DRAWSTART];       // draw start
+       return;
+      case 0x04:
+       GPUdataRet=ulGPUInfoVals[INFO_DRAWEND];         // draw end
+       return;
+      case 0x05:
+      case 0x06:
+       GPUdataRet=ulGPUInfoVals[INFO_DRAWOFF];         // draw offset
+       return;
+      case 0x07:
+       if(dwGPUVersion==2)
+            GPUdataRet=0x01;
+       else GPUdataRet=0x02;                           // gpu type
+       return;
+      case 0x08:
+      case 0x0F:                                       // some bios addr?
+       GPUdataRet=0xBFC03720;
+       return;
+     }
+    return;
+   //--------------------------------------------------//
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read/write helpers
+////////////////////////////////////////////////////////////////////////
+
+BOOL bNeedWriteUpload=FALSE;
+
+static __inline void FinishedVRAMWrite(void)
+{
+ if(bNeedWriteUpload)
+  {
+   bNeedWriteUpload=FALSE;
+   CheckWriteUpdate();
+  }
+
+ // set register to NORMAL operation
+ iDataWriteMode = DR_NORMAL;
+
+ // reset transfer values, to prevent mis-transfer of data
+ VRAMWrite.ColsRemaining = 0;
+ VRAMWrite.RowsRemaining = 0;
+}
+
+static __inline void FinishedVRAMRead(void)
+{
+ // set register to NORMAL operation
+ iDataReadMode = DR_NORMAL;
+ // reset transfer values, to prevent mis-transfer of data
+ VRAMRead.x = 0;
+ VRAMRead.y = 0;
+ VRAMRead.Width = 0;
+ VRAMRead.Height = 0;
+ VRAMRead.ColsRemaining = 0;
+ VRAMRead.RowsRemaining = 0;
+
+ // indicate GPU is no longer ready for VRAM data in the STATUS REGISTER
+ STATUSREG&=~GPUSTATUS_READYFORVRAM;
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read check ex (reading from card's back/frontbuffer if needed...
+// slow!)
+////////////////////////////////////////////////////////////////////////
+
+void CheckVRamReadEx(int x, int y, int dx, int dy)
+{
+ unsigned short sArea;
+ int ux,uy,udx,udy,wx,wy;
+ unsigned short * p1, *p2;
+ float XS,YS;
+ unsigned char * ps;
+ unsigned char * px;
+ unsigned short s,sx;
+
+ if(STATUSREG&GPUSTATUS_RGB24) return;
+
+ if(((dx  > PSXDisplay.DisplayPosition.x) &&
+     (x   < PSXDisplay.DisplayEnd.x) &&
+     (dy  > PSXDisplay.DisplayPosition.y) &&
+     (y   < PSXDisplay.DisplayEnd.y)))
+  sArea=0;
+ else
+ if((!(PSXDisplay.InterlacedTest) &&
+     (dx  > PreviousPSXDisplay.DisplayPosition.x) &&
+     (x   < PreviousPSXDisplay.DisplayEnd.x) &&
+     (dy  > PreviousPSXDisplay.DisplayPosition.y) &&
+     (y   < PreviousPSXDisplay.DisplayEnd.y)))
+  sArea=1;
+ else 
+  {
+   return;
+  }
+
+ //////////////
+
+ if(iRenderFVR)
+  {
+   bFullVRam=TRUE;iRenderFVR=2;return;
+  }
+ bFullVRam=TRUE;iRenderFVR=2;
+
+ //////////////
+
+ p2=0;
+
+ if(sArea==0)
+  {
+   ux=PSXDisplay.DisplayPosition.x;
+   uy=PSXDisplay.DisplayPosition.y;
+   udx=PSXDisplay.DisplayEnd.x-ux;
+   udy=PSXDisplay.DisplayEnd.y-uy;
+   if((PreviousPSXDisplay.DisplayEnd.x-
+       PreviousPSXDisplay.DisplayPosition.x)==udx &&
+      (PreviousPSXDisplay.DisplayEnd.y-
+       PreviousPSXDisplay.DisplayPosition.y)==udy)
+    p2=(psxVuw + (1024*PreviousPSXDisplay.DisplayPosition.y) + 
+        PreviousPSXDisplay.DisplayPosition.x);
+  }
+ else
+  {
+   ux=PreviousPSXDisplay.DisplayPosition.x;
+   uy=PreviousPSXDisplay.DisplayPosition.y;
+   udx=PreviousPSXDisplay.DisplayEnd.x-ux;
+   udy=PreviousPSXDisplay.DisplayEnd.y-uy;
+   if((PSXDisplay.DisplayEnd.x-
+       PSXDisplay.DisplayPosition.x)==udx &&
+      (PSXDisplay.DisplayEnd.y-
+       PSXDisplay.DisplayPosition.y)==udy)
+    p2=(psxVuw + (1024*PSXDisplay.DisplayPosition.y) + 
+        PSXDisplay.DisplayPosition.x);
+  }
+
+ p1=(psxVuw + (1024*uy) + ux);
+ if(p1==p2) p2=0;
+
+ x=0;y=0;
+ wx=dx=udx;wy=dy=udy;
+
+ if(udx<=0) return;
+ if(udy<=0) return;
+ if(dx<=0)  return;
+ if(dy<=0)  return;
+ if(wx<=0)  return;
+ if(wy<=0)  return;
+
+ XS=(float)rRatioRect.right/(float)wx;
+ YS=(float)rRatioRect.bottom/(float)wy;
+
+ dx=(int)((float)(dx)*XS);
+ dy=(int)((float)(dy)*YS);
+
+ if(dx>iResX) dx=iResX;
+ if(dy>iResY) dy=iResY;
+
+ if(dx<=0) return;
+ if(dy<=0) return;
+
+ // ogl y adjust
+ y=iResY-y-dy;
+
+ x+=rRatioRect.left;
+ y-=rRatioRect.top;
+
+ if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
+
+ if(!pGfxCardScreen)
+  {
+   glPixelStorei(GL_PACK_ALIGNMENT,1);
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+  }
+
+ ps=pGfxCardScreen;
+ 
+ if(!sArea) glReadBuffer(GL_FRONT);
+
+ glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
+               
+ if(!sArea) glReadBuffer(GL_BACK);
+
+ s=0;
+
+ XS=(float)dx/(float)(udx);
+ YS=(float)dy/(float)(udy+1);
+    
+ for(y=udy;y>0;y--)
+  {
+   for(x=0;x<udx;x++)
+    {
+     if(p1>=psxVuw && p1<psxVuw_eom)
+      {
+       px=ps+(3*((int)((float)x * XS))+
+             (3*dx)*((int)((float)y*YS)));
+       sx=(*px)>>3;px++;
+       s=sx;
+       sx=(*px)>>3;px++;
+       s|=sx<<5;
+       sx=(*px)>>3;
+       s|=sx<<10;
+       s&=~0x8000;
+       *p1=s;
+      }
+     if(p2>=psxVuw && p2<psxVuw_eom) *p2=s;
+
+     p1++;
+     if(p2) p2++;
+    }
+
+   p1 += 1024 - udx;
+   if(p2) p2 += 1024 - udx;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read check (reading from card's back/frontbuffer if needed... 
+// slow!)
+////////////////////////////////////////////////////////////////////////
+
+void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront)
+{
+ unsigned short sArea;unsigned short * p;
+ int ux,uy,udx,udy,wx,wy;float XS,YS;
+ unsigned char * ps, * px;
+ unsigned short s=0,sx;
+
+ if(STATUSREG&GPUSTATUS_RGB24) return;
+
+ if(((dx  > PSXDisplay.DisplayPosition.x) &&
+     (x   < PSXDisplay.DisplayEnd.x) &&
+     (dy  > PSXDisplay.DisplayPosition.y) &&
+     (y   < PSXDisplay.DisplayEnd.y)))
+  sArea=0;
+ else
+ if((!(PSXDisplay.InterlacedTest) &&
+     (dx  > PreviousPSXDisplay.DisplayPosition.x) &&
+     (x   < PreviousPSXDisplay.DisplayEnd.x) &&
+     (dy  > PreviousPSXDisplay.DisplayPosition.y) &&
+     (y   < PreviousPSXDisplay.DisplayEnd.y)))
+  sArea=1;
+ else 
+  {
+   return;
+  }
+
+ if(dwActFixes&0x40)
+  {
+   if(iRenderFVR)
+    {
+     bFullVRam=TRUE;iRenderFVR=2;return;
+    }
+   bFullVRam=TRUE;iRenderFVR=2;
+  }
+
+ ux=x;uy=y;udx=dx;udy=dy;
+
+ if(sArea==0)
+  {
+   x -=PSXDisplay.DisplayPosition.x;
+   dx-=PSXDisplay.DisplayPosition.x;
+   y -=PSXDisplay.DisplayPosition.y;
+   dy-=PSXDisplay.DisplayPosition.y;
+   wx=PSXDisplay.DisplayEnd.x-PSXDisplay.DisplayPosition.x;
+   wy=PSXDisplay.DisplayEnd.y-PSXDisplay.DisplayPosition.y;
+  }
+ else
+  {
+   x -=PreviousPSXDisplay.DisplayPosition.x;
+   dx-=PreviousPSXDisplay.DisplayPosition.x;
+   y -=PreviousPSXDisplay.DisplayPosition.y;
+   dy-=PreviousPSXDisplay.DisplayPosition.y;
+   wx=PreviousPSXDisplay.DisplayEnd.x-PreviousPSXDisplay.DisplayPosition.x;
+   wy=PreviousPSXDisplay.DisplayEnd.y-PreviousPSXDisplay.DisplayPosition.y;
+  }
+ if(x<0) {ux-=x;x=0;}
+ if(y<0) {uy-=y;y=0;}
+ if(dx>wx) {udx-=(dx-wx);dx=wx;}
+ if(dy>wy) {udy-=(dy-wy);dy=wy;}
+ udx-=ux;
+ udy-=uy;
+  
+ p=(psxVuw + (1024*uy) + ux);
+
+ if(udx<=0) return;
+ if(udy<=0) return;
+ if(dx<=0)  return;
+ if(dy<=0)  return;
+ if(wx<=0)  return;
+ if(wy<=0)  return;
+
+ XS=(float)rRatioRect.right/(float)wx;
+ YS=(float)rRatioRect.bottom/(float)wy;
+
+ dx=(int)((float)(dx)*XS);
+ dy=(int)((float)(dy)*YS);
+ x=(int)((float)x*XS);
+ y=(int)((float)y*YS);
+
+ dx-=x;
+ dy-=y;
+
+ if(dx>iResX) dx=iResX;
+ if(dy>iResY) dy=iResY;
+
+ if(dx<=0) return;
+ if(dy<=0) return;
+
+ // ogl y adjust
+ y=iResY-y-dy;
+
+ x+=rRatioRect.left;
+ y-=rRatioRect.top;
+
+ if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
+
+ if(!pGfxCardScreen)
+  {
+   glPixelStorei(GL_PACK_ALIGNMENT,1);
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+  }
+
+ ps=pGfxCardScreen;
+ 
+ if(bFront) glReadBuffer(GL_FRONT);
+
+ glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
+               
+ if(bFront) glReadBuffer(GL_BACK);
+
+ XS=(float)dx/(float)(udx);
+ YS=(float)dy/(float)(udy+1);
+    
+ for(y=udy;y>0;y--)
+  {
+   for(x=0;x<udx;x++)
+    {
+     if(p>=psxVuw && p<psxVuw_eom)
+      {
+       px=ps+(3*((int)((float)x * XS))+
+             (3*dx)*((int)((float)y*YS)));
+       sx=(*px)>>3;px++;
+       s=sx;
+       sx=(*px)>>3;px++;
+       s|=sx<<5;
+       sx=(*px)>>3;
+       s|=sx<<10;
+       s&=~0x8000;
+       *p=s;
+      }
+     p++;
+    }
+   p += 1024 - udx;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// core read from vram
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUreadDataMem(uint32_t *pMem, int iSize)
+{
+ int i;
+
+ if(iDataReadMode!=DR_VRAMTRANSFER) return;
+
+ GPUIsBusy;
+
+ // adjust read ptr, if necessary
+ while(VRAMRead.ImagePtr>=psxVuw_eom)
+  VRAMRead.ImagePtr-=iGPUHeight*1024;
+ while(VRAMRead.ImagePtr<psxVuw)
+  VRAMRead.ImagePtr+=iGPUHeight*1024;
+
+ if((iFrameReadType&1 && iSize>1) &&
+    !(iDrawnSomething==2 &&
+      VRAMRead.x      == VRAMWrite.x     &&
+      VRAMRead.y      == VRAMWrite.y     &&
+      VRAMRead.Width  == VRAMWrite.Width &&
+      VRAMRead.Height == VRAMWrite.Height))
+  CheckVRamRead(VRAMRead.x,VRAMRead.y,
+                VRAMRead.x+VRAMRead.RowsRemaining,
+                VRAMRead.y+VRAMRead.ColsRemaining,
+                TRUE);
+
+ for(i=0;i<iSize;i++)
+  {
+   // do 2 seperate 16bit reads for compatibility (wrap issues)
+   if ((VRAMRead.ColsRemaining > 0) && (VRAMRead.RowsRemaining > 0))
+    {
+     // lower 16 bit
+     GPUdataRet=(uint32_t)*VRAMRead.ImagePtr;
+
+     VRAMRead.ImagePtr++;
+     if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+     VRAMRead.RowsRemaining --;
+
+     if(VRAMRead.RowsRemaining<=0)
+      {
+       VRAMRead.RowsRemaining = VRAMRead.Width;
+       VRAMRead.ColsRemaining--;
+       VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
+       if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+      }
+
+     // higher 16 bit (always, even if it's an odd width)
+     GPUdataRet|=(uint32_t)(*VRAMRead.ImagePtr)<<16;
+     *pMem++=GPUdataRet;
+
+     if(VRAMRead.ColsRemaining <= 0)
+      {FinishedVRAMRead();goto ENDREAD;}
+
+     VRAMRead.ImagePtr++;
+     if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+     VRAMRead.RowsRemaining--;
+     if(VRAMRead.RowsRemaining<=0)
+      {
+       VRAMRead.RowsRemaining = VRAMRead.Width;
+       VRAMRead.ColsRemaining--;
+       VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
+       if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+      }
+     if(VRAMRead.ColsRemaining <= 0)
+      {FinishedVRAMRead();goto ENDREAD;}
+    }
+   else {FinishedVRAMRead();goto ENDREAD;}
+  }
+
+ENDREAD:
+ GPUIsIdle;
+}
+
+uint32_t CALLBACK GPUreadData(void)
+{
+ uint32_t l;
+ GPUreadDataMem(&l,1);
+ return GPUdataRet;
+}
+
+////////////////////////////////////////////////////////////////////////
+// helper table to know how much data is used by drawing commands
+////////////////////////////////////////////////////////////////////////
+
+const unsigned char primTableCX[256] =
+{
+    // 00
+    0,0,3,0,0,0,0,0,
+    // 08
+    0,0,0,0,0,0,0,0,
+    // 10
+    0,0,0,0,0,0,0,0,
+    // 18
+    0,0,0,0,0,0,0,0,
+    // 20
+    4,4,4,4,7,7,7,7,
+    // 28
+    5,5,5,5,9,9,9,9,
+    // 30
+    6,6,6,6,9,9,9,9,
+    // 38
+    8,8,8,8,12,12,12,12,
+    // 40
+    3,3,3,3,0,0,0,0,
+    // 48
+//    5,5,5,5,6,6,6,6,      //FLINE
+    254,254,254,254,254,254,254,254,
+    // 50
+    4,4,4,4,0,0,0,0,
+    // 58
+//    7,7,7,7,9,9,9,9,    //    LINEG3    LINEG4
+    255,255,255,255,255,255,255,255,
+    // 60
+    3,3,3,3,4,4,4,4,    //    TILE    SPRT
+    // 68
+    2,2,2,2,3,3,3,3,    //    TILE1
+    // 70
+    2,2,2,2,3,3,3,3,
+    // 78
+    2,2,2,2,3,3,3,3,
+    // 80
+    4,0,0,0,0,0,0,0,
+    // 88
+    0,0,0,0,0,0,0,0,
+    // 90
+    0,0,0,0,0,0,0,0,
+    // 98
+    0,0,0,0,0,0,0,0,
+    // a0
+    3,0,0,0,0,0,0,0,
+    // a8
+    0,0,0,0,0,0,0,0,
+    // b0
+    0,0,0,0,0,0,0,0,
+    // b8
+    0,0,0,0,0,0,0,0,
+    // c0
+    3,0,0,0,0,0,0,0,
+    // c8
+    0,0,0,0,0,0,0,0,
+    // d0
+    0,0,0,0,0,0,0,0,
+    // d8
+    0,0,0,0,0,0,0,0,
+    // e0
+    0,1,1,1,1,1,1,0,
+    // e8
+    0,0,0,0,0,0,0,0,
+    // f0
+    0,0,0,0,0,0,0,0,
+    // f8
+    0,0,0,0,0,0,0,0
+};
+
+////////////////////////////////////////////////////////////////////////
+// processes data send to GPU data register
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteDataMem(uint32_t *pMem, int iSize)
+{
+ unsigned char command;
+ uint32_t gdata=0;
+ int i=0;
+ GPUIsBusy;
+ GPUIsNotReadyForCommands;
+
+STARTVRAM:
+
+ if(iDataWriteMode==DR_VRAMTRANSFER)
+  {
+   // make sure we are in vram
+   while(VRAMWrite.ImagePtr>=psxVuw_eom)
+    VRAMWrite.ImagePtr-=iGPUHeight*1024;
+   while(VRAMWrite.ImagePtr<psxVuw)
+    VRAMWrite.ImagePtr+=iGPUHeight*1024;
+
+   // now do the loop
+   while(VRAMWrite.ColsRemaining>0)
+    {
+     while(VRAMWrite.RowsRemaining>0)
+      {
+       if(i>=iSize) {goto ENDVRAM;}
+       i++;
+
+       gdata=*pMem++;
+
+       *VRAMWrite.ImagePtr++ = (unsigned short)gdata;
+       if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
+       VRAMWrite.RowsRemaining --;
+
+       if(VRAMWrite.RowsRemaining <= 0)
+        {
+         VRAMWrite.ColsRemaining--;
+         if (VRAMWrite.ColsRemaining <= 0)             // last pixel is odd width
+          {
+           gdata=(gdata&0xFFFF)|(((uint32_t)(*VRAMWrite.ImagePtr))<<16);
+           FinishedVRAMWrite();
+           goto ENDVRAM;
+          }
+         VRAMWrite.RowsRemaining = VRAMWrite.Width;
+         VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
+        }
+
+       *VRAMWrite.ImagePtr++ = (unsigned short)(gdata>>16);
+       if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
+       VRAMWrite.RowsRemaining --;
+      }
+
+     VRAMWrite.RowsRemaining = VRAMWrite.Width;
+     VRAMWrite.ColsRemaining--;
+     VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
+    }
+
+   FinishedVRAMWrite();
+  }
+
+ENDVRAM:
+
+ if(iDataWriteMode==DR_NORMAL)
+  {
+   void (* *primFunc)(unsigned char *);
+   if(bSkipNextFrame) primFunc=primTableSkip;
+   else               primFunc=primTableJ;
+
+   for(;i<iSize;)
+    {
+     if(iDataWriteMode==DR_VRAMTRANSFER) goto STARTVRAM;
+
+     gdata=*pMem++;i++;
+ 
+     if(gpuDataC == 0)
+      {
+       command = (unsigned char)((gdata>>24) & 0xff);
+ 
+       if(primTableCX[command])
+        {
+         gpuDataC = primTableCX[command];
+         gpuCommand = command;
+         gpuDataM[0] = gdata;
+         gpuDataP = 1;
+        }
+       else continue;
+      }
+     else
+      {
+       gpuDataM[gpuDataP] = gdata;
+       if(gpuDataC>128)
+        {
+         if((gpuDataC==254 && gpuDataP>=3) ||
+            (gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))
+          {
+           if((gpuDataM[gpuDataP] & 0xF000F000) == 0x50005000)
+            gpuDataP=gpuDataC-1;
+          }
+        }
+       gpuDataP++;
+      }
+ 
+     if(gpuDataP == gpuDataC)
+      {
+       gpuDataC=gpuDataP=0;
+       primFunc[gpuCommand]((unsigned char *)gpuDataM);
+
+       if(dwEmuFixes&0x0001 || dwActFixes&0x20000)     // hack for emulating "gpu busy" in some games
+        iFakePrimBusy=4;
+      }
+    } 
+  }
+
+ GPUdataRet=gdata;
+
+ GPUIsReadyForCommands;
+ GPUIsIdle;                
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteData(uint32_t gdata)
+{
+ GPUwriteDataMem(&gdata,1);
+}
+
+////////////////////////////////////////////////////////////////////////
+// call config dlg
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+long CALLBACK GPUconfigure(void)
+{
+ HWND hWP=GetActiveWindow();
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),
+           hWP,(DLGPROC)CfgDlgProc);
+
+ return 0;
+}
+
+#elif defined(_MACGL)
+long CALLBACK GPUconfigure(void)
+{
+ DlgProc();
+   return 0;
+}
+#else
+
+static void StartCfgTool(char *arg) // linux: start external cfg tool
+{
+	char cfg[256];
+	struct stat buf;
+
+	strcpy(cfg, "./cfgpeopsxgl");
+	if (stat(cfg, &buf) != -1) {
+		if (fork() == 0) {
+			execl(cfg, "cfgpeopsxgl", arg, NULL);
+			exit(0);
+		}
+		return;
+	}
+
+	strcpy(cfg, "./cfg/cfgpeopsxgl");
+	if (stat(cfg, &buf) != -1) {
+		if (fork() == 0) {
+			execl(cfg, "cfgpeopsxgl", arg, NULL);
+			exit(0);
+		}
+		return;
+	}
+
+	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME"));
+	if (stat(cfg, &buf) != -1) {
+		if (fork() == 0) {
+			execl(cfg, "cfgpeopsxgl", arg, NULL);
+			exit(0);
+		}
+		return;
+	}
+
+	printf("ERROR: cfgpeopsxgl file not found!\n");
+}
+
+long CALLBACK GPUconfigure(void)
+{
+ StartCfgTool("CFG");
+ return 0;
+}
+
+#endif // def _WINDOWS / _MACGL
+
+////////////////////////////////////////////////////////////////////////
+// sets all kind of act fixes
+////////////////////////////////////////////////////////////////////////
+
+void SetFixes(void)
+{
+ ReInitFrameCap();
+
+ if(dwActFixes & 0x2000) 
+      dispWidths[4]=384;
+ else dispWidths[4]=368;
+}
+
+////////////////////////////////////////////////////////////////////////
+// Pete Special: make an 'intelligent' dma chain check (<-Tekken3)
+////////////////////////////////////////////////////////////////////////
+
+uint32_t lUsedAddr[3];
+
+static __inline BOOL CheckForEndlessLoop(uint32_t laddr)
+{
+ if(laddr==lUsedAddr[1]) return TRUE;
+ if(laddr==lUsedAddr[2]) return TRUE;
+
+ if(laddr<lUsedAddr[0]) lUsedAddr[1]=laddr;
+ else                   lUsedAddr[2]=laddr;
+ lUsedAddr[0]=laddr;
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// core gives a dma chain to gpu: same as the gpuwrite interface funcs
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUdmaChain(uint32_t *baseAddrL, uint32_t addr)
+{
+ uint32_t dmaMem;
+ unsigned char * baseAddrB;
+ short count;unsigned int DMACommandCounter = 0;
+
+ if(bIsFirstFrame) GLinitialize();
+
+ GPUIsBusy;
+
+ lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;
+
+ baseAddrB = (unsigned char*) baseAddrL;
+
+ do
+  {
+   if(iGPUHeight==512) addr&=0x1FFFFC;
+
+   if(DMACommandCounter++ > 2000000) break;
+   if(CheckForEndlessLoop(addr)) break;
+
+   count = baseAddrB[addr+3];
+
+   dmaMem=addr+4;
+
+   if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
+
+   addr = baseAddrL[addr>>2]&0xffffff;
+  }
+ while (addr != 0xffffff);
+
+ GPUIsIdle;
+
+ return 0;
+}
+           
+////////////////////////////////////////////////////////////////////////
+// show about dlg
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUabout(void)
+{
+#ifdef _WINDOWS
+ HWND hWP=GetActiveWindow();                           // to be sure
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT),
+           hWP,(DLGPROC)AboutDlgProc);
+#elif defined(_MACGL)
+
+    AboutDlgProc();
+#else
+
+ StartCfgTool("ABOUT");
+
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// We are ever fine ;)
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUtest(void)
+{
+ // if test fails this function should return negative value for error (unable to continue)
+ // and positive value for warning (can continue but output might be crappy)
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// save state funcs
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
+{
+ if(ulGetFreezeData==2) 
+  {
+   int lSlotNum=*((int *)pF);
+   if(lSlotNum<0) return 0;
+   if(lSlotNum>8) return 0;
+   lSelectedSlot=lSlotNum+1;
+   return 1;
+  }
+
+ if(!pF)                    return 0; 
+ if(pF->ulFreezeVersion!=1) return 0;
+
+ if(ulGetFreezeData==1)
+  {
+   pF->ulStatus=STATUSREG;
+   memcpy(pF->ulControl,ulStatusControl,256*sizeof(uint32_t));
+   memcpy(pF->psxVRam,  psxVub,         1024*iGPUHeight*2);
+
+   return 1;
+  }
+
+ if(ulGetFreezeData!=0) return 0;
+
+ STATUSREG=pF->ulStatus;
+ memcpy(ulStatusControl,pF->ulControl,256*sizeof(uint32_t));
+ memcpy(psxVub,         pF->psxVRam,  1024*iGPUHeight*2);
+
+ ResetTextureArea(TRUE);
+
+ GPUwriteStatus(ulStatusControl[0]);
+ GPUwriteStatus(ulStatusControl[1]);
+ GPUwriteStatus(ulStatusControl[2]);
+ GPUwriteStatus(ulStatusControl[3]);
+ GPUwriteStatus(ulStatusControl[8]);
+ GPUwriteStatus(ulStatusControl[6]);
+ GPUwriteStatus(ulStatusControl[7]);
+ GPUwriteStatus(ulStatusControl[5]);
+ GPUwriteStatus(ulStatusControl[4]);
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+// special "emu infos" / "emu effects" functions
+////////////////////////////////////////////////////////////////////////
+
+//00 = black
+//01 = white
+//10 = red
+//11 = transparent
+
+unsigned char cFont[10][120]=
+{
+// 0
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 1
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x05,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x05,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 2
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 3
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 4
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x54,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x05,0x14,0x00,0x00,
+ 0x80,0x00,0x14,0x14,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 5
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 6
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x54,0x00,0x00,
+ 0x80,0x00,0x15,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 7
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 8
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 9
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x15,0x00,0x00,
+ 0x80,0x00,0x05,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x05,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+}
+};
+
+////////////////////////////////////////////////////////////////////////
+
+static void PaintPicDot(unsigned char * p,unsigned char c)
+{
+ if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}
+ if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}
+ if(c==2) {*p++=0x00;*p++=0x00;*p=0xff;return;}
+}
+
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUgetScreenPic(unsigned char * pMem)
+{
+ float XS,YS;int x,y,v;
+ unsigned char * ps, * px, * pf;
+ unsigned char c;
+
+ if(!pGfxCardScreen)
+  {
+   glPixelStorei(GL_PACK_ALIGNMENT,1);
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+  }
+
+ ps=pGfxCardScreen;
+
+ glReadBuffer(GL_FRONT);
+
+ glReadPixels(0,0,iResX,iResY,GL_RGB,GL_UNSIGNED_BYTE,ps);
+               
+ glReadBuffer(GL_BACK);
+
+ XS=(float)iResX/128;
+ YS=(float)iResY/96;
+ pf=pMem;
+
+ for(y=96;y>0;y--)
+  {
+   for(x=0;x<128;x++)
+    {
+     px=ps+(3*((int)((float)x * XS))+
+           (3*iResX)*((int)((float)y*YS)));
+     *(pf+0)=*(px+2);
+     *(pf+1)=*(px+1);
+     *(pf+2)=*(px+0);
+     pf+=3;
+    }
+  }
+
+ /////////////////////////////////////////////////////////////////////
+ // generic number/border painter
+
+ pf=pMem+(103*3);
+
+ for(y=0;y<20;y++)
+  {
+   for(x=0;x<6;x++)
+    {
+     c=cFont[lSelectedSlot][x+y*6];
+     v=(c&0xc0)>>6;
+     PaintPicDot(pf,(unsigned char)v);pf+=3;                // paint the dots into the rect
+     v=(c&0x30)>>4;
+     PaintPicDot(pf,(unsigned char)v);pf+=3;
+     v=(c&0x0c)>>2;
+     PaintPicDot(pf,(unsigned char)v);pf+=3;
+     v=c&0x03;
+     PaintPicDot(pf,(unsigned char)v);pf+=3;
+    }
+   pf+=104*3;
+  }
+
+ pf=pMem;
+ for(x=0;x<128;x++)
+  {
+   *(pf+(95*128*3))=0x00;*pf++=0x00;
+   *(pf+(95*128*3))=0x00;*pf++=0x00;
+   *(pf+(95*128*3))=0xff;*pf++=0xff;
+  }
+ pf=pMem;
+ for(y=0;y<96;y++)
+  {
+   *(pf+(127*3))=0x00;*pf++=0x00;
+   *(pf+(127*3))=0x00;*pf++=0x00;
+   *(pf+(127*3))=0xff;*pf++=0xff;
+   pf+=127*3;
+  }
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUshowScreenPic(unsigned char * pMem)
+{
+ DestroyPic();
+ if(pMem==0) return 0;
+ CreatePic(pMem);
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#if 0
+void CALLBACK GPUsetfix(uint32_t dwFixBits)
+{
+ dwEmuFixes=dwFixBits;
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////
+ 
+void CALLBACK GPUvisualVibration(uint32_t iSmall, uint32_t iBig)
+{
+ int iVibVal;
+
+ if(PSXDisplay.DisplayModeNew.x)                       // calc min "shake pixel" from screen width
+      iVibVal=max(1,iResX/PSXDisplay.DisplayModeNew.x);
+ else iVibVal=1;
+                                                       // big rumble: 4...15 sp ; small rumble 1...3 sp
+ if(iBig) iRumbleVal=max(4*iVibVal,min(15*iVibVal,((int)iBig  *iVibVal)/10));
+ else     iRumbleVal=max(1*iVibVal,min( 3*iVibVal,((int)iSmall*iVibVal)/10));
+
+ srand(timeGetTime());                                 // init rand (will be used in BufferSwap)
+
+ iRumbleTime=15;                                       // let the rumble last 16 buffer swaps
+}
+                                                       
+////////////////////////////////////////////////////////////////////////
+// main emu can set display infos (A/M/G/D) 
+////////////////////////////////////////////////////////////////////////
+
+#if 0
+void CALLBACK GPUdisplayFlags(uint32_t dwFlags)
+{
+ dwCoreFlags=dwFlags;
+}
+#endif
+
+void CALLBACK GPUvBlank( int val )
+{
+    vBlank = val;
+}
diff --git a/plugins/peopsxgl/gpu.h b/plugins/peopsxgl/gpu.h
index f21433d9..19276781 100644
--- a/plugins/peopsxgl/gpu.h
+++ b/plugins/peopsxgl/gpu.h
@@ -1,40 +1,43 @@
-/***************************************************************************

-                            gpu.h  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#ifndef _GPU_INTERNALS_H

-#define _GPU_INTERNALS_H

-

-#define PRED(x)   ((x << 3) & 0xF8)

-#define PBLUE(x)  ((x >> 2) & 0xF8)

-#define PGREEN(x) ((x >> 7) & 0xF8)

-

-#define RED(x) (x & 0xff)

-#define BLUE(x) ((x>>16) & 0xff)

-#define GREEN(x) ((x>>8) & 0xff)

-#define COLOR(x) (x & 0xffffff)

-

-void           DoSnapShot(void);

-void           updateDisplay(void);

-void           updateFrontDisplay(void);

-void           SetAutoFrameCap(void);

-void           SetAspectRatio(void);

-void           CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront);

-void           CheckVRamReadEx(int x, int y, int dx, int dy);

-void           SetFixes(void);

-

-#endif // _GPU_INTERNALS_H

+/***************************************************************************
+                            gpu.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _GPU_INTERNALS_H
+#define _GPU_INTERNALS_H
+
+#define PRED(x)   ((x << 3) & 0xF8)
+#define PBLUE(x)  ((x >> 2) & 0xF8)
+#define PGREEN(x) ((x >> 7) & 0xF8)
+
+#define RED(x) (x & 0xff)
+#define BLUE(x) ((x>>16) & 0xff)
+#define GREEN(x) ((x>>8) & 0xff)
+#define COLOR(x) (x & 0xffffff)
+
+void           DoSnapShot(void);
+void           updateDisplay(void);
+void           updateFrontDisplay(void);
+void           SetAutoFrameCap(void);
+void           SetAspectRatio(void);
+void           CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront);
+void           CheckVRamReadEx(int x, int y, int dx, int dy);
+void           SetFixes(void);
+
+#ifdef _WINDOWS    
+extern HGLRC GLCONTEXT;
+#endif
+#endif // _GPU_INTERNALS_H
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index a5d5163b..67258fee 100644
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -67,7 +67,7 @@ GtkWidget *window,
           *btnBeautiful;
 
 // Save values to the config file
-void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
+static void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
     FILE *out;
     out = fopen( "gpuPeopsMesaGL.cfg", "w+" );
 
@@ -134,7 +134,7 @@ void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
 
 // Autoconfiguration callbacks
 
-void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
+static void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
@@ -165,7 +165,7 @@ void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ),    0 );
 }
 
-void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
+static void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
@@ -198,19 +198,19 @@ void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
 
 // Callbacks used to toggle the sensitivity of some parts of the GUI
 
-void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) {
+static void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) );
 }
 
-void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) {
+static void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) );
 }
 
-void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) {
+static void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) );
 }
 
-void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) {
+static void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) {
     gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) );
 }
 
diff --git a/plugins/peopsxgl/key.c b/plugins/peopsxgl/key.c
index dba1c839..200446a2 100644
--- a/plugins/peopsxgl/key.c
+++ b/plugins/peopsxgl/key.c
@@ -1,177 +1,179 @@
-/***************************************************************************

-                          key.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_KEY

-

-#include "externals.h"

-#include "menu.h"

-#include "texture.h"

-#include "draw.h"

-#include "fps.h"

-

-////////////////////////////////////////////////////////////////////////

-// KeyBoard handler stuff

-////////////////////////////////////////////////////////////////////////

-

-uint32_t   ulKeybits = 0;                     

-

-////////////////////////////////////////////////////////////////////////

-// keyboard handler (LINUX)

-////////////////////////////////////////////////////////////////////////

-

-#define VK_INSERT      65379

-#define VK_HOME        65360

-#define VK_PRIOR       65365

-#define VK_NEXT        65366

-#define VK_END         65367

-#define VK_DEL         65535

-#define VK_F5          65474

-

-void GPUkeypressed(int keycode)

-{

-/* arrives via the input plugin, so who knows what thread you're in */

-    switch(keycode)

-     {

-      case VK_F5:

-       bSnapShot=1;

-      break;

-

-      case VK_INSERT:

-       ulKeybits|=KEY_RESETTEXSTORE;

-       if(iBlurBuffer) iBlurBuffer=0;

-       else            iBlurBuffer=1;

-       break;

-

-      case VK_DEL: 

-       if(ulKeybits&KEY_SHOWFPS)

-        {

-         ulKeybits&=~KEY_SHOWFPS;

-         HideText();

-         DestroyPic();

-        }

-       else 

-        {

-         ulKeybits|=KEY_SHOWFPS;

-         szDispBuf[0]=0;

-         BuildDispMenu(0);

-

-        }

-       break;

-

-      case VK_PRIOR: BuildDispMenu(-1);            break;

-      case VK_NEXT:  BuildDispMenu( 1);            break;

-      case VK_END:   SwitchDispMenu( 1);           break;

-      case VK_HOME:  SwitchDispMenu(-1);           break;

-#if defined (_MACGL)

-      default: { void HandleKey(int keycode); HandleKey(keycode); };

-#endif

-     }

-

-}

-

-void InitKeyHandler(void)

-{

-}

-

-void ExitKeyHandler(void)

-{

-}

-

-////////////////////////////////////////////////////////////////////////

-// reset stuff on special keyboard commands

-////////////////////////////////////////////////////////////////////////

-

-void ResetStuff(void)

-{

- ResetTextureArea(TRUE);

- ulKeybits&=~KEY_RESETTEXSTORE;

-

- if(ulKeybits&KEY_BLACKWHITE)

-  {

-   if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}

-   else          {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}

-   SetExtGLFuncs();

-   if(iFrameLimit==2) SetAutoFrameCap();

-   ulKeybits&=~KEY_BLACKWHITE;

-  }

-

- if(ulKeybits&KEY_RESETFILTER)

-  {

-   if(ulKeybits&KEY_STEPDOWN)

-        iFilterType--;

-   else iFilterType++;

-   if(iFilterType>6) iFilterType=0;

-   if(iFilterType<0) iFilterType=6;

-   SetExtGLFuncs();

-   ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);

-   BuildDispMenu(0);

-  }

-

- if(ulKeybits&KEY_RESETOPAQUE)

-  {

-   bOpaquePass=!bOpaquePass;

-   SetExtGLFuncs();

-   ulKeybits&=~KEY_RESETOPAQUE;

-   BuildDispMenu(0);

-  }

-

- if(ulKeybits&KEY_RESETADVBLEND)

-  {

-   bAdvancedBlend=!bAdvancedBlend;

-   SetExtGLFuncs();

-   ulKeybits&=~KEY_RESETADVBLEND;

-   BuildDispMenu(0);

-  }

-

- if(ulKeybits&KEY_RESETDITHER)

-  {

-   bDrawDither=!bDrawDither;

-   if(bDrawDither)  glEnable(GL_DITHER); 

-   else             glDisable(GL_DITHER); 

-   ulKeybits&=~KEY_RESETDITHER;

-   BuildDispMenu(0);

-  }

-

- if(ulKeybits & KEY_TOGGLEFBTEXTURE)

-  {

-   if(ulKeybits&KEY_STEPDOWN)

-        iFrameTexType--;

-   else iFrameTexType++;

-   if(iFrameTexType>3) iFrameTexType=0;

-   if(iFrameTexType<0) iFrameTexType=3;

-   if(gTexFrameName!=0)                              

-    glDeleteTextures(1, &gTexFrameName);             

-   gTexFrameName=0;                                  

-   ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);

-  }

-

- if(ulKeybits & KEY_TOGGLEFBREAD)

-  {

-   if(ulKeybits&KEY_STEPDOWN)

-        iFrameReadType--;

-   else iFrameReadType++;

-   if(iFrameReadType>4) iFrameReadType=0;

-   if(iFrameReadType<0) iFrameReadType=4;

-   if(iFrameReadType==4) bFullVRam=TRUE;

-   else                  bFullVRam=FALSE;

-   iRenderFVR=0;

-   ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);

-  }

-}

+/***************************************************************************
+                          key.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_KEY
+
+#include "externals.h"
+#include "menu.h"
+#include "texture.h"
+#include "draw.h"
+#include "fps.h"
+#include "key.h"
+#include "psemu_plugin_defs.h"
+
+////////////////////////////////////////////////////////////////////////
+// KeyBoard handler stuff
+////////////////////////////////////////////////////////////////////////
+
+uint32_t   ulKeybits = 0;                     
+
+////////////////////////////////////////////////////////////////////////
+// keyboard handler (LINUX)
+////////////////////////////////////////////////////////////////////////
+
+#define VK_INSERT      65379
+#define VK_HOME        65360
+#define VK_PRIOR       65365
+#define VK_NEXT        65366
+#define VK_END         65367
+#define VK_DEL         65535
+#define VK_F5          65474
+
+void GPUkeypressed(int keycode)
+{
+/* arrives via the input plugin, so who knows what thread you're in */
+    switch(keycode)
+     {
+      case VK_F5:
+       bSnapShot=1;
+      break;
+
+      case VK_INSERT:
+       ulKeybits|=KEY_RESETTEXSTORE;
+       if(iBlurBuffer) iBlurBuffer=0;
+       else            iBlurBuffer=1;
+       break;
+
+      case VK_DEL: 
+       if(ulKeybits&KEY_SHOWFPS)
+        {
+         ulKeybits&=~KEY_SHOWFPS;
+         HideText();
+         DestroyPic();
+        }
+       else 
+        {
+         ulKeybits|=KEY_SHOWFPS;
+         szDispBuf[0]=0;
+         BuildDispMenu(0);
+
+        }
+       break;
+
+      case VK_PRIOR: BuildDispMenu(-1);            break;
+      case VK_NEXT:  BuildDispMenu( 1);            break;
+      case VK_END:   SwitchDispMenu( 1);           break;
+      case VK_HOME:  SwitchDispMenu(-1);           break;
+#if defined (_MACGL)
+      default: { void HandleKey(int keycode); HandleKey(keycode); };
+#endif
+     }
+
+}
+
+void InitKeyHandler(void)
+{
+}
+
+void ExitKeyHandler(void)
+{
+}
+
+////////////////////////////////////////////////////////////////////////
+// reset stuff on special keyboard commands
+////////////////////////////////////////////////////////////////////////
+
+void ResetStuff(void)
+{
+ ResetTextureArea(TRUE);
+ ulKeybits&=~KEY_RESETTEXSTORE;
+
+ if(ulKeybits&KEY_BLACKWHITE)
+  {
+   if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}
+   else          {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}
+   SetExtGLFuncs();
+   if(iFrameLimit==2) SetAutoFrameCap();
+   ulKeybits&=~KEY_BLACKWHITE;
+  }
+
+ if(ulKeybits&KEY_RESETFILTER)
+  {
+   if(ulKeybits&KEY_STEPDOWN)
+        iFilterType--;
+   else iFilterType++;
+   if(iFilterType>6) iFilterType=0;
+   if(iFilterType<0) iFilterType=6;
+   SetExtGLFuncs();
+   ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);
+   BuildDispMenu(0);
+  }
+
+ if(ulKeybits&KEY_RESETOPAQUE)
+  {
+   bOpaquePass=!bOpaquePass;
+   SetExtGLFuncs();
+   ulKeybits&=~KEY_RESETOPAQUE;
+   BuildDispMenu(0);
+  }
+
+ if(ulKeybits&KEY_RESETADVBLEND)
+  {
+   bAdvancedBlend=!bAdvancedBlend;
+   SetExtGLFuncs();
+   ulKeybits&=~KEY_RESETADVBLEND;
+   BuildDispMenu(0);
+  }
+
+ if(ulKeybits&KEY_RESETDITHER)
+  {
+   bDrawDither=!bDrawDither;
+   if(bDrawDither)  glEnable(GL_DITHER); 
+   else             glDisable(GL_DITHER); 
+   ulKeybits&=~KEY_RESETDITHER;
+   BuildDispMenu(0);
+  }
+
+ if(ulKeybits & KEY_TOGGLEFBTEXTURE)
+  {
+   if(ulKeybits&KEY_STEPDOWN)
+        iFrameTexType--;
+   else iFrameTexType++;
+   if(iFrameTexType>3) iFrameTexType=0;
+   if(iFrameTexType<0) iFrameTexType=3;
+   if(gTexFrameName!=0)                              
+    glDeleteTextures(1, &gTexFrameName);             
+   gTexFrameName=0;                                  
+   ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);
+  }
+
+ if(ulKeybits & KEY_TOGGLEFBREAD)
+  {
+   if(ulKeybits&KEY_STEPDOWN)
+        iFrameReadType--;
+   else iFrameReadType++;
+   if(iFrameReadType>4) iFrameReadType=0;
+   if(iFrameReadType<0) iFrameReadType=4;
+   if(iFrameReadType==4) bFullVRam=TRUE;
+   else                  bFullVRam=FALSE;
+   iRenderFVR=0;
+   ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);
+  }
+}
diff --git a/plugins/peopsxgl/prim.c b/plugins/peopsxgl/prim.c
index 323b1d81..3ee37c27 100644
--- a/plugins/peopsxgl/prim.c
+++ b/plugins/peopsxgl/prim.c
@@ -1,21 +1,21 @@
-/***************************************************************************

-                          prim.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

+/***************************************************************************
+                          prim.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "stdafx.h"
 
 #define _IN_PRIMDRAW
@@ -25,6 +25,7 @@
 #include "draw.h"
 #include "soft.h"
 #include "texture.h"
+#include "prim.h"
 
 ////////////////////////////////////////////////////////////////////////                                          
 // defines
@@ -37,77 +38,77 @@
 // globals
 ////////////////////////////////////////////////////////////////////////
 
-BOOL           bDrawTextured;                          // current active drawing states

+BOOL           bDrawTextured;                          // current active drawing states
 BOOL           bDrawSmoothShaded;
 BOOL           bOldSmoothShaded;
 BOOL           bDrawNonShaded;
 BOOL           bDrawMultiPass;
 int            iOffscreenDrawing;
 int            iDrawnSomething=0;
-

-BOOL           bRenderFrontBuffer=FALSE;               // flag for front buffer rendering

-
-GLubyte        ubGloAlpha;                             // texture alpha

-GLubyte        ubGloColAlpha;                          // color alpha

-int            iFilterType;                            // type of filter

-BOOL           bFullVRam=FALSE;                        // sign for tex win

-BOOL           bDrawDither;                            // sign for dither

-BOOL           bUseMultiPass;                          // sign for multi pass

-GLuint         gTexName;                               // binded texture

-BOOL           bTexEnabled;                            // texture enable flag

-BOOL           bBlendEnable;                           // blend enable flag

-PSXRect_t      xrUploadArea;                           // rect to upload

-PSXRect_t      xrUploadAreaIL;                         // rect to upload

-PSXRect_t      xrUploadAreaRGB24;                      // rect to upload rgb24

-int            iSpriteTex=0;                           // flag for "hey, it's a sprite"

-unsigned short usMirror;                               // mirror, mirror on the wall

-
-BOOL           bNeedUploadAfter=FALSE;                 // sign for uploading in next frame

-BOOL           bNeedUploadTest=FALSE;                  // sign for upload test

-BOOL           bUsingTWin=FALSE;                       // tex win active flag

-BOOL           bUsingMovie=FALSE;                      // movie active flag

-PSXRect_t      xrMovieArea;                            // rect for movie upload

-short          sSprite_ux2;                            // needed for sprire adjust

-short          sSprite_vy2;                            // 

-uint32_t       ulOLDCOL=0;                             // active color

-uint32_t       ulClutID;                               // clut

-
-uint32_t      dwCfgFixes;                              // game fixes

-uint32_t      dwActFixes=0;

+
+BOOL           bRenderFrontBuffer=FALSE;               // flag for front buffer rendering
+
+GLubyte        ubGloAlpha;                             // texture alpha
+GLubyte        ubGloColAlpha;                          // color alpha
+int            iFilterType;                            // type of filter
+BOOL           bFullVRam=FALSE;                        // sign for tex win
+BOOL           bDrawDither;                            // sign for dither
+BOOL           bUseMultiPass;                          // sign for multi pass
+GLuint         gTexName;                               // binded texture
+BOOL           bTexEnabled;                            // texture enable flag
+BOOL           bBlendEnable;                           // blend enable flag
+PSXRect_t      xrUploadArea;                           // rect to upload
+PSXRect_t      xrUploadAreaIL;                         // rect to upload
+PSXRect_t      xrUploadAreaRGB24;                      // rect to upload rgb24
+int            iSpriteTex=0;                           // flag for "hey, it's a sprite"
+unsigned short usMirror;                               // mirror, mirror on the wall
+
+BOOL           bNeedUploadAfter=FALSE;                 // sign for uploading in next frame
+BOOL           bNeedUploadTest=FALSE;                  // sign for upload test
+BOOL           bUsingTWin=FALSE;                       // tex win active flag
+BOOL           bUsingMovie=FALSE;                      // movie active flag
+PSXRect_t      xrMovieArea;                            // rect for movie upload
+short          sSprite_ux2;                            // needed for sprire adjust
+short          sSprite_vy2;                            // 
+uint32_t       ulOLDCOL=0;                             // active color
+uint32_t       ulClutID;                               // clut
+
+uint32_t      dwCfgFixes;                              // game fixes
+uint32_t      dwActFixes=0;
 uint32_t      dwEmuFixes=0;
-BOOL          bUseFixes;

+BOOL          bUseFixes;
 
-int           drawX,drawY,drawW,drawH;                 // offscreen drawing checkers

+int           drawX,drawY,drawW,drawH;                 // offscreen drawing checkers
 short         sxmin,sxmax,symin,symax;
 
 ////////////////////////////////////////////////////////////////////////                                          
 // Update global TP infos
 ////////////////////////////////////////////////////////////////////////
 
-void UpdateGlobalTP(unsigned short gdata)
+static void UpdateGlobalTP(unsigned short gdata)
 {
  GlobalTextAddrX = (gdata << 6) & 0x3c0;
 
- if(iGPUHeight==1024)                                  // ZN mode

-  {

-   if(dwGPUVersion==2)                                 // very special zn gpu

-    {

-     GlobalTextAddrY =((gdata & 0x60 ) << 3);

-     GlobalTextIL    =(gdata & 0x2000) >> 13;

-     GlobalTextABR = (unsigned short)((gdata >> 7) & 0x3);

-     GlobalTextTP = (gdata >> 9) & 0x3;

-     if(GlobalTextTP==3) GlobalTextTP=2;             

-     GlobalTexturePage = (GlobalTextAddrX>>6)+(GlobalTextAddrY>>4);

-     usMirror =0;

-     STATUSREG = (STATUSREG & 0xffffe000 ) | (gdata & 0x1fff );

-     return;

-    }

-   else                                                // "enhanced" psx gpu

-    {

-     GlobalTextAddrY = (unsigned short)(((gdata << 4) & 0x100) | ((gdata >> 2) & 0x200));

-    }

-  }

- else GlobalTextAddrY = (gdata << 4) & 0x100;          // "normal" psx gpu

+ if(iGPUHeight==1024)                                  // ZN mode
+  {
+   if(dwGPUVersion==2)                                 // very special zn gpu
+    {
+     GlobalTextAddrY =((gdata & 0x60 ) << 3);
+     GlobalTextIL    =(gdata & 0x2000) >> 13;
+     GlobalTextABR = (unsigned short)((gdata >> 7) & 0x3);
+     GlobalTextTP = (gdata >> 9) & 0x3;
+     if(GlobalTextTP==3) GlobalTextTP=2;             
+     GlobalTexturePage = (GlobalTextAddrX>>6)+(GlobalTextAddrY>>4);
+     usMirror =0;
+     STATUSREG = (STATUSREG & 0xffffe000 ) | (gdata & 0x1fff );
+     return;
+    }
+   else                                                // "enhanced" psx gpu
+    {
+     GlobalTextAddrY = (unsigned short)(((gdata << 4) & 0x100) | ((gdata >> 2) & 0x200));
+    }
+  }
+ else GlobalTextAddrY = (gdata << 4) & 0x100;          // "normal" psx gpu
 
  usMirror=gdata&0x3000;
  
@@ -121,7 +122,7 @@ void UpdateGlobalTP(unsigned short gdata)
  STATUSREG|=(gdata & 0x07ff);                          // set the necessary bits
 }
 
-unsigned int DoubleBGR2RGB (unsigned int BGR)
+static unsigned int DoubleBGR2RGB (unsigned int BGR)
 {
  unsigned int ebx,eax,edx;
 
@@ -137,7 +138,7 @@ unsigned int DoubleBGR2RGB (unsigned int BGR)
  return (ebx|eax|edx);
 }
 
-unsigned short BGR24to16 (uint32_t BGR)
+static unsigned short BGR24to16 (uint32_t BGR)
 {
  return ((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6);
 }
@@ -146,7 +147,7 @@ unsigned short BGR24to16 (uint32_t BGR)
 // OpenGL primitive drawing commands
 ////////////////////////////////////////////////////////////////////////
 
-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
                                    OGLVertex* vertex3, OGLVertex* vertex4) 
 {
  glBegin(GL_TRIANGLE_STRIP);
@@ -166,7 +167,7 @@ __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 
                                   OGLVertex* vertex3) 
 {
  glBegin(GL_TRIANGLES);
@@ -183,7 +184,7 @@ __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
                                          OGLVertex* vertex3) 
 {
  glBegin(GL_TRIANGLES);
@@ -204,7 +205,7 @@ __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
                                              OGLVertex* vertex3, OGLVertex* vertex4) 
 {
  glBegin(GL_TRIANGLE_STRIP);
@@ -228,7 +229,7 @@ __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vert
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 
+static __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 
 {
  glBegin(GL_TRIANGLES);
   glVertex3fv(&vertex1->x);
@@ -239,7 +240,7 @@ __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* ver
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 
                            OGLVertex* vertex3, OGLVertex* vertex4) 
 {
  glBegin(GL_TRIANGLE_STRIP);                           
@@ -252,7 +253,7 @@ __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
                                       OGLVertex* vertex3) 
 {
  glBegin(GL_TRIANGLES);                           
@@ -269,7 +270,7 @@ __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 
                                        OGLVertex* vertex3, OGLVertex* vertex4) 
 {
  glBegin(GL_TRIANGLE_STRIP);                           
@@ -289,7 +290,7 @@ __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2,
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
 {
  glBegin(GL_QUADS);
 
@@ -304,7 +305,7 @@ __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex*
 
 ///////////////////////////////////////////////////////// 
      
-__inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
 {
  glBegin(GL_QUADS);
 
@@ -324,7 +325,7 @@ __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVert
 
 ///////////////////////////////////////////////////////// 
              
-__inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
                            OGLVertex* vertex3, OGLVertex* vertex4) 
 {
  glBegin(GL_QUADS);
@@ -354,12 +355,12 @@ SemiTransParams TransSets[4]=
  {GL_SRC_ALPHA,GL_SRC_ALPHA,          127},
  {GL_ONE,      GL_ONE,                255},
  {GL_ZERO,     GL_ONE_MINUS_SRC_COLOR,255},
- {GL_ONE_MINUS_SRC_ALPHA,GL_ONE,      192}

+ {GL_ONE_MINUS_SRC_ALPHA,GL_ONE,      192}
 }; 
 
 ////////////////////////////////////////////////////////////////////////
 
-void SetSemiTrans(void)
+static void SetSemiTrans(void)
 {
 /*
 * 0.5 x B + 0.5 x F
@@ -372,7 +373,7 @@ void SetSemiTrans(void)
   {
    if(bBlendEnable)
     {glDisable(GL_BLEND);bBlendEnable=FALSE;}          // -> don't wanna blend
-   ubGloAlpha=ubGloColAlpha=255;                       // -> full alpha

+   ubGloAlpha=ubGloColAlpha=255;                       // -> full alpha
    return;                                             // -> and bye
   }
 
@@ -388,7 +389,7 @@ void SetSemiTrans(void)
     {
      obm1=TransSets[GlobalTextABR].srcFac;
      obm2=TransSets[GlobalTextABR].dstFac;
-     glBlendFunc(obm1,obm2);                           // set blend func

+     glBlendFunc(obm1,obm2);                           // set blend func
     }
    else
    if(TransSets[GlobalTextABR].dstFac !=GL_ONE_MINUS_SRC_COLOR)
@@ -397,19 +398,19 @@ void SetSemiTrans(void)
       glBlendEquationEXTEx(FUNC_ADD_EXT);
      obm1=TransSets[GlobalTextABR].srcFac;
      obm2=TransSets[GlobalTextABR].dstFac;
-     glBlendFunc(obm1,obm2);                           // set blend func

+     glBlendFunc(obm1,obm2);                           // set blend func
     }
    else
     {
      glBlendEquationEXTEx(FUNC_REVERSESUBTRACT_EXT);
      obm1=TransSets[GlobalTextABR].srcFac;
      obm2=TransSets[GlobalTextABR].dstFac;
-     glBlendFunc(GL_ONE,GL_ONE);                       // set blend func

+     glBlendFunc(GL_ONE,GL_ONE);                       // set blend func
     }
   }
 }
 
-void SetScanTrans(void)                                // blending for scan lines

+void SetScanTrans(void)                                // blending for scan lines
 {
  if(glBlendEquationEXTEx!=NULL)
   {
@@ -419,10 +420,10 @@ void SetScanTrans(void)                                // blending for scan line
 
  obm1=TransSets[0].srcFac;
  obm2=TransSets[0].dstFac;
- glBlendFunc(obm1,obm2);                               // set blend func

+ glBlendFunc(obm1,obm2);                               // set blend func
 }
 
-void SetScanTexTrans(void)                             // blending for scan mask texture

+void SetScanTexTrans(void)                             // blending for scan mask texture
 {
  if(glBlendEquationEXTEx!=NULL)
   {
@@ -432,7 +433,7 @@ void SetScanTexTrans(void)                             // blending for scan mask
 
  obm1=TransSets[2].srcFac;
  obm2=TransSets[2].dstFac;
- glBlendFunc(obm1,obm2);                               // set blend func

+ glBlendFunc(obm1,obm2);                               // set blend func
 }
 
 ////////////////////////////////////////////////////////////////////////                                          
@@ -471,7 +472,7 @@ SemiTransParams MultiColTransSets[4]=
 
 ////////////////////////////////////////////////////////////////////////                                          
 
-void SetSemiTransMulti(int Pass)
+static void SetSemiTransMulti(int Pass)
 {
  static GLenum bm1=GL_ZERO;
  static GLenum bm2=GL_ONE;
@@ -512,11 +513,11 @@ void SetSemiTransMulti(int Pass)
   }
 
  if(!bBlendEnable)
-  {glEnable(GL_BLEND);bBlendEnable=TRUE;}              // wanna blend

+  {glEnable(GL_BLEND);bBlendEnable=TRUE;}              // wanna blend
 
  if(bm1!=obm1 || bm2!=obm2)
   {
-   glBlendFunc(bm1,bm2);                               // set blend func

+   glBlendFunc(bm1,bm2);                               // set blend func
    obm1=bm1;obm2=bm2;
   }
 }
@@ -525,7 +526,7 @@ void SetSemiTransMulti(int Pass)
 // Set several rendering stuff including blending 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetZMask3O(void)
+static __inline void SetZMask3O(void)
 {
  if(iUseMask && DrawSemiTrans && !iSetMask)
   {
@@ -534,7 +535,7 @@ __inline void SetZMask3O(void)
   }
 }
 
-__inline void SetZMask3(void)
+static __inline void SetZMask3(void)
 {
  if(iUseMask)
   {
@@ -548,7 +549,7 @@ __inline void SetZMask3(void)
   }
 }
 
-__inline void SetZMask3NT(void)
+static __inline void SetZMask3NT(void)
 {
  if(iUseMask)
   {
@@ -564,7 +565,7 @@ __inline void SetZMask3NT(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetZMask4O(void)
+static __inline void SetZMask4O(void)
 {
  if(iUseMask && DrawSemiTrans && !iSetMask)
   {
@@ -573,7 +574,7 @@ __inline void SetZMask4O(void)
   }
 }
 
-__inline void SetZMask4(void)
+static __inline void SetZMask4(void)
 {
  if(iUseMask)
   {
@@ -587,7 +588,7 @@ __inline void SetZMask4(void)
   }
 }
 
-__inline void SetZMask4NT(void)
+static __inline void SetZMask4NT(void)
 {
  if(iUseMask)
   {
@@ -600,29 +601,29 @@ __inline void SetZMask4NT(void)
     }
   }
 }
-

-__inline void SetZMask4SP(void)

-{

- if(iUseMask)

-  {

-   if(iSetMask==1)

-    {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}

-   else

-    {

-     if(bCheckMask)

-      {

-       vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;

-       gl_z+=0.00004f;

-      }

-     else

-      {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}

-    }

-  }

-}

-

+
+static __inline void SetZMask4SP(void)
+{
+ if(iUseMask)
+  {
+   if(iSetMask==1)
+    {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
+   else
+    {
+     if(bCheckMask)
+      {
+       vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+       gl_z+=0.00004f;
+      }
+     else
+      {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
+    }
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetRenderState(uint32_t DrawAttributes)
+static __inline void SetRenderState(uint32_t DrawAttributes)
 {
  bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;
  DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
@@ -630,7 +631,7 @@ __inline void SetRenderState(uint32_t DrawAttributes)
 
 ////////////////////////////////////////////////////////////////////////                                          
 
-__inline void SetRenderColor(uint32_t DrawAttributes)
+static __inline void SetRenderColor(uint32_t DrawAttributes)
 {
  if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}
  else
@@ -643,7 +644,7 @@ __inline void SetRenderColor(uint32_t DrawAttributes)
 
 ////////////////////////////////////////////////////////////////////////                                          
                                
-void SetRenderMode(uint32_t DrawAttributes, BOOL bSCol)
+static void SetRenderMode(uint32_t DrawAttributes, BOOL bSCol)
 {
  if((bUseMultiPass) && (bDrawTextured) && !(bDrawNonShaded))
       {bDrawMultiPass = TRUE; SetSemiTransMulti(0);}
@@ -671,24 +672,24 @@ void SetRenderMode(uint32_t DrawAttributes, BOOL bSCol)
    if((dwActFixes&4) && ((DrawAttributes&0x00ffffff)==0))
      DrawAttributes|=0x007f7f7f;
 
-   if(bDrawNonShaded)                                  // -> non shaded?

+   if(bDrawNonShaded)                                  // -> non shaded?
     {
-     if(bGLBlend)  vertex[0].c.lcol=0x7f7f7f;          // --> solid color...

+     if(bGLBlend)  vertex[0].c.lcol=0x7f7f7f;          // --> solid color...
      else          vertex[0].c.lcol=0xffffff;
     }
    else                                                // -> shaded?
     {
-     if(!bUseMultiPass && !bGLBlend)                   // --> given color...

+     if(!bUseMultiPass && !bGLBlend)                   // --> given color...
           vertex[0].c.lcol=DoubleBGR2RGB(DrawAttributes);
      else vertex[0].c.lcol=DrawAttributes;
     }
-   vertex[0].c.col[3]=ubGloAlpha;                      // -> set color with

+   vertex[0].c.col[3]=ubGloAlpha;                      // -> set color with
    SETCOL(vertex[0]);                                  //    texture alpha
   }
  
- if(bDrawSmoothShaded!=bOldSmoothShaded)               // shading changed?

+ if(bDrawSmoothShaded!=bOldSmoothShaded)               // shading changed?
   {
-   if(bDrawSmoothShaded) glShadeModel(GL_SMOOTH);      // -> set actual shading

+   if(bDrawSmoothShaded) glShadeModel(GL_SMOOTH);      // -> set actual shading
    else                  glShadeModel(GL_FLAT);
    bOldSmoothShaded=bDrawSmoothShaded;
   }
@@ -698,9 +699,9 @@ void SetRenderMode(uint32_t DrawAttributes, BOOL bSCol)
 // Set Opaque multipass color
 ////////////////////////////////////////////////////////////////////////
 
-void SetOpaqueColor(uint32_t DrawAttributes)
+static void SetOpaqueColor(uint32_t DrawAttributes)
 {
- if(bDrawNonShaded) return;                            // no shading? bye

+ if(bDrawNonShaded) return;                            // no shading? bye
   
  DrawAttributes=DoubleBGR2RGB(DrawAttributes);         // multipass is just half color, so double it on opaque pass
  vertex[0].c.lcol=DrawAttributes|0xff000000;
@@ -711,7 +712,7 @@ void SetOpaqueColor(uint32_t DrawAttributes)
 // Fucking stupid screen coord checking
 ////////////////////////////////////////////////////////////////////////
 
-BOOL ClipVertexListScreen(void)
+static BOOL ClipVertexListScreen(void)
 {
  if (lx0 >= PSXDisplay.DisplayEnd.x)      goto NEXTSCRTEST;
  if (ly0 >= PSXDisplay.DisplayEnd.y)      goto NEXTSCRTEST;
@@ -733,7 +734,7 @@ NEXTSCRTEST:
 
 ////////////////////////////////////////////////////////////////////////
 
-BOOL bDrawOffscreenFront(void)
+static BOOL bDrawOffscreenFront(void)
 {
  if(sxmin < PSXDisplay.DisplayPosition.x) return FALSE;   // must be complete in front
  if(symin < PSXDisplay.DisplayPosition.y) return FALSE;
@@ -742,7 +743,7 @@ BOOL bDrawOffscreenFront(void)
  return TRUE;
 }
 
-BOOL bOnePointInFront(void)
+static BOOL bOnePointInFront(void)
 {
  if(sxmax< PSXDisplay.DisplayPosition.x)
   return FALSE;
@@ -760,7 +761,7 @@ BOOL bOnePointInFront(void)
 }
  
 
-BOOL bOnePointInBack(void)
+static BOOL bOnePointInBack(void)
 {
  if(sxmax< PreviousPSXDisplay.DisplayPosition.x)
   return FALSE;
@@ -777,7 +778,7 @@ BOOL bOnePointInBack(void)
  return TRUE;
 }
  
-BOOL bDrawOffscreen4(void)
+static BOOL bDrawOffscreen4(void)
 {
  BOOL bFront;short sW,sH;
 
@@ -832,12 +833,12 @@ BOOL bDrawOffscreen4(void)
    vertex[2].y=ly2 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
    vertex[3].y=ly3 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 
-   if(iOffscreenDrawing==4 && !(dwActFixes&1))         // -> frontbuffer wanted

+   if(iOffscreenDrawing==4 && !(dwActFixes&1))         // -> frontbuffer wanted
     {
      bRenderFrontBuffer=TRUE;
      //return TRUE;
     }
-   return bFullVRam;                                   // -> but no od

+   return bFullVRam;                                   // -> but no od
   }
 
  return TRUE;
@@ -845,7 +846,7 @@ BOOL bDrawOffscreen4(void)
 
 ////////////////////////////////////////////////////////////////////////
  
-BOOL bDrawOffscreen3(void)
+static BOOL bDrawOffscreen3(void)
 {
  BOOL bFront;short sW,sH;
 
@@ -858,7 +859,7 @@ BOOL bDrawOffscreen3(void)
  symin=min(ly0,min(ly1,ly2));
  if(symin>drawH) return FALSE;
 
- if(PSXDisplay.Disabled) return TRUE;                  // disabled? ever

+ if(PSXDisplay.Disabled) return TRUE;                  // disabled? ever
 
  if(iOffscreenDrawing==1) return bFullVRam;
 
@@ -876,7 +877,7 @@ BOOL bDrawOffscreen3(void)
 
  if(bFront)
   {
-   if(PSXDisplay.InterlacedTest) return bFullVRam;     // -> ok, no need for adjust

+   if(PSXDisplay.InterlacedTest) return bFullVRam;     // -> ok, no need for adjust
 
    vertex[0].x=lx0 - PSXDisplay.DisplayPosition.x+PreviousPSXDisplay.Range.x0;
    vertex[1].x=lx1 - PSXDisplay.DisplayPosition.x+PreviousPSXDisplay.Range.x0;
@@ -885,13 +886,13 @@ BOOL bDrawOffscreen3(void)
    vertex[1].y=ly1 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
    vertex[2].y=ly2 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 
-   if(iOffscreenDrawing==4)                            // -> frontbuffer wanted

+   if(iOffscreenDrawing==4)                            // -> frontbuffer wanted
     {
      bRenderFrontBuffer=TRUE;
    //  return TRUE;
     }
 
-   return bFullVRam;                                   // -> but no od

+   return bFullVRam;                                   // -> but no od
   }
 
  return TRUE;
@@ -947,7 +948,7 @@ BOOL CheckAgainstScreen(short imageX0,short imageY0,short imageX1,short imageY1)
 {
  imageX1 += imageX0;
  imageY1 += imageY0;
-

+
  if (imageX0 < PreviousPSXDisplay.DisplayPosition.x)
    xrUploadArea.x0 = PreviousPSXDisplay.DisplayPosition.x;
  else
@@ -1099,7 +1100,7 @@ void PrepareFullScreenUpload (int Position)
 //       lClearOnSwap=0;
       }
      else    
-     if(PSXDisplay.Interlaced && PreviousPSXDisplay.RGB24<2) // in interlaced mode we upload at least two full frames (GT1 menu)

+     if(PSXDisplay.Interlaced && PreviousPSXDisplay.RGB24<2) // in interlaced mode we upload at least two full frames (GT1 menu)
       {
        PreviousPSXDisplay.RGB24++;
       }
@@ -1152,92 +1153,90 @@ void PrepareFullScreenUpload (int Position)
 // Upload screen (MDEC and such)
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-

-unsigned char * LoadDirectMovieFast(void);

-

-void UploadScreenEx(int Position)

-{

- short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];

-

- if(!PSXDisplay.DisplayMode.x) return;

- if(!PSXDisplay.DisplayMode.y) return;

-

- glDisable(GL_SCISSOR_TEST);

- glShadeModel(GL_FLAT);

- bOldSmoothShaded=FALSE;

- glDisable(GL_BLEND);

- bBlendEnable=FALSE;

- glDisable(GL_TEXTURE_2D);

- bTexEnabled=FALSE;

- glDisable(GL_ALPHA_TEST);

-

- glPixelZoom(((float)rRatioRect.right)/((float)PSXDisplay.DisplayMode.x),

-             -1.0f*(((float)rRatioRect.bottom)/((float)PSXDisplay.DisplayMode.y)));

-                                                      

- //----------------------------------------------------//

-

- YStep = 256;                                          // max texture size

- XStep = 256;

- UStep = (PSXDisplay.RGB24 ? 128 : 0);

- ya    = xrUploadArea.y0;

- yb    = xrUploadArea.y1;

- xa    = xrUploadArea.x0;

- xb    = xrUploadArea.x1;

- 

- for(y=ya;y<=yb;y+=YStep)                              // loop y

-  {

-   U = 0;

-   for(x=xa;x<=xb;x+=XStep)                            // loop x

-    {

-     ly0 = ly1 = y;                                    // -> get y coords

-     ly2 = y + YStep;

-     if (ly2 > yb) ly2 = yb;

-     ly3 = ly2;

-

-     lx0 = lx3 = x;                                    // -> get x coords

-     lx1 = x + XStep;

-     if (lx1 > xb) lx1 = xb;

-

-     lx2 = lx1;

-

-     ux[0]=ux[3]=(xa - x);                             // -> set tex x coords

-     if (ux[0] < 0) ux[0]=ux[3]=0;

-     ux[2]=ux[1]=(xb - x);

-     if (ux[2] > 256) ux[2]=ux[1]=256;

-

-     vy[0]=vy[1]=(ya - y);                             // -> set tex y coords

-     if (vy[0] < 0) vy[0]=vy[1]=0;

-     vy[2]=vy[3]=(yb - y);

-     if (vy[2] > 256) vy[2]=vy[3]=256;

-

-     if ((ux[0] >= ux[2]) ||                           // -> cheaters never win...

-         (vy[0] >= vy[2])) continue;                   //    (but winners always cheat...)

-                

-     xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;

-     xrMovieArea.x1=lx2+U; xrMovieArea.y1=ly2;

-     

-     offsetScreenUpload(Position);

-

-     glRasterPos2f(vertex[0].x,vertex[0].y);

-

-     glDrawPixels(xrMovieArea.x1-xrMovieArea.x0,

-                  xrMovieArea.y1-xrMovieArea.y0,

-                  GL_RGBA,GL_UNSIGNED_BYTE,

-                  LoadDirectMovieFast());

-

-     U+=UStep;

-    }

-  }

-

- //----------------------------------------------------//

-

- glPixelZoom(1.0F,1.0F);

-

- glEnable(GL_ALPHA_TEST);

- glEnable(GL_SCISSOR_TEST);

-}

-

-////////////////////////////////////////////////////////////////////////

+
+static void UploadScreenEx(int Position)
+{
+ short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];
+
+ if(!PSXDisplay.DisplayMode.x) return;
+ if(!PSXDisplay.DisplayMode.y) return;
+
+ glDisable(GL_SCISSOR_TEST);
+ glShadeModel(GL_FLAT);
+ bOldSmoothShaded=FALSE;
+ glDisable(GL_BLEND);
+ bBlendEnable=FALSE;
+ glDisable(GL_TEXTURE_2D);
+ bTexEnabled=FALSE;
+ glDisable(GL_ALPHA_TEST);
+
+ glPixelZoom(((float)rRatioRect.right)/((float)PSXDisplay.DisplayMode.x),
+             -1.0f*(((float)rRatioRect.bottom)/((float)PSXDisplay.DisplayMode.y)));
+                                                      
+ //----------------------------------------------------//
+
+ YStep = 256;                                          // max texture size
+ XStep = 256;
+ UStep = (PSXDisplay.RGB24 ? 128 : 0);
+ ya    = xrUploadArea.y0;
+ yb    = xrUploadArea.y1;
+ xa    = xrUploadArea.x0;
+ xb    = xrUploadArea.x1;
+ 
+ for(y=ya;y<=yb;y+=YStep)                              // loop y
+  {
+   U = 0;
+   for(x=xa;x<=xb;x+=XStep)                            // loop x
+    {
+     ly0 = ly1 = y;                                    // -> get y coords
+     ly2 = y + YStep;
+     if (ly2 > yb) ly2 = yb;
+     ly3 = ly2;
+
+     lx0 = lx3 = x;                                    // -> get x coords
+     lx1 = x + XStep;
+     if (lx1 > xb) lx1 = xb;
+
+     lx2 = lx1;
+
+     ux[0]=ux[3]=(xa - x);                             // -> set tex x coords
+     if (ux[0] < 0) ux[0]=ux[3]=0;
+     ux[2]=ux[1]=(xb - x);
+     if (ux[2] > 256) ux[2]=ux[1]=256;
+
+     vy[0]=vy[1]=(ya - y);                             // -> set tex y coords
+     if (vy[0] < 0) vy[0]=vy[1]=0;
+     vy[2]=vy[3]=(yb - y);
+     if (vy[2] > 256) vy[2]=vy[3]=256;
+
+     if ((ux[0] >= ux[2]) ||                           // -> cheaters never win...
+         (vy[0] >= vy[2])) continue;                   //    (but winners always cheat...)
+                
+     xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;
+     xrMovieArea.x1=lx2+U; xrMovieArea.y1=ly2;
+     
+     offsetScreenUpload(Position);
+
+     glRasterPos2f(vertex[0].x,vertex[0].y);
+
+     glDrawPixels(xrMovieArea.x1-xrMovieArea.x0,
+                  xrMovieArea.y1-xrMovieArea.y0,
+                  GL_RGBA,GL_UNSIGNED_BYTE,
+                  LoadDirectMovieFast());
+
+     U+=UStep;
+    }
+  }
+
+ //----------------------------------------------------//
+
+ glPixelZoom(1.0F,1.0F);
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+}
+
+////////////////////////////////////////////////////////////////////////
 
 void UploadScreen(int Position)
 {
@@ -1246,26 +1245,26 @@ void UploadScreen(int Position)
 
  if(xrUploadArea.x0>1023) xrUploadArea.x0=1023;
  if(xrUploadArea.x1>1024) xrUploadArea.x1=1024;
- if(xrUploadArea.y0>iGPUHeightMask)  xrUploadArea.y0=iGPUHeightMask;

- if(xrUploadArea.y1>iGPUHeight)      xrUploadArea.y1=iGPUHeight;

+ if(xrUploadArea.y0>iGPUHeightMask)  xrUploadArea.y0=iGPUHeightMask;
+ if(xrUploadArea.y1>iGPUHeight)      xrUploadArea.y1=iGPUHeight;
 
  if(xrUploadArea.x0==xrUploadArea.x1) return;
  if(xrUploadArea.y0==xrUploadArea.y1) return;
 
  if(PSXDisplay.Disabled && iOffscreenDrawing<4) return;
-

- iDrawnSomething   = 2;

- iLastRGB24=PSXDisplay.RGB24+1;

-

- if(bSkipNextFrame) return;

-

- if(dwActFixes & 2) {UploadScreenEx(Position);return;}

+
+ iDrawnSomething   = 2;
+ iLastRGB24=PSXDisplay.RGB24+1;
+
+ if(bSkipNextFrame) return;
+
+ if(dwActFixes & 2) {UploadScreenEx(Position);return;}
 
  bUsingMovie       = TRUE;
- bDrawTextured     = TRUE;                             // just doing textures

+ bDrawTextured     = TRUE;                             // just doing textures
  bDrawSmoothShaded = FALSE;
 
- if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f;             // set solid col

+ if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f;             // set solid col
  else          vertex[0].c.lcol=0xffffffff;
  SETCOL(vertex[0]); 
 
@@ -1281,10 +1280,10 @@ void UploadScreen(int Position)
  xa=xrUploadArea.x0;
  xb=xrUploadArea.x1;
 
- for(y=ya;y<=yb;y+=YStep)                              // loop y

+ for(y=ya;y<=yb;y+=YStep)                              // loop y
   {
    U = 0;
-   for(x=xa;x<=xb;x+=XStep)                            // loop x

+   for(x=xa;x<=xb;x+=XStep)                            // loop x
     {
      ly0 = ly1 = y;                                    // -> get y coords
      ly2 = y + YStep;
@@ -1297,17 +1296,17 @@ void UploadScreen(int Position)
 
      lx2 = lx1;
 
-     ux[0]=ux[3]=(xa - x);                             // -> set tex x coords

+     ux[0]=ux[3]=(xa - x);                             // -> set tex x coords
      if (ux[0] < 0) ux[0]=ux[3]=0;
      ux[2]=ux[1]=(xb - x);
      if (ux[2] > 256) ux[2]=ux[1]=256;
 
-     vy[0]=vy[1]=(ya - y);                             // -> set tex y coords

+     vy[0]=vy[1]=(ya - y);                             // -> set tex y coords
      if (vy[0] < 0) vy[0]=vy[1]=0;
      vy[2]=vy[3]=(yb - y);
      if (vy[2] > 256) vy[2]=vy[3]=256;
 
-     if ((ux[0] >= ux[2]) ||                           // -> cheaters never win...

+     if ((ux[0] >= ux[2]) ||                           // -> cheaters never win...
          (vy[0] >= vy[2])) continue;                   //    (but winners always cheat...)
                 
      xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;
@@ -1331,7 +1330,7 @@ void UploadScreen(int Position)
     }
   }
 
- bUsingMovie=FALSE;                                    // done...

+ bUsingMovie=FALSE;                                    // done...
  bDisplayNotSet = TRUE;
 }
 
@@ -1339,7 +1338,7 @@ void UploadScreen(int Position)
 // Detect next screen
 ////////////////////////////////////////////////////////////////////////
 
-BOOL IsCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
+static BOOL IsCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
 {        
  if (x > PSXDisplay.DisplayPosition.x+1)     return FALSE;
  if ((x + xoff) < PSXDisplay.DisplayEnd.x-1) return FALSE;
@@ -1355,7 +1354,7 @@ BOOL IsCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
  return TRUE;
 }
 
-BOOL IsPrimCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
+static BOOL IsPrimCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
 {
  x+=PSXDisplay.DrawOffset.x;
  if (x > PSXDisplay.DisplayPosition.x+1) return FALSE;
@@ -1368,7 +1367,8 @@ BOOL IsPrimCompleteInsideNextScreen(short x, short y, short xoff, short yoff)
  return TRUE;
 }
 
-BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
+#if 0
+static BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
 {                    
  if (x > PSXDisplay.DisplayEnd.x) return FALSE;
  if (y > PSXDisplay.DisplayEnd.y) return FALSE;
@@ -1376,6 +1376,7 @@ BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
  if ((y + yoff) < PSXDisplay.DisplayPosition.y) return FALSE;
  return TRUE;
 }
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // mask stuff...
@@ -1384,7 +1385,7 @@ BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
 //Mask1    Set mask bit while drawing. 1 = on
 //Mask2    Do not draw to mask areas. 1= on
 
-void cmdSTP(unsigned char * baseAddr)
+static void cmdSTP(unsigned char * baseAddr)
 {
  uint32_t gdata = ((uint32_t*)baseAddr)[0];
 
@@ -1392,32 +1393,32 @@ void cmdSTP(unsigned char * baseAddr)
  STATUSREG|=((gdata & 0x03) << 11);                    // set the current bits
 
  if(!iUseMask) return;
-

- if(gdata&1) {sSetMask=0x8000;lSetMask=0x80008000;iSetMask=1;}

- else        {sSetMask=0;     lSetMask=0;         iSetMask=0;}

-

- if(gdata&2) 

-  {

-   if(!(gdata&1)) iSetMask=2;

-   bCheckMask=TRUE;

-   if(iDepthFunc==0) return;

-   iDepthFunc=0;

-   glDepthFunc(GL_LESS);

-  }

- else

-  {

-   bCheckMask=FALSE;

-   if(iDepthFunc==1) return;

-   glDepthFunc(GL_ALWAYS);

-   iDepthFunc=1;

-  }

+
+ if(gdata&1) {sSetMask=0x8000;lSetMask=0x80008000;iSetMask=1;}
+ else        {sSetMask=0;     lSetMask=0;         iSetMask=0;}
+
+ if(gdata&2) 
+  {
+   if(!(gdata&1)) iSetMask=2;
+   bCheckMask=TRUE;
+   if(iDepthFunc==0) return;
+   iDepthFunc=0;
+   glDepthFunc(GL_LESS);
+  }
+ else
+  {
+   bCheckMask=FALSE;
+   if(iDepthFunc==1) return;
+   glDepthFunc(GL_ALWAYS);
+   iDepthFunc=1;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////
 // cmd: Set texture page infos
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTexturePage(unsigned char * baseAddr)
+static void cmdTexturePage(unsigned char * baseAddr)
 {
  uint32_t gdata = ((uint32_t *)baseAddr)[0];
  UpdateGlobalTP((unsigned short)gdata);
@@ -1428,59 +1429,59 @@ void cmdTexturePage(unsigned char * baseAddr)
 // cmd: turn on/off texture window
 ////////////////////////////////////////////////////////////////////////
 
-void cmdTextureWindow(unsigned char *baseAddr)
+static void cmdTextureWindow(unsigned char *baseAddr)
 {
- uint32_t gdata = ((uint32_t *)baseAddr)[0];

- uint32_t YAlign,XAlign;

-

- ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;

-

- if(gdata & 0x020)

-  TWin.Position.y1 = 8;    // xxxx1

- else if (gdata & 0x040)

-  TWin.Position.y1 = 16;   // xxx10

- else if (gdata & 0x080)

-  TWin.Position.y1 = 32;   // xx100

- else if (gdata & 0x100)

-  TWin.Position.y1 = 64;   // x1000

- else if (gdata & 0x200)

-  TWin.Position.y1 = 128;  // 10000

- else

-  TWin.Position.y1 = 256;  // 00000

-

-  // Texture window size is determined by the least bit set of the relevant 5 bits

-

- if (gdata & 0x001)

-  TWin.Position.x1 = 8;    // xxxx1

- else if (gdata & 0x002)

-  TWin.Position.x1 = 16;   // xxx10

- else if (gdata & 0x004)

-  TWin.Position.x1 = 32;   // xx100

- else if (gdata & 0x008)

-  TWin.Position.x1 = 64;   // x1000

- else if (gdata & 0x010)

-  TWin.Position.x1 = 128;  // 10000

- else

-  TWin.Position.x1 = 256;  // 00000

-

- // Re-calculate the bit field, because we can't trust what is passed in the data

-

- YAlign = (uint32_t)(32 - (TWin.Position.y1 >> 3));

- XAlign = (uint32_t)(32 - (TWin.Position.x1 >> 3));

-

- // Absolute position of the start of the texture window

-

- TWin.Position.y0 = (short)(((gdata >> 15) & YAlign) << 3);

- TWin.Position.x0 = (short)(((gdata >> 10) & XAlign) << 3);

-
- if((TWin.Position.x0 == 0 &&                          // tw turned off

+ uint32_t gdata = ((uint32_t *)baseAddr)[0];
+ uint32_t YAlign,XAlign;
+
+ ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;
+
+ if(gdata & 0x020)
+  TWin.Position.y1 = 8;    // xxxx1
+ else if (gdata & 0x040)
+  TWin.Position.y1 = 16;   // xxx10
+ else if (gdata & 0x080)
+  TWin.Position.y1 = 32;   // xx100
+ else if (gdata & 0x100)
+  TWin.Position.y1 = 64;   // x1000
+ else if (gdata & 0x200)
+  TWin.Position.y1 = 128;  // 10000
+ else
+  TWin.Position.y1 = 256;  // 00000
+
+  // Texture window size is determined by the least bit set of the relevant 5 bits
+
+ if (gdata & 0x001)
+  TWin.Position.x1 = 8;    // xxxx1
+ else if (gdata & 0x002)
+  TWin.Position.x1 = 16;   // xxx10
+ else if (gdata & 0x004)
+  TWin.Position.x1 = 32;   // xx100
+ else if (gdata & 0x008)
+  TWin.Position.x1 = 64;   // x1000
+ else if (gdata & 0x010)
+  TWin.Position.x1 = 128;  // 10000
+ else
+  TWin.Position.x1 = 256;  // 00000
+
+ // Re-calculate the bit field, because we can't trust what is passed in the data
+
+ YAlign = (uint32_t)(32 - (TWin.Position.y1 >> 3));
+ XAlign = (uint32_t)(32 - (TWin.Position.x1 >> 3));
+
+ // Absolute position of the start of the texture window
+
+ TWin.Position.y0 = (short)(((gdata >> 15) & YAlign) << 3);
+ TWin.Position.x0 = (short)(((gdata >> 10) & XAlign) << 3);
+
+ if((TWin.Position.x0 == 0 &&                          // tw turned off
      TWin.Position.y0 == 0 &&
      TWin.Position.x1 == 0 &&
      TWin.Position.y1 == 0) ||
      (TWin.Position.x1 == 256 &&
       TWin.Position.y1 == 256))
   {
-   bUsingTWin = FALSE;                                 // -> just do it

+   bUsingTWin = FALSE;                                 // -> just do it
 
 #ifdef OWNSCALE
    TWin.UScaleFactor = 1.0f;
@@ -1533,7 +1534,7 @@ void cmdTextureWindow(unsigned char *baseAddr)
    TWin.UScaleFactor = (float)TWin.Position.x1;
    TWin.VScaleFactor = (float)TWin.Position.y1;
 #else
-   TWin.UScaleFactor = ((float)TWin.Position.x1)/256.0f; // -> set scale factor

+   TWin.UScaleFactor = ((float)TWin.Position.x1)/256.0f; // -> set scale factor
    TWin.VScaleFactor = ((float)TWin.Position.y1)/256.0f;
 #endif
   }
@@ -1542,7 +1543,7 @@ void cmdTextureWindow(unsigned char *baseAddr)
 ////////////////////////////////////////////////////////////////////////
 // mmm, Lewpy uses that in TileS ... I don't ;)
 ////////////////////////////////////////////////////////////////////////
-

+
 /*
 void ClampToPSXDrawAreaOffset(short *x0, short *y0, short *x1, short *y1)
 {
@@ -1580,13 +1581,13 @@ void ClampToPSXDrawAreaOffset(short *x0, short *y0, short *x1, short *y1)
  if ((*y1 + *y0) > PSXDisplay.DrawArea.y1)
   *y1 = (PSXDisplay.DrawArea.y1 -  *y0 + 1);
 }
-*/

+*/
 
 ////////////////////////////////////////////////////////////////////////
 // Check draw area dimensions
 ////////////////////////////////////////////////////////////////////////
 
-void ClampToPSXScreen(short *x0, short *y0, short *x1, short *y1)
+static void ClampToPSXScreen(short *x0, short *y0, short *x1, short *y1)
 {
  if (*x0 < 0)               *x0 = 0;
  else
@@ -1598,18 +1599,18 @@ void ClampToPSXScreen(short *x0, short *y0, short *x1, short *y1)
 
  if (*y0 < 0)               *y0 = 0;
  else
- if (*y0 > iGPUHeightMask)  *y0 = iGPUHeightMask;

+ if (*y0 > iGPUHeightMask)  *y0 = iGPUHeightMask;
             
  if (*y1 < 0)               *y1 = 0;
  else
- if (*y1 > iGPUHeightMask)  *y1 = iGPUHeightMask;

+ if (*y1 > iGPUHeightMask)  *y1 = iGPUHeightMask;
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Used in Load Image and Blk Fill
 ////////////////////////////////////////////////////////////////////////
 
-void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
+static void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
 {
  if (*x0 < 0)
   { *x1 += *x0;  *x0 = 0; }
@@ -1620,8 +1621,8 @@ void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
  if (*y0 < 0)
   { *y1 += *y0;  *y0 = 0; }
  else
- if (*y0 > iGPUHeightMask)

-  { *y0 = iGPUHeightMask;   *y1 = 0; }

+ if (*y0 > iGPUHeightMask)
+  { *y0 = iGPUHeightMask;   *y1 = 0; }
 
  if (*x1 < 0) *x1 = 0;
 
@@ -1629,37 +1630,37 @@ void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
 
  if (*y1 < 0) *y1 = 0;
 
- if ((*y1 + *y0) > iGPUHeight)  *y1 = (iGPUHeight -  *y0);

+ if ((*y1 + *y0) > iGPUHeight)  *y1 = (iGPUHeight -  *y0);
 }
 
 ////////////////////////////////////////////////////////////////////////
 // cmd: start of drawing area... primitives will be clipped inside
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawAreaStart(unsigned char * baseAddr)
+static void cmdDrawAreaStart(unsigned char * baseAddr)
 {
  uint32_t gdata = ((uint32_t *)baseAddr)[0];
-

- drawX = gdata & 0x3ff;                                // for soft drawing

- if(drawX>=1024) drawX=1023;

-
- if(dwGPUVersion==2)

-  {

-   ulGPUInfoVals[INFO_DRAWSTART]=gdata&0x3FFFFF;

-   drawY  = (gdata>>12)&0x3ff;

-  }

- else

-  {

-   ulGPUInfoVals[INFO_DRAWSTART]=gdata&0xFFFFF;

-   drawY  = (gdata>>10)&0x3ff;

-  }

-

- if(drawY>=iGPUHeight) drawY=iGPUHeightMask;

+
+ drawX = gdata & 0x3ff;                                // for soft drawing
+ if(drawX>=1024) drawX=1023;
+
+ if(dwGPUVersion==2)
+  {
+   ulGPUInfoVals[INFO_DRAWSTART]=gdata&0x3FFFFF;
+   drawY  = (gdata>>12)&0x3ff;
+  }
+ else
+  {
+   ulGPUInfoVals[INFO_DRAWSTART]=gdata&0xFFFFF;
+   drawY  = (gdata>>10)&0x3ff;
+  }
+
+ if(drawY>=iGPUHeight) drawY=iGPUHeightMask;
 
  PreviousPSXDisplay.DrawArea.y0=PSXDisplay.DrawArea.y0;
  PreviousPSXDisplay.DrawArea.x0=PSXDisplay.DrawArea.x0;
 
- PSXDisplay.DrawArea.y0 = (short)drawY;                // for OGL drawing

+ PSXDisplay.DrawArea.y0 = (short)drawY;                // for OGL drawing
  PSXDisplay.DrawArea.x0 = (short)drawX;
 }
 
@@ -1667,27 +1668,27 @@ void cmdDrawAreaStart(unsigned char * baseAddr)
 // cmd: end of drawing area... primitives will be clipped inside
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawAreaEnd(unsigned char * baseAddr)
+static void cmdDrawAreaEnd(unsigned char * baseAddr)
 {
  uint32_t gdata = ((uint32_t *)baseAddr)[0];
-

+
  drawW = gdata & 0x3ff;                                // for soft drawing
  if(drawW>=1024) drawW=1023;
-

- if(dwGPUVersion==2)

-  {

-   ulGPUInfoVals[INFO_DRAWEND]=gdata&0x3FFFFF;

-   drawH  = (gdata>>12)&0x3ff;

-  }

- else

-  {

-   ulGPUInfoVals[INFO_DRAWEND]=gdata&0xFFFFF;

-   drawH  = (gdata>>10)&0x3ff;

-  }

- 

- if(drawH>=iGPUHeight) drawH=iGPUHeightMask;

-
- PSXDisplay.DrawArea.y1 = (short)drawH;                // for OGL drawing

+
+ if(dwGPUVersion==2)
+  {
+   ulGPUInfoVals[INFO_DRAWEND]=gdata&0x3FFFFF;
+   drawH  = (gdata>>12)&0x3ff;
+  }
+ else
+  {
+   ulGPUInfoVals[INFO_DRAWEND]=gdata&0xFFFFF;
+   drawH  = (gdata>>10)&0x3ff;
+  }
+ 
+ if(drawH>=iGPUHeight) drawH=iGPUHeightMask;
+
+ PSXDisplay.DrawArea.y1 = (short)drawH;                // for OGL drawing
  PSXDisplay.DrawArea.x1 = (short)drawW;
 
  ClampToPSXScreen(&PSXDisplay.DrawArea.x0,             // clamp
@@ -1702,28 +1703,28 @@ void cmdDrawAreaEnd(unsigned char * baseAddr)
 // cmd: draw offset... will be added to prim coords
 ////////////////////////////////////////////////////////////////////////
 
-void cmdDrawOffset(unsigned char * baseAddr)
+static void cmdDrawOffset(unsigned char * baseAddr)
 {
  uint32_t gdata = ((uint32_t *)baseAddr)[0];
-

+
  PreviousPSXDisplay.DrawOffset.x = 
-  PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);

-

- if (dwGPUVersion == 2)

-  {

-   ulGPUInfoVals[INFO_DRAWOFF] = gdata&0x7FFFFF;

-   PSXDisplay.DrawOffset.y = (short)((gdata>>12) & 0x7ff);

-  }

- else

-  {

-   ulGPUInfoVals[INFO_DRAWOFF]=gdata&0x3FFFFF;

-   PSXDisplay.DrawOffset.y = (short)((gdata>>11) & 0x7ff);

-  }

+  PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);
+
+ if (dwGPUVersion == 2)
+  {
+   ulGPUInfoVals[INFO_DRAWOFF] = gdata&0x7FFFFF;
+   PSXDisplay.DrawOffset.y = (short)((gdata>>12) & 0x7ff);
+  }
+ else
+  {
+   ulGPUInfoVals[INFO_DRAWOFF]=gdata&0x3FFFFF;
+   PSXDisplay.DrawOffset.y = (short)((gdata>>11) & 0x7ff);
+  }
  
  PSXDisplay.DrawOffset.x=(short)(((int)PSXDisplay.DrawOffset.x<<21)>>21);
  PSXDisplay.DrawOffset.y=(short)(((int)PSXDisplay.DrawOffset.y<<21)>>21);
 
- PSXDisplay.CumulOffset.x =                            // new OGL prim offsets

+ PSXDisplay.CumulOffset.x =                            // new OGL prim offsets
   PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
  PSXDisplay.CumulOffset.y = 
   PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
@@ -1733,7 +1734,7 @@ void cmdDrawOffset(unsigned char * baseAddr)
 // cmd: load image to vram
 ////////////////////////////////////////////////////////////////////////
 
-void primLoadImage(unsigned char * baseAddr)
+static void primLoadImage(unsigned char * baseAddr)
 {
  unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
@@ -1752,7 +1753,7 @@ void primLoadImage(unsigned char * baseAddr)
 
 ////////////////////////////////////////////////////////////////////////
 
-void PrepareRGB24Upload(void)
+static void PrepareRGB24Upload(void)
 {
  VRAMWrite.x=(VRAMWrite.x*2)/3;
  VRAMWrite.Width=(VRAMWrite.Width*2)/3;
@@ -1856,7 +1857,7 @@ void CheckWriteUpdate()
         }
        return;
       }
-

+
      if(!bNeedUploadAfter)
       {
        bNeedUploadAfter = TRUE;
@@ -1872,16 +1873,16 @@ void CheckWriteUpdate()
        xrUploadArea.y0=min(xrUploadArea.y0,VRAMWrite.y);
        xrUploadArea.y1=max(xrUploadArea.y1,VRAMWrite.y+VRAMWrite.Height);
       }
-

-     if(dwActFixes&0x8000)

-      {

-       if((xrUploadArea.x1-xrUploadArea.x0)>=(PSXDisplay.DisplayMode.x-32) &&

-          (xrUploadArea.y1-xrUploadArea.y0)>=(PSXDisplay.DisplayMode.y-32))

-        {

-         UploadScreen(-1);

-         updateFrontDisplay();

-        }

-      }

+
+     if(dwActFixes&0x8000)
+      {
+       if((xrUploadArea.x1-xrUploadArea.x0)>=(PSXDisplay.DisplayMode.x-32) &&
+          (xrUploadArea.y1-xrUploadArea.y0)>=(PSXDisplay.DisplayMode.y-32))
+        {
+         UploadScreen(-1);
+         updateFrontDisplay();
+        }
+      }
     }
   }
 }
@@ -1890,7 +1891,7 @@ void CheckWriteUpdate()
 // cmd: vram -> psx mem
 ////////////////////////////////////////////////////////////////////////
 
-void primStoreImage(unsigned char * baseAddr)
+static void primStoreImage(unsigned char * baseAddr)
 {
  unsigned short *sgpuData = ((unsigned short *) baseAddr);
 
@@ -1902,7 +1903,7 @@ void primStoreImage(unsigned char * baseAddr)
  VRAMRead.ImagePtr = psxVuw + (VRAMRead.y<<10) + VRAMRead.x;
  VRAMRead.RowsRemaining = VRAMRead.Width;
  VRAMRead.ColsRemaining = VRAMRead.Height;
-

+
  iDataReadMode = DR_VRAMTRANSFER;
 
  STATUSREG |= GPUSTATUS_READYFORVRAM;
@@ -1912,7 +1913,7 @@ void primStoreImage(unsigned char * baseAddr)
 // cmd: blkfill - NO primitive! Doesn't care about draw areas...
 ////////////////////////////////////////////////////////////////////////
 
-void primBlkFill(unsigned char * baseAddr)
+static void primBlkFill(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -1922,9 +1923,9 @@ void primBlkFill(unsigned char * baseAddr)
  sprtX = sgpuData[2];
  sprtY = sgpuData[3];
  sprtW = sgpuData[4] & 0x3ff;
- sprtH = sgpuData[5] & iGPUHeightMask;

-

- sprtW = (sprtW + 15) & ~15;

+ sprtH = sgpuData[5] & iGPUHeightMask;
+
+ sprtW = (sprtW + 15) & ~15;
 
  // Increase H & W if they are one short of full values, because they never can be full values
  if (sprtH == iGPUHeightMask)  sprtH=iGPUHeight;
@@ -1938,7 +1939,7 @@ void primBlkFill(unsigned char * baseAddr)
 
  offsetBlk();
 
- if(ClipVertexListScreen())                           

+ if(ClipVertexListScreen())                           
   {
    PSXDisplay_t * pd;
    if(PSXDisplay.InterlacedTest) pd=&PSXDisplay;
@@ -1979,7 +1980,7 @@ void primBlkFill(unsigned char * baseAddr)
         }
        if(ly2<pd->DisplayEnd.y)
         {
-         vertex[0].x=0;vertex[0].y=(pd->DisplayEnd.y-pd->DisplayPosition.y)-(pd->DisplayEnd.y-ly2);

+         vertex[0].x=0;vertex[0].y=(pd->DisplayEnd.y-pd->DisplayPosition.y)-(pd->DisplayEnd.y-ly2);
          vertex[1].x=pd->DisplayEnd.x-pd->DisplayPosition.x;vertex[1].y=vertex[0].y;
          vertex[2].x=vertex[1].x;vertex[2].y=pd->DisplayEnd.y;
          vertex[3].x=0;vertex[3].y=vertex[2].y;
@@ -2029,7 +2030,7 @@ void primBlkFill(unsigned char * baseAddr)
 // cmd: move image vram -> vram
 ////////////////////////////////////////////////////////////////////////
 
-void MoveImageWrapped(short imageX0,short imageY0,
+static void MoveImageWrapped(short imageX0,short imageY0,
                       short imageX1,short imageY1,
                       short imageSX,short imageSY)
 {
@@ -2109,7 +2110,7 @@ void MoveImageWrapped(short imageX0,short imageY0,
 
 ////////////////////////////////////////////////////////////////////////
 
-void primMoveImage(unsigned char * baseAddr)
+static void primMoveImage(unsigned char * baseAddr)
 {
  short *sgpuData = ((short *) baseAddr);
  short imageY0,imageX0,imageY1,imageX1,imageSX,imageSY,i,j;
@@ -2124,8 +2125,8 @@ void primMoveImage(unsigned char * baseAddr)
  if((imageX0 == imageX1) && (imageY0 == imageY1)) return;  
  if(imageSX<=0) return;
  if(imageSY<=0) return;
-

- if(iGPUHeight==1024 && sgpuData[7]>1024) return;

+
+ if(iGPUHeight==1024 && sgpuData[7]>1024) return;
 
  if((imageY0+imageSY)>iGPUHeight ||
     (imageX0+imageSX)>1024       ||
@@ -2268,7 +2269,7 @@ void primMoveImage(unsigned char * baseAddr)
 // cmd: draw free-size Tile 
 ////////////////////////////////////////////////////////////////////////
 
-void primTileS(unsigned char * baseAddr)
+static void primTileS(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2285,8 +2286,8 @@ void primTileS(unsigned char * baseAddr)
 
  offsetST();
 
- if((dwActFixes&1) &&                                  // FF7 special game gix (battle cursor)

-    sprtX==0 && sprtY==0 && sprtW==24 && sprtH==16) 

+ if((dwActFixes&1) &&                                  // FF7 special game gix (battle cursor)
+    sprtX==0 && sprtY==0 && sprtW==24 && sprtH==16) 
   return;
 
  bDrawTextured = FALSE;
@@ -2297,7 +2298,7 @@ void primTileS(unsigned char * baseAddr)
  if(iOffscreenDrawing)
   {
    if(IsPrimCompleteInsideNextScreen(lx0,ly0,lx2,ly2) ||
-      (ly0==-6 && ly2==10))                            // OH MY GOD... I DIDN'T WANT TO DO IT... BUT I'VE FOUND NO OTHER WAY... HACK FOR GRADIUS SHOOTER :(

+      (ly0==-6 && ly2==10))                            // OH MY GOD... I DIDN'T WANT TO DO IT... BUT I'VE FOUND NO OTHER WAY... HACK FOR GRADIUS SHOOTER :(
     {
      lClearOnSwapColor = COLOR(gpuData[0]);
      lClearOnSwap = 1;
@@ -2305,12 +2306,12 @@ void primTileS(unsigned char * baseAddr)
 
    offsetPSX4();
    if(bDrawOffscreen4())
-    {

-     if(!(iTileCheat && sprtH==32 && gpuData[0]==0x60ffffff)) // special cheat for certain ZiNc games

+    {
+     if(!(iTileCheat && sprtH==32 && gpuData[0]==0x60ffffff)) // special cheat for certain ZiNc games
       {
        InvalidateTextureAreaEx();   
        FillSoftwareAreaTrans(lx0,ly0,lx2,ly2,
-                             BGR24to16(gpuData[0]));  

+                             BGR24to16(gpuData[0]));  
       }
     }
   }
@@ -2333,7 +2334,7 @@ void primTileS(unsigned char * baseAddr)
 // cmd: draw 1 dot Tile (point)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile1(unsigned char * baseAddr)
+static void primTile1(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *)baseAddr);
@@ -2380,7 +2381,7 @@ void primTile1(unsigned char * baseAddr)
 // cmd: draw 8 dot Tile (small rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile8(unsigned char * baseAddr)
+static void primTile8(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2427,7 +2428,7 @@ void primTile8(unsigned char * baseAddr)
 // cmd: draw 16 dot Tile (medium rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primTile16(unsigned char * baseAddr)
+static void primTile16(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *)baseAddr);
@@ -2508,7 +2509,7 @@ void DrawMultiBlur(void)
 
 #define   POFF 0.375f
 
-void DrawMultiFilterSprite(void)
+static void DrawMultiFilterSprite(void)
 {
  int lABR,lDST;
 
@@ -2520,8 +2521,8 @@ void DrawMultiFilterSprite(void)
 
  lABR=GlobalTextABR;
  lDST=DrawSemiTrans;
- vertex[0].c.col[3]=ubGloAlpha/2;                      // -> set color with

- SETCOL(vertex[0]);                                    //    texture alpha

+ vertex[0].c.col[3]=ubGloAlpha/2;                      // -> set color with
+ SETCOL(vertex[0]);                                    //    texture alpha
  PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
  vertex[0].x+=POFF;vertex[1].x+=POFF;
  vertex[2].x+=POFF;vertex[3].x+=POFF;
@@ -2539,7 +2540,7 @@ void DrawMultiFilterSprite(void)
 // cmd: small sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt8(unsigned char * baseAddr)
+static void primSprt8(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2558,30 +2559,30 @@ void primSprt8(unsigned char * baseAddr)
  offsetST();
 
  // do texture stuff
- gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;

-

- if(usMirror & 0x1000) 

-  {

-   s=gl_ux[0];

-   s-=sprtW-1;

-   if(s<0) {s=0;}

-   gl_ux[0]=gl_ux[3]=s;

-  }

+ gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
+
+ if(usMirror & 0x1000) 
+  {
+   s=gl_ux[0];
+   s-=sprtW-1;
+   if(s<0) {s=0;}
+   gl_ux[0]=gl_ux[3]=s;
+  }
 
  sSprite_ux2=s=gl_ux[0]+sprtW; 
  if(s)     s--;
  if(s>255) s=255;
  gl_ux[1]=gl_ux[2]=s;
  // Y coords
- gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;

-

- if(usMirror & 0x2000) 

-  {

-   s=gl_vy[0];

-   s-=sprtH-1;

-   if(s<0) {s=0;}

-   gl_vy[0]=gl_vy[1]=s;

-  }

+ gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
+
+ if(usMirror & 0x2000) 
+  {
+   s=gl_vy[0];
+   s-=sprtH-1;
+   if(s<0) {s=0;}
+   gl_vy[0]=gl_vy[1]=s;
+  }
 
  sSprite_vy2=s=gl_vy[0]+sprtH; 
  if(s)     s--;
@@ -2604,12 +2605,12 @@ void primSprt8(unsigned char * baseAddr)
      SetRenderColor(gpuData[0]);
      lx0-=PSXDisplay.DrawOffset.x;
      ly0-=PSXDisplay.DrawOffset.y;
-

+
      if(bUsingTWin) DrawSoftwareSpriteTWin(baseAddr,8,8);
      else
      if(usMirror)   DrawSoftwareSpriteMirror(baseAddr,8,8);
      else
-     DrawSoftwareSprite(baseAddr,8,8,baseAddr[8],baseAddr[9]);

+     DrawSoftwareSprite(baseAddr,8,8,baseAddr[8],baseAddr[9]);
     }
   }
 
@@ -2636,17 +2637,17 @@ void primSprt8(unsigned char * baseAddr)
   {
    SetZMask4O();
    if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
-   DEFOPAQUEON

-

-   if(bSmallAlpha && iFilterType<=2)

-    {

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-     SetZMask4O();

-    }

+   DEFOPAQUEON
+
+   if(bSmallAlpha && iFilterType<=2)
+    {
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+     SetZMask4O();
+    }
 
    PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
    DEFOPAQUEOFF
@@ -2660,7 +2661,7 @@ void primSprt8(unsigned char * baseAddr)
 // cmd: medium sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
 
-void primSprt16(unsigned char * baseAddr)
+static void primSprt16(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2679,30 +2680,30 @@ void primSprt16(unsigned char * baseAddr)
  offsetST();
 
  // do texture stuff
- gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;

-

- if(usMirror & 0x1000) 

-  {

-   s=gl_ux[0];

-   s-=sprtW-1;

-   if(s<0) {s=0;}

-   gl_ux[0]=gl_ux[3]=s;

-  }

+ gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
+
+ if(usMirror & 0x1000) 
+  {
+   s=gl_ux[0];
+   s-=sprtW-1;
+   if(s<0) {s=0;}
+   gl_ux[0]=gl_ux[3]=s;
+  }
 
  sSprite_ux2=s=gl_ux[0]+sprtW; 
  if(s)     s--;
  if(s>255) s=255;
  gl_ux[1]=gl_ux[2]=s; 
  // Y coords
- gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;

-

- if(usMirror & 0x2000) 

-  {

-   s=gl_vy[0];

-   s-=sprtH-1;

-   if(s<0) {s=0;}

-   gl_vy[0]=gl_vy[1]=s;

-  }

+ gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
+
+ if(usMirror & 0x2000) 
+  {
+   s=gl_vy[0];
+   s-=sprtH-1;
+   if(s<0) {s=0;}
+   gl_vy[0]=gl_vy[1]=s;
+  }
 
  sSprite_vy2=s=gl_vy[0]+sprtH; 
  if(s)     s--;
@@ -2729,7 +2730,7 @@ void primSprt16(unsigned char * baseAddr)
      else
      if(usMirror)   DrawSoftwareSpriteMirror(baseAddr,16,16);
      else
-     DrawSoftwareSprite(baseAddr,16,16,baseAddr[8],baseAddr[9]);

+     DrawSoftwareSprite(baseAddr,16,16,baseAddr[8],baseAddr[9]);
     }
   }
 
@@ -2757,16 +2758,16 @@ void primSprt16(unsigned char * baseAddr)
    SetZMask4O();
    if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
    DEFOPAQUEON
-

-   if(bSmallAlpha && iFilterType<=2)

-    {

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-     SetZMask4O();

-    }

+
+   if(bSmallAlpha && iFilterType<=2)
+    {
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+     SetZMask4O();
+    }
 
    PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
    DEFOPAQUEOFF
@@ -2780,7 +2781,7 @@ void primSprt16(unsigned char * baseAddr)
 // cmd: free-size sprite (textured rect)
 ////////////////////////////////////////////////////////////////////////
  
-void primSprtSRest(unsigned char * baseAddr,unsigned short type)
+static void primSprtSRest(unsigned char * baseAddr,unsigned short type)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2853,12 +2854,12 @@ void primSprtSRest(unsigned char * baseAddr,unsigned short type)
    s-=sprtW-1;if(s<0) s=0;
    gl_ux[0]=gl_ux[3]=s;
   }
- if(usMirror & 0x2000) 

-  {

-   s=gl_vy[0];

-   s-=sprtH-1;if(s<0) {s=0;}

-   gl_vy[0]=gl_vy[1]=s;

-  }

+ if(usMirror & 0x2000) 
+  {
+   s=gl_vy[0];
+   s-=sprtH-1;if(s<0) {s=0;}
+   gl_vy[0]=gl_vy[1]=s;
+  }
 
  sSprite_ux2=s=gl_ux[0]+sprtW; 
  if(s>255) s=255;
@@ -2900,7 +2901,7 @@ void primSprtSRest(unsigned char * baseAddr,unsigned short type)
      else
      if(usMirror)   DrawSoftwareSpriteMirror(baseAddr,sprtW,sprtH);
      else
-     DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);

+     DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
     }
   }
 
@@ -2927,17 +2928,17 @@ void primSprtSRest(unsigned char * baseAddr,unsigned short type)
   {
    SetZMask4O();
    if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
-   DEFOPAQUEON

-

-   if(bSmallAlpha && iFilterType<=2)

-    {

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-     SetZMask4O();

-    }

+   DEFOPAQUEON
+
+   if(bSmallAlpha && iFilterType<=2)
+    {
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+     SetZMask4O();
+    }
 
    PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
    DEFOPAQUEOFF
@@ -2951,7 +2952,7 @@ void primSprtSRest(unsigned char * baseAddr,unsigned short type)
   }
 }
 
-void primSprtS(unsigned char * baseAddr)
+static void primSprtS(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -2980,13 +2981,13 @@ void primSprtS(unsigned char * baseAddr)
    if(s<0) {s=0;}
    gl_ux[0]=gl_ux[3]=s;
   }
- if(usMirror & 0x2000) 

-  {

-   s=gl_vy[0];

-   s-=sprtH-1;

-   if(s<0) {s=0;}

-   gl_vy[0]=gl_vy[1]=s;

-  }

+ if(usMirror & 0x2000) 
+  {
+   s=gl_vy[0];
+   s-=sprtH-1;
+   if(s<0) {s=0;}
+   gl_vy[0]=gl_vy[1]=s;
+  }
 
  sSprite_ux2=s=gl_ux[0]+sprtW; 
  if(s)     s--;
@@ -3030,7 +3031,7 @@ void primSprtS(unsigned char * baseAddr)
      else
      if(usMirror)   DrawSoftwareSpriteMirror(baseAddr,sprtW,sprtH);
      else
-     DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);

+     DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
     }
   }
 
@@ -3060,17 +3061,17 @@ void primSprtS(unsigned char * baseAddr)
   {
    SetZMask4O();
    if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
-   DEFOPAQUEON

-

-   if(bSmallAlpha && iFilterType<=2)

-    {

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-     SetZMask4O();

-    }

+   DEFOPAQUEON
+
+   if(bSmallAlpha && iFilterType<=2)
+    {
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+     SetZMask4O();
+    }
 
    PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
    DEFOPAQUEOFF
@@ -3091,7 +3092,7 @@ void primSprtS(unsigned char * baseAddr)
 // cmd: flat shaded Poly4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF4(unsigned char *baseAddr)
+static void primPolyF4(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -3138,7 +3139,7 @@ void primPolyF4(unsigned char *baseAddr)
 
 void primPolyG4(unsigned char * baseAddr);
 
-BOOL bDrawOffscreenFrontFF9G4(void)
+static BOOL bDrawOffscreenFrontFF9G4(void)
 {
  if(lx0< PSXDisplay.DisplayPosition.x) return FALSE;   // must be complete in front
  if(lx0> PSXDisplay.DisplayEnd.x)      return FALSE;
@@ -3169,16 +3170,16 @@ BOOL bCheckFF9G4(unsigned char * baseAddr)
    if(iFF9Fix==0)
     {
      if(bDrawOffscreenFrontFF9G4())
-      {

-       short *sgpuData = ((short *) pFF9G4Cache);

-       iFF9Fix=2;

-       memcpy(pFF9G4Cache,baseAddr,32);

-

-       if(sgpuData[2]==142)

-        {

-         sgpuData[2] +=65;

-         sgpuData[10]+=65;

-        }

+      {
+       short *sgpuData = ((short *) pFF9G4Cache);
+       iFF9Fix=2;
+       memcpy(pFF9G4Cache,baseAddr,32);
+
+       if(sgpuData[2]==142)
+        {
+         sgpuData[2] +=65;
+         sgpuData[10]+=65;
+        }
        return TRUE;
       }
      else iFF9Fix=1;
@@ -3253,7 +3254,7 @@ void primPolyG4(unsigned char * baseAddr)
 // cmd: flat shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-BOOL DoLineCheck(uint32_t *gpuData)
+static BOOL DoLineCheck(uint32_t *gpuData)
 {
  BOOL bQuad=FALSE;short dx,dy;
 
@@ -3418,7 +3419,7 @@ BOOL DoLineCheck(uint32_t *gpuData)
 
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyFT3(unsigned char * baseAddr)
+static void primPolyFT3(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -3491,370 +3492,370 @@ void primPolyFT3(unsigned char * baseAddr)
 ////////////////////////////////////////////////////////////////////////
 // cmd: flat shaded Texture4
 ////////////////////////////////////////////////////////////////////////
-

-#define ST_FAC             255.99f

-

-void RectTexAlign(void)

-{

- int UFlipped = FALSE;

- int VFlipped = FALSE;

-

- if(gTexName==gTexFrameName) return;

-

- if(ly0==ly1)

-  {

-   if(!((lx1==lx3 && ly3==ly2 && lx2==lx0) ||

-        (lx1==lx2 && ly2==ly3 && lx3==lx0)))

-    return;

-

-   if(ly0<ly2) 

-    {

-     if (vertex[0].tow > vertex[2].tow)

-      VFlipped = 1;

-    }

-   else

-    {

-     if (vertex[0].tow < vertex[2].tow)

-      VFlipped = 2;

-    }

-  }

- else

- if(ly0==ly2)

-  {

-   if(!((lx2==lx3 && ly3==ly1 && lx1==lx0) ||

-        (lx2==lx1 && ly1==ly3 && lx3==lx0)))

-    return;

-

-   if(ly0<ly1) 

-    {

-     if (vertex[0].tow > vertex[1].tow)

-      VFlipped = 3;

-    }

-   else

-    {

-     if (vertex[0].tow < vertex[1].tow)

-      VFlipped = 4;

-    }

-  }

- else

- if(ly0==ly3)

-  {

-   if(!((lx3==lx2 && ly2==ly1 && lx1==lx0) ||

-        (lx3==lx1 && ly1==ly2 && lx2==lx0)))

-    return;

-

-   if(ly0<ly1) 

-    {

-     if (vertex[0].tow > vertex[1].tow)

-      VFlipped = 5;

-    }

-   else

-    {

-     if (vertex[0].tow < vertex[1].tow)

-      VFlipped = 6;

-    }

-  }

- else return;

-

- if(lx0==lx1)

-  {

-   if(lx0<lx2) 

-    {

-     if (vertex[0].sow > vertex[2].sow)

-      UFlipped = 1;

-    }

-   else

-    {

-     if (vertex[0].sow < vertex[2].sow)

-      UFlipped = 2;

-    }

-  }

- else

- if(lx0==lx2)

-  {

-   if(lx0<lx1) 

-    {

-     if (vertex[0].sow > vertex[1].sow)

-      UFlipped = 3;

-    }

-   else

-    {

-     if (vertex[0].sow < vertex[1].sow)

-      UFlipped = 4;

-    }

-  }

- else

- if(lx0==lx3)

-  {

-   if(lx0<lx1) 

-    {

-     if (vertex[0].sow > vertex[1].sow)

-      UFlipped = 5;

-    }

-   else

-    {

-     if (vertex[0].sow < vertex[1].sow)

-      UFlipped = 6;

-    }

-  }

-

- if (UFlipped)

-  {

-#ifdef OWNSCALE

-   if(bUsingTWin)

-    {

-     switch(UFlipped)

-      {

-       case 1:

-        vertex[2].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[3].sow+=0.95f/TWin.UScaleFactor;

-        break;

-       case 2:

-        vertex[0].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[1].sow+=0.95f/TWin.UScaleFactor;

-        break;

-       case 3:

-        vertex[1].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[3].sow+=0.95f/TWin.UScaleFactor;

-        break;

-       case 4:

-        vertex[0].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[2].sow+=0.95f/TWin.UScaleFactor;

-        break;

-       case 5:

-        vertex[1].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[2].sow+=0.95f/TWin.UScaleFactor;

-        break;

-       case 6:

-        vertex[0].sow+=0.95f/TWin.UScaleFactor; 

-        vertex[3].sow+=0.95f/TWin.UScaleFactor;

-        break;

-      }

-    }

-   else

-    {

-     switch(UFlipped)

-      {

-       case 1:

-        vertex[2].sow+=1.0f/ST_FAC; 

-        vertex[3].sow+=1.0f/ST_FAC;

-        break;

-       case 2:

-        vertex[0].sow+=1.0f/ST_FAC; 

-        vertex[1].sow+=1.0f/ST_FAC;

-        break;

-       case 3:

-        vertex[1].sow+=1.0f/ST_FAC; 

-        vertex[3].sow+=1.0f/ST_FAC;

-        break;

-       case 4:

-        vertex[0].sow+=1.0f/ST_FAC; 

-        vertex[2].sow+=1.0f/ST_FAC;

-        break;

-       case 5:

-        vertex[1].sow+=1.0f/ST_FAC; 

-        vertex[2].sow+=1.0f/ST_FAC;

-        break;

-       case 6:

-        vertex[0].sow+=1.0f/ST_FAC; 

-        vertex[3].sow+=1.0f/ST_FAC;

-        break;

-      }

-    }

-#else

-   if(bUsingTWin)

-    {

-     switch(UFlipped)

-      {

-       case 1:

-        vertex[2].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[3].sow+=1.0f/TWin.UScaleFactor;

-        break;

-       case 2:

-        vertex[0].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[1].sow+=1.0f/TWin.UScaleFactor;

-        break;

-       case 3:

-        vertex[1].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[3].sow+=1.0f/TWin.UScaleFactor;

-        break;

-       case 4:

-        vertex[0].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[2].sow+=1.0f/TWin.UScaleFactor;

-        break;

-       case 5:

-        vertex[1].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[2].sow+=1.0f/TWin.UScaleFactor;

-        break;

-       case 6:

-        vertex[0].sow+=1.0f/TWin.UScaleFactor; 

-        vertex[3].sow+=1.0f/TWin.UScaleFactor;

-        break;

-      }

-    }

-   else

-    {

-     switch(UFlipped)

-      {

-       case 1:

-        vertex[2].sow+=1.0f; 

-        vertex[3].sow+=1.0f;

-        break;

-       case 2:

-        vertex[0].sow+=1.0f; 

-        vertex[1].sow+=1.0f;

-        break;

-       case 3:

-        vertex[1].sow+=1.0f; 

-        vertex[3].sow+=1.0f;

-        break;

-       case 4:

-        vertex[0].sow+=1.0f; 

-        vertex[2].sow+=1.0f;

-        break;

-       case 5:

-        vertex[1].sow+=1.0f; 

-        vertex[2].sow+=1.0f;

-        break;

-       case 6:

-        vertex[0].sow+=1.0f; 

-        vertex[3].sow+=1.0f;

-        break;

-      }

-    }

-#endif

-  }

-

- if (VFlipped)

-  {

-#ifdef OWNSCALE

-   if(bUsingTWin)

-    {

-     switch(VFlipped)

-      {

-       case 1:

-        vertex[2].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[3].tow+=0.95f/TWin.VScaleFactor;

-        break;

-       case 2:

-        vertex[0].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[1].tow+=0.95f/TWin.VScaleFactor;

-        break;

-       case 3:

-        vertex[1].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[3].tow+=0.95f/TWin.VScaleFactor;

-        break;

-       case 4:

-        vertex[0].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[2].tow+=0.95f/TWin.VScaleFactor;

-        break;

-       case 5:

-        vertex[1].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[2].tow+=0.95f/TWin.VScaleFactor;

-        break;

-       case 6:

-        vertex[0].tow+=0.95f/TWin.VScaleFactor; 

-        vertex[3].tow+=0.95f/TWin.VScaleFactor;

-        break;

-      }

-    }

-   else

-    {

-     switch(VFlipped)

-      {

-       case 1:

-        vertex[2].tow+=1.0f/ST_FAC; 

-        vertex[3].tow+=1.0f/ST_FAC;

-        break;

-       case 2:

-        vertex[0].tow+=1.0f/ST_FAC; 

-        vertex[1].tow+=1.0f/ST_FAC;

-        break;

-       case 3:

-        vertex[1].tow+=1.0f/ST_FAC;

-        vertex[3].tow+=1.0f/ST_FAC;

-        break;

-       case 4:

-        vertex[0].tow+=1.0f/ST_FAC; 

-        vertex[2].tow+=1.0f/ST_FAC;

-        break;

-       case 5:

-        vertex[1].tow+=1.0f/ST_FAC;

-        vertex[2].tow+=1.0f/ST_FAC;

-        break;

-       case 6:

-        vertex[0].tow+=1.0f/ST_FAC;

-        vertex[3].tow+=1.0f/ST_FAC;

-        break;

-      }

-    }

-#else

-   if(bUsingTWin)

-    {

-     switch(VFlipped)

-      {

-       case 1:

-        vertex[2].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[3].tow+=1.0f/TWin.VScaleFactor;

-        break;

-       case 2:

-        vertex[0].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[1].tow+=1.0f/TWin.VScaleFactor;

-        break;

-       case 3:

-        vertex[1].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[3].tow+=1.0f/TWin.VScaleFactor;

-        break;

-       case 4:

-        vertex[0].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[2].tow+=1.0f/TWin.VScaleFactor;

-        break;

-       case 5:

-        vertex[1].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[2].tow+=1.0f/TWin.VScaleFactor;

-        break;

-       case 6:

-        vertex[0].tow+=1.0f/TWin.VScaleFactor; 

-        vertex[3].tow+=1.0f/TWin.VScaleFactor;

-        break;

-      }

-    }

-   else

-    {

-     switch(VFlipped)

-      {

-       case 1:

-        vertex[2].tow+=1.0f; 

-        vertex[3].tow+=1.0f;

-        break;

-       case 2:

-        vertex[0].tow+=1.0f; 

-        vertex[1].tow+=1.0f;

-        break;

-       case 3:

-        vertex[1].tow+=1.0f; 

-        vertex[3].tow+=1.0f;

-        break;

-       case 4:

-        vertex[0].tow+=1.0f; 

-        vertex[2].tow+=1.0f;

-        break;

-       case 5:

-        vertex[1].tow+=1.0f; 

-        vertex[2].tow+=1.0f;

-        break;

-       case 6:

-        vertex[0].tow+=1.0f; 

-        vertex[3].tow+=1.0f;

-        break;

-      }

-    }

-#endif

-  }

-

-}

-
-void primPolyFT4(unsigned char * baseAddr)
+
+#define ST_FAC             255.99f
+
+static void RectTexAlign(void)
+{
+ int UFlipped = FALSE;
+ int VFlipped = FALSE;
+
+ if(gTexName==gTexFrameName) return;
+
+ if(ly0==ly1)
+  {
+   if(!((lx1==lx3 && ly3==ly2 && lx2==lx0) ||
+        (lx1==lx2 && ly2==ly3 && lx3==lx0)))
+    return;
+
+   if(ly0<ly2) 
+    {
+     if (vertex[0].tow > vertex[2].tow)
+      VFlipped = 1;
+    }
+   else
+    {
+     if (vertex[0].tow < vertex[2].tow)
+      VFlipped = 2;
+    }
+  }
+ else
+ if(ly0==ly2)
+  {
+   if(!((lx2==lx3 && ly3==ly1 && lx1==lx0) ||
+        (lx2==lx1 && ly1==ly3 && lx3==lx0)))
+    return;
+
+   if(ly0<ly1) 
+    {
+     if (vertex[0].tow > vertex[1].tow)
+      VFlipped = 3;
+    }
+   else
+    {
+     if (vertex[0].tow < vertex[1].tow)
+      VFlipped = 4;
+    }
+  }
+ else
+ if(ly0==ly3)
+  {
+   if(!((lx3==lx2 && ly2==ly1 && lx1==lx0) ||
+        (lx3==lx1 && ly1==ly2 && lx2==lx0)))
+    return;
+
+   if(ly0<ly1) 
+    {
+     if (vertex[0].tow > vertex[1].tow)
+      VFlipped = 5;
+    }
+   else
+    {
+     if (vertex[0].tow < vertex[1].tow)
+      VFlipped = 6;
+    }
+  }
+ else return;
+
+ if(lx0==lx1)
+  {
+   if(lx0<lx2) 
+    {
+     if (vertex[0].sow > vertex[2].sow)
+      UFlipped = 1;
+    }
+   else
+    {
+     if (vertex[0].sow < vertex[2].sow)
+      UFlipped = 2;
+    }
+  }
+ else
+ if(lx0==lx2)
+  {
+   if(lx0<lx1) 
+    {
+     if (vertex[0].sow > vertex[1].sow)
+      UFlipped = 3;
+    }
+   else
+    {
+     if (vertex[0].sow < vertex[1].sow)
+      UFlipped = 4;
+    }
+  }
+ else
+ if(lx0==lx3)
+  {
+   if(lx0<lx1) 
+    {
+     if (vertex[0].sow > vertex[1].sow)
+      UFlipped = 5;
+    }
+   else
+    {
+     if (vertex[0].sow < vertex[1].sow)
+      UFlipped = 6;
+    }
+  }
+
+ if (UFlipped)
+  {
+#ifdef OWNSCALE
+   if(bUsingTWin)
+    {
+     switch(UFlipped)
+      {
+       case 1:
+        vertex[2].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[3].sow+=0.95f/TWin.UScaleFactor;
+        break;
+       case 2:
+        vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[1].sow+=0.95f/TWin.UScaleFactor;
+        break;
+       case 3:
+        vertex[1].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[3].sow+=0.95f/TWin.UScaleFactor;
+        break;
+       case 4:
+        vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[2].sow+=0.95f/TWin.UScaleFactor;
+        break;
+       case 5:
+        vertex[1].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[2].sow+=0.95f/TWin.UScaleFactor;
+        break;
+       case 6:
+        vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+        vertex[3].sow+=0.95f/TWin.UScaleFactor;
+        break;
+      }
+    }
+   else
+    {
+     switch(UFlipped)
+      {
+       case 1:
+        vertex[2].sow+=1.0f/ST_FAC; 
+        vertex[3].sow+=1.0f/ST_FAC;
+        break;
+       case 2:
+        vertex[0].sow+=1.0f/ST_FAC; 
+        vertex[1].sow+=1.0f/ST_FAC;
+        break;
+       case 3:
+        vertex[1].sow+=1.0f/ST_FAC; 
+        vertex[3].sow+=1.0f/ST_FAC;
+        break;
+       case 4:
+        vertex[0].sow+=1.0f/ST_FAC; 
+        vertex[2].sow+=1.0f/ST_FAC;
+        break;
+       case 5:
+        vertex[1].sow+=1.0f/ST_FAC; 
+        vertex[2].sow+=1.0f/ST_FAC;
+        break;
+       case 6:
+        vertex[0].sow+=1.0f/ST_FAC; 
+        vertex[3].sow+=1.0f/ST_FAC;
+        break;
+      }
+    }
+#else
+   if(bUsingTWin)
+    {
+     switch(UFlipped)
+      {
+       case 1:
+        vertex[2].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[3].sow+=1.0f/TWin.UScaleFactor;
+        break;
+       case 2:
+        vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[1].sow+=1.0f/TWin.UScaleFactor;
+        break;
+       case 3:
+        vertex[1].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[3].sow+=1.0f/TWin.UScaleFactor;
+        break;
+       case 4:
+        vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[2].sow+=1.0f/TWin.UScaleFactor;
+        break;
+       case 5:
+        vertex[1].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[2].sow+=1.0f/TWin.UScaleFactor;
+        break;
+       case 6:
+        vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+        vertex[3].sow+=1.0f/TWin.UScaleFactor;
+        break;
+      }
+    }
+   else
+    {
+     switch(UFlipped)
+      {
+       case 1:
+        vertex[2].sow+=1.0f; 
+        vertex[3].sow+=1.0f;
+        break;
+       case 2:
+        vertex[0].sow+=1.0f; 
+        vertex[1].sow+=1.0f;
+        break;
+       case 3:
+        vertex[1].sow+=1.0f; 
+        vertex[3].sow+=1.0f;
+        break;
+       case 4:
+        vertex[0].sow+=1.0f; 
+        vertex[2].sow+=1.0f;
+        break;
+       case 5:
+        vertex[1].sow+=1.0f; 
+        vertex[2].sow+=1.0f;
+        break;
+       case 6:
+        vertex[0].sow+=1.0f; 
+        vertex[3].sow+=1.0f;
+        break;
+      }
+    }
+#endif
+  }
+
+ if (VFlipped)
+  {
+#ifdef OWNSCALE
+   if(bUsingTWin)
+    {
+     switch(VFlipped)
+      {
+       case 1:
+        vertex[2].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[3].tow+=0.95f/TWin.VScaleFactor;
+        break;
+       case 2:
+        vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[1].tow+=0.95f/TWin.VScaleFactor;
+        break;
+       case 3:
+        vertex[1].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[3].tow+=0.95f/TWin.VScaleFactor;
+        break;
+       case 4:
+        vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[2].tow+=0.95f/TWin.VScaleFactor;
+        break;
+       case 5:
+        vertex[1].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[2].tow+=0.95f/TWin.VScaleFactor;
+        break;
+       case 6:
+        vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+        vertex[3].tow+=0.95f/TWin.VScaleFactor;
+        break;
+      }
+    }
+   else
+    {
+     switch(VFlipped)
+      {
+       case 1:
+        vertex[2].tow+=1.0f/ST_FAC; 
+        vertex[3].tow+=1.0f/ST_FAC;
+        break;
+       case 2:
+        vertex[0].tow+=1.0f/ST_FAC; 
+        vertex[1].tow+=1.0f/ST_FAC;
+        break;
+       case 3:
+        vertex[1].tow+=1.0f/ST_FAC;
+        vertex[3].tow+=1.0f/ST_FAC;
+        break;
+       case 4:
+        vertex[0].tow+=1.0f/ST_FAC; 
+        vertex[2].tow+=1.0f/ST_FAC;
+        break;
+       case 5:
+        vertex[1].tow+=1.0f/ST_FAC;
+        vertex[2].tow+=1.0f/ST_FAC;
+        break;
+       case 6:
+        vertex[0].tow+=1.0f/ST_FAC;
+        vertex[3].tow+=1.0f/ST_FAC;
+        break;
+      }
+    }
+#else
+   if(bUsingTWin)
+    {
+     switch(VFlipped)
+      {
+       case 1:
+        vertex[2].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[3].tow+=1.0f/TWin.VScaleFactor;
+        break;
+       case 2:
+        vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[1].tow+=1.0f/TWin.VScaleFactor;
+        break;
+       case 3:
+        vertex[1].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[3].tow+=1.0f/TWin.VScaleFactor;
+        break;
+       case 4:
+        vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[2].tow+=1.0f/TWin.VScaleFactor;
+        break;
+       case 5:
+        vertex[1].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[2].tow+=1.0f/TWin.VScaleFactor;
+        break;
+       case 6:
+        vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+        vertex[3].tow+=1.0f/TWin.VScaleFactor;
+        break;
+      }
+    }
+   else
+    {
+     switch(VFlipped)
+      {
+       case 1:
+        vertex[2].tow+=1.0f; 
+        vertex[3].tow+=1.0f;
+        break;
+       case 2:
+        vertex[0].tow+=1.0f; 
+        vertex[1].tow+=1.0f;
+        break;
+       case 3:
+        vertex[1].tow+=1.0f; 
+        vertex[3].tow+=1.0f;
+        break;
+       case 4:
+        vertex[0].tow+=1.0f; 
+        vertex[2].tow+=1.0f;
+        break;
+       case 5:
+        vertex[1].tow+=1.0f; 
+        vertex[2].tow+=1.0f;
+        break;
+       case 6:
+        vertex[0].tow+=1.0f; 
+        vertex[3].tow+=1.0f;
+        break;
+      }
+    }
+#endif
+  }
+
+}
+
+static void primPolyFT4(unsigned char * baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -3918,17 +3919,17 @@ void primPolyFT4(unsigned char * baseAddr)
   {
    SetZMask4O();
    if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
-   DEFOPAQUEON

-

-   if(bSmallAlpha && iFilterType<=2)

-    {

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

-     SetZMask4O();

-    }

+   DEFOPAQUEON
+
+   if(bSmallAlpha && iFilterType<=2)
+    {
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+     PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+     SetZMask4O();
+    }
 
    PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);
    DEFOPAQUEOFF
@@ -3941,7 +3942,7 @@ void primPolyFT4(unsigned char * baseAddr)
 // cmd: smooth shaded Texture3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT3(unsigned char *baseAddr)
+static void primPolyGT3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4050,7 +4051,7 @@ void primPolyGT3(unsigned char *baseAddr)
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyG3(unsigned char *baseAddr)
+static void primPolyG3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4095,7 +4096,7 @@ void primPolyG3(unsigned char *baseAddr)
 // cmd: smooth shaded Texture4
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyGT4(unsigned char *baseAddr)
+static void primPolyGT4(unsigned char *baseAddr)
 { 
  uint32_t *gpuData = ((uint32_t *)baseAddr);
  short *sgpuData = ((short *)baseAddr);
@@ -4215,7 +4216,7 @@ void primPolyGT4(unsigned char *baseAddr)
 // cmd: smooth shaded Poly3
 ////////////////////////////////////////////////////////////////////////
 
-void primPolyF3(unsigned char *baseAddr)
+static void primPolyF3(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4259,7 +4260,7 @@ void primPolyF3(unsigned char *baseAddr)
 // cmd: skipping shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGSkip(unsigned char *baseAddr)
+static void primLineGSkip(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4268,8 +4269,8 @@ void primLineGSkip(unsigned char *baseAddr)
 
  lx1 = sgpuData[2];
  ly1 = sgpuData[3];
-

- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))

+
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
   {
    i++;
 
@@ -4284,7 +4285,7 @@ void primLineGSkip(unsigned char *baseAddr)
 // cmd: shaded polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineGEx(unsigned char *baseAddr)
+static void primLineGEx(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int iMax=255;
@@ -4302,11 +4303,11 @@ void primLineGEx(unsigned char *baseAddr)
  lx1 = (short)(gpuData[1] & 0xffff);
 
  i=2;
-

+
  //while((gpuData[i]>>24)!=0x55)
- //while((gpuData[i]&0x50000000)!=0x50000000) 

- // currently best way to check for poly line end:

- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))

+ //while((gpuData[i]&0x50000000)!=0x50000000) 
+ // currently best way to check for poly line end:
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
   {
    ly0 = ly1;lx0=lx1;
    vertex[1].c.lcol=vertex[2].c.lcol=vertex[0].c.lcol;
@@ -4317,8 +4318,8 @@ void primLineGEx(unsigned char *baseAddr)
 
    ly1 = (short)((gpuData[i]>>16) & 0xffff);
    lx1 = (short)(gpuData[i] & 0xffff);
-

-   if(offsetline()) bDraw=FALSE; else bDraw=TRUE;

+
+   if(offsetline()) bDraw=FALSE; else bDraw=TRUE;
   
    if (bDraw && ((lx0 != lx1) || (ly0 != ly1)))
     {
@@ -4348,7 +4349,7 @@ void primLineGEx(unsigned char *baseAddr)
 // cmd: shaded polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineG2(unsigned char *baseAddr)
+static void primLineG2(unsigned char *baseAddr)
 {    
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4393,7 +4394,7 @@ void primLineG2(unsigned char *baseAddr)
 // cmd: skipping flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFSkip(unsigned char *baseAddr)
+static void primLineFSkip(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int i=2,iMax=255;
@@ -4401,7 +4402,7 @@ void primLineFSkip(unsigned char *baseAddr)
  ly1 = (short)((gpuData[1]>>16) & 0xffff);
  lx1 = (short)(gpuData[1] & 0xffff);
 
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))

+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
   {
    ly1 = (short)((gpuData[i]>>16) & 0xffff);
    lx1 = (short)(gpuData[i] & 0xffff);
@@ -4413,7 +4414,7 @@ void primLineFSkip(unsigned char *baseAddr)
 // cmd: drawing flat polylines
 ////////////////////////////////////////////////////////////////////////
 
-void primLineFEx(unsigned char *baseAddr)
+static void primLineFEx(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  int iMax;
@@ -4439,13 +4440,13 @@ void primLineFEx(unsigned char *baseAddr)
 // while((gpuData[i]>>24)!=0x55)
 // while((gpuData[i]&0x50000000)!=0x50000000) 
 // currently best way to check for poly line end:
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))

+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
   {
    ly0 = ly1;lx0=lx1;
    ly1 = (short)((gpuData[i]>>16) & 0xffff);
    lx1 = (short)(gpuData[i] & 0xffff);
-

-   if(!offsetline())

+
+   if(!offsetline())
     {
      if(iOffscreenDrawing)
       {
@@ -4459,7 +4460,7 @@ void primLineFEx(unsigned char *baseAddr)
        lx0=cx0;lx1=cx1;ly0=cy0;ly1=cy1;
       }
      PRIMdrawFlatLine(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
-    }

+    }
                   
    i++;if(i>iMax) break;
   }
@@ -4471,7 +4472,7 @@ void primLineFEx(unsigned char *baseAddr)
 // cmd: drawing flat polyline2
 ////////////////////////////////////////////////////////////////////////
 
-void primLineF2(unsigned char *baseAddr)
+static void primLineF2(unsigned char *baseAddr)
 {
  uint32_t *gpuData = ((uint32_t *) baseAddr);
  short *sgpuData = ((short *) baseAddr);
@@ -4512,7 +4513,7 @@ void primLineF2(unsigned char *baseAddr)
 // cmd: well, easiest command... not implemented
 ////////////////////////////////////////////////////////////////////////
 
-void primNI(unsigned char *bA)
+static void primNI(unsigned char *bA)
 {
 }
 
diff --git a/plugins/peopsxgl/soft.c b/plugins/peopsxgl/soft.c
index 9f10a2a0..1ab93f07 100644
--- a/plugins/peopsxgl/soft.c
+++ b/plugins/peopsxgl/soft.c
@@ -1,8407 +1,8409 @@
-/***************************************************************************

-                          soft.c  -  description

-                             -------------------

-    begin                : Sun Oct 28 2001

-    copyright            : (C) 2001 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_SOFT

-

-#include "externals.h"

-#include "soft.h"

-

-int iDither = 0;

-

-////////////////////////////////////////////////////////////////////////////////////

-// "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday

-////////////////////////////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////////////////////////////

-// defines

-////////////////////////////////////////////////////////////////////////////////////

-

-// switches for painting textured quads as 2 triangles (small glitches, but better shading!)

-// can be toggled by game fix 0x200 in version 1.17 anyway, so let the defines enabled!

-

-#define POLYQUAD3                 

-#define POLYQUAD3GT                 

-

-// fast solid loops... a bit more additional code, of course

-

-#define FASTSOLID

-

-// psx blending mode 3 with 25% incoming color (instead 50% without the define)

-

-#define HALFBRIGHTMODE3

-

-// color decode defines

-

-#define XCOL1(x)     (x & 0x1f)

-#define XCOL2(x)     (x & 0x3e0)

-#define XCOL3(x)     (x & 0x7c00)

-

-#define XCOL1D(x)     (x & 0x1f)

-#define XCOL2D(x)     ((x>>5) & 0x1f)

-#define XCOL3D(x)     ((x>>10) & 0x1f)

-

-#define X32TCOL1(x)  ((x & 0x001f001f)<<7)

-#define X32TCOL2(x)  ((x & 0x03e003e0)<<2)

-#define X32TCOL3(x)  ((x & 0x7c007c00)>>3)

-

-#define X32COL1(x)   (x & 0x001f001f)

-#define X32COL2(x)   ((x>>5) & 0x001f001f)

-#define X32COL3(x)   ((x>>10) & 0x001f001f)

-

-#define X32ACOL1(x)  (x & 0x001e001e)

-#define X32ACOL2(x)  ((x>>5) & 0x001e001e)

-#define X32ACOL3(x)  ((x>>10) & 0x001e001e)

-

-#define X32BCOL1(x)  (x & 0x001c001c)

-#define X32BCOL2(x)  ((x>>5) & 0x001c001c)

-#define X32BCOL3(x)  ((x>>10) & 0x001c001c)

-

-#define X32PSXCOL(r,g,b) ((g<<10)|(b<<5)|r)

-

-#define XPSXCOL(r,g,b) ((g&0x7c00)|(b&0x3e0)|(r&0x1f))

-

-////////////////////////////////////////////////////////////////////////////////////

-// soft globals

-////////////////////////////////////////////////////////////////////////////////////

-

-short g_m1 = 255, g_m2 = 255, g_m3 = 255;

-short DrawSemiTrans = FALSE;

-short Ymin;

-short Ymax;

-

-short          ly0, lx0, ly1, lx1, ly2, lx2, ly3, lx3;   // global psx vertex coords

-int            GlobalTextAddrX, GlobalTextAddrY, GlobalTextTP;

-int            GlobalTextREST, GlobalTextABR, GlobalTextPAGE;

-

-////////////////////////////////////////////////////////////////////////

-// POLYGON OFFSET FUNCS

-////////////////////////////////////////////////////////////////////////

-

-void offsetPSXLine(void)

-{

- short x0,x1,y0,y1,dx,dy;float px,py;

-

- x0 = lx0+1+PSXDisplay.DrawOffset.x;

- x1 = lx1+1+PSXDisplay.DrawOffset.x;

- y0 = ly0+1+PSXDisplay.DrawOffset.y;

- y1 = ly1+1+PSXDisplay.DrawOffset.y;

-

- dx=x1-x0;

- dy=y1-y0;

-

- // tricky line width without sqrt

-

- if(dx>=0)

-  {

-   if(dy>=0)

-    {

-     px=0.5f;

-          if(dx>dy) py=-0.5f;

-     else if(dx<dy) py= 0.5f;

-     else           py= 0.0f;

-    }

-   else

-    {

-     py=-0.5f;

-     dy=-dy;

-          if(dx>dy) px= 0.5f;

-     else if(dx<dy) px=-0.5f;

-     else           px= 0.0f;

-    }

-  }

- else

-  {

-   if(dy>=0)

-    {

-     py=0.5f;

-     dx=-dx;

-          if(dx>dy) px=-0.5f;

-     else if(dx<dy) px= 0.5f;

-     else           px= 0.0f;

-    }

-   else

-    {

-     px=-0.5f;

-          if(dx>dy) py=-0.5f;

-     else if(dx<dy) py= 0.5f;

-     else           py= 0.0f;

-    }

-  } 

- 

- lx0=(short)((float)x0-px);

- lx3=(short)((float)x0+py);

- 

- ly0=(short)((float)y0-py);

- ly3=(short)((float)y0-px);

- 

- lx1=(short)((float)x1-py);

- lx2=(short)((float)x1+px);

- 

- ly1=(short)((float)y1+px);

- ly2=(short)((float)y1+py);

-}

-

-void offsetPSX2(void)

-{

- lx0 += PSXDisplay.DrawOffset.x;

- ly0 += PSXDisplay.DrawOffset.y;

- lx1 += PSXDisplay.DrawOffset.x;

- ly1 += PSXDisplay.DrawOffset.y;

-}

-

-void offsetPSX3(void)

-{

- lx0 += PSXDisplay.DrawOffset.x;

- ly0 += PSXDisplay.DrawOffset.y;

- lx1 += PSXDisplay.DrawOffset.x;

- ly1 += PSXDisplay.DrawOffset.y;

- lx2 += PSXDisplay.DrawOffset.x;

- ly2 += PSXDisplay.DrawOffset.y;

-}

-

-void offsetPSX4(void)

-{

- lx0 += PSXDisplay.DrawOffset.x;

- ly0 += PSXDisplay.DrawOffset.y;

- lx1 += PSXDisplay.DrawOffset.x;

- ly1 += PSXDisplay.DrawOffset.y;

- lx2 += PSXDisplay.DrawOffset.x;

- ly2 += PSXDisplay.DrawOffset.y;

- lx3 += PSXDisplay.DrawOffset.x;

- ly3 += PSXDisplay.DrawOffset.y;

-}

-

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-// PER PIXEL FUNCS

-////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-

-

-unsigned char dithertable[16] =

-{

-    7, 0, 6, 1,

-    2, 5, 3, 4,

-    1, 6, 0, 7,

-    4, 3, 5, 2

-};

-

-void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigned short sM)

-{

- unsigned char coeff;

- unsigned char rlow, glow, blow;

- int x, y;

-                 

- x = pdest - psxVuw;

- y = x >> 10;

- x -= (y << 10);

-

- coeff = dithertable[(y&3)*4+(x&3)];

-

- rlow = r&7; glow = g&7; blow = b&7;

-

- r>>=3; g>>=3; b>>=3;

-

- if ((r < 0x1F) && rlow > coeff) r++;

- if ((g < 0x1F) && glow > coeff) g++;

- if ((b < 0x1F) && blow > coeff) b++;

-

- *pdest=((unsigned short)b<<10) |

-        ((unsigned short)g<<5) |

-        (unsigned short)r | sM;

-}

-

-/////////////////////////////////////////////////////////////////

-

-__inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)

-{

- int r,g,b;

-

- if (bCheckMask && *pdest & 0x8000) return;

-

- if (DrawSemiTrans)

-  {

-   r=((XCOL1D(*pdest))<<3);

-   b=((XCOL2D(*pdest))<<3);

-   g=((XCOL3D(*pdest))<<3);

-

-   if(GlobalTextABR==0)

-    {

-     r=(r>>1)+(m1>>1);

-     b=(b>>1)+(m2>>1);

-     g=(g>>1)+(m3>>1);

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r+=m1;

-     b+=m2;

-     g+=m3;

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r-=m1;

-     b-=m2;

-     g-=m3;

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r+=(m1>>2);

-     b+=(m2>>2);

-     g+=(m3>>2);

-#else

-     r+=(m1>>1);

-     b+=(m2>>1);

-     g+=(m3>>1);

-#endif

-    }

-  }

- else 

-  {

-   r=m1;

-   b=m2;

-   g=m3;

-  }

-

- if(r&0x7FFFFF00) r=0xff;

- if(b&0x7FFFFF00) b=0xff;

- if(g&0x7FFFFF00) g=0xff;

-

- Dither16(pdest,r,b,g,sSetMask);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

-{

- if(bCheckMask && *pdest&0x8000) return;

-

- if(DrawSemiTrans)

-  {

-   int r,g,b;

- 

-   if(GlobalTextABR==0)

-    {

-     *pdest=((((*pdest)&0x7bde)>>1)+(((color)&0x7bde)>>1))|sSetMask;//0x8000;

-     return;

-/*

-     r=(XCOL1(*pdest)>>1)+((XCOL1(color))>>1);

-     b=(XCOL2(*pdest)>>1)+((XCOL2(color))>>1);

-     g=(XCOL3(*pdest)>>1)+((XCOL3(color))>>1);

-*/

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(XCOL1(*pdest))+((XCOL1(color)));

-     b=(XCOL2(*pdest))+((XCOL2(color)));

-     g=(XCOL3(*pdest))+((XCOL3(color)));

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r=(XCOL1(*pdest))-((XCOL1(color)));

-     b=(XCOL2(*pdest))-((XCOL2(color)));

-     g=(XCOL3(*pdest))-((XCOL3(color)));

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(XCOL1(*pdest))+((XCOL1(color))>>2);

-     b=(XCOL2(*pdest))+((XCOL2(color))>>2);

-     g=(XCOL3(*pdest))+((XCOL3(color))>>2);

-#else

-     r=(XCOL1(*pdest))+((XCOL1(color))>>1);

-     b=(XCOL2(*pdest))+((XCOL2(color))>>1);

-     g=(XCOL3(*pdest))+((XCOL3(color))>>1);

-#endif

-    }

-

-   if(r&0x7FFFFFE0) r=0x1f;

-   if(b&0x7FFFFC00) b=0x3e0;

-   if(g&0x7FFF8000) g=0x7c00;

-

-   *pdest=(XPSXCOL(r,g,b))|sSetMask;//0x8000;

-  }

- else *pdest=color|sSetMask;

-}  

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)

-{

- if (DrawSemiTrans)

-  {

-   int r,g,b;

-

-   if(GlobalTextABR==0)

-    {

-     if(!bCheckMask)

-      {

-       *pdest=((((*pdest)&0x7bde7bde)>>1)+(((color)&0x7bde7bde)>>1))|lSetMask;//0x80008000;

-       return;

-      }

-     r=(X32ACOL1(*pdest)>>1)+((X32ACOL1(color))>>1);

-     b=(X32ACOL2(*pdest)>>1)+((X32ACOL2(color))>>1);

-     g=(X32ACOL3(*pdest)>>1)+((X32ACOL3(color))>>1);

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(X32COL1(*pdest))+((X32COL1(color)));

-     b=(X32COL2(*pdest))+((X32COL2(color)));

-     g=(X32COL3(*pdest))+((X32COL3(color)));

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     int sr,sb,sg,src,sbc,sgc,c;

-     src=XCOL1(color);sbc=XCOL2(color);sgc=XCOL3(color);

-     c=(*pdest)>>16;

-     sr=(XCOL1(c))-src;   if(sr&0x8000) sr=0;

-     sb=(XCOL2(c))-sbc;  if(sb&0x8000) sb=0;

-     sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;

-     r=((int)sr)<<16;b=((int)sb)<<11;g=((int)sg)<<6;

-     c=LOWORD(*pdest);

-     sr=(XCOL1(c))-src;   if(sr&0x8000) sr=0;

-     sb=(XCOL2(c))-sbc;  if(sb&0x8000) sb=0;

-     sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;

-     r|=sr;b|=sb>>5;g|=sg>>10;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(X32COL1(*pdest))+((X32BCOL1(color))>>2);

-     b=(X32COL2(*pdest))+((X32BCOL2(color))>>2);

-     g=(X32COL3(*pdest))+((X32BCOL3(color))>>2);

-#else

-     r=(X32COL1(*pdest))+((X32ACOL1(color))>>1);

-     b=(X32COL2(*pdest))+((X32ACOL2(color))>>1);

-     g=(X32COL3(*pdest))+((X32ACOL3(color))>>1);

-#endif

-    }

-

-   if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);

-   if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);

-   if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);

-   if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);

-   if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);

-   if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);

-

-   if(bCheckMask) 

-    {

-     uint32_t ma=*pdest;

-     *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;

-     if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);

-     if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);

-     return;

-    }

-   *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;

-  }

- else

-  {

-   if(bCheckMask) 

-    {

-     uint32_t ma=*pdest;

-     *pdest=color|lSetMask;//0x80008000;

-     if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);

-     if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);

-     return;

-    }

-

-   *pdest=color|lSetMask;//0x80008000;

-  }

-}  

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

-{

- int r,g,b;unsigned short l;

-

- if(color==0) return;

-

- if(bCheckMask && *pdest&0x8000) return;

-

- l=sSetMask|(color&0x8000);

-

- if(DrawSemiTrans && (color&0x8000))

-  {

-   if(GlobalTextABR==0)

-    {

-     unsigned short d;

-     d     =((*pdest)&0x7bde)>>1;

-     color =((color) &0x7bde)>>1;

-     r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);

-

-/*

-     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);

-     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);

-     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);

-*/

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);

-#else

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);

-#endif

-    }

-  }

- else 

-  {

-   r=((XCOL1(color))* g_m1)>>7;

-   b=((XCOL2(color))* g_m2)>>7;

-   g=((XCOL3(color))* g_m3)>>7;

-  }

-

- if(r&0x7FFFFFE0) r=0x1f;

- if(b&0x7FFFFC00) b=0x3e0;

- if(g&0x7FFF8000) g=0x7c00;

-

- *pdest=(XPSXCOL(r,g,b))|l;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

-{

- int r,g,b;unsigned short l;

-

- if(color==0) return;

-

- l=sSetMask|(color&0x8000);

-

- r=((XCOL1(color))* g_m1)>>7;

- b=((XCOL2(color))* g_m2)>>7;

- g=((XCOL3(color))* g_m3)>>7;

-

- if(r&0x7FFFFFE0) r=0x1f;

- if(b&0x7FFFFC00) b=0x3e0;

- if(g&0x7FFF8000) g=0x7c00;

-

- *pdest=(XPSXCOL(r,g,b))|l;

-}

-

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

-{

- int r,g,b;unsigned short l;

-

- if(color==0) return;

-

- if(bCheckMask && *pdest&0x8000) return;

-

- l=sSetMask|(color&0x8000);

-

- if(DrawSemiTrans && (color&0x8000))

-  {

-   if(GlobalTextABR==0)

-    {

-     unsigned short d;

-     d     =((*pdest)&0x7bde)>>1;

-     color =((color) &0x7bde)>>1;

-     r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);

-

-/*

-     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);

-     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);

-     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);

-*/

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);

-     b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);

-     g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);

-#else

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);

-#endif

-    }

-  }

- else 

-  {

-   r=((XCOL1(color))* g_m1)>>7;

-   b=((XCOL2(color))* g_m2)>>7;

-   g=((XCOL3(color))* g_m3)>>7;

-  }

-

- if(r&0x7FFFFFE0) r=0x1f;

- if(b&0x7FFFFC00) b=0x3e0;

- if(g&0x7FFF8000) g=0x7c00;

-

- *pdest=(XPSXCOL(r,g,b))|l;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)

-{

- int r,g,b,l;

-

- if(color==0) return;

-

- l=lSetMask|(color&0x80008000);

-

- if(DrawSemiTrans && (color&0x80008000))

-  {

-   if(GlobalTextABR==0)

-    {                 

-     r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);

-     b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);

-     g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     int t;

-     r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);

-     t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;

-     r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;

-     r|=t;

-

-     b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);

-     t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;

-     b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;

-     b|=t;

-

-     g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);

-     t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;

-     g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;

-     g|=t;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);

-#else

-     r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);

-#endif

-    }

-

-   if(!(color&0x8000))

-    {

-     r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);

-     b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);

-     g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);

-    }

-   if(!(color&0x80000000))

-    {

-     r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);

-     b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);

-     g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);

-    }

-

-  }

- else 

-  {

-   r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;

-   b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;

-   g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;

-  }

-

- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);

- if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);

- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);

- if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);

- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);

- if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);

-         

- if(bCheckMask) 

-  {

-   uint32_t ma=*pdest;

-

-   *pdest=(X32PSXCOL(r,g,b))|l;

-   

-   if((color&0xffff)==0    ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);

-   if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);

-   if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);

-   if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);

-

-   return;                            

-  }

- if((color&0xffff)==0    ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|l)&0xffff0000);return;}

- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|l)&0xffff);return;}

-

- *pdest=(X32PSXCOL(r,g,b))|l;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)

-{

- int r,g,b;

-

- if(color==0) return;

-

- r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;

- b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;

- g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;

-

- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);

- if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);

- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);

- if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);

- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);

- if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);

-         

- if((color&0xffff)==0)     {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}

- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}

-

- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)

-{

- int r,g,b;

-

- if(color==0) return;

-

- if(DrawSemiTrans && (color&0x80008000))

-  {

-   if(GlobalTextABR==0)

-    {                 

-     r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);

-     b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);

-     g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     int t;

-     r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);

-     t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;

-     r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;

-     r|=t;

-

-     b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);

-     t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;

-     b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;

-     b|=t;

-

-     g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);

-     t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;

-     g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;

-     g|=t;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);

-#else

-     r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);

-     b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);

-     g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);

-#endif

-    }

-

-   if(!(color&0x8000))

-    {

-     r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);

-     b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);

-     g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);

-    }

-   if(!(color&0x80000000))

-    {

-     r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);

-     b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);

-     g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);

-    }

-

-  }

- else 

-  {

-   r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;

-   b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;

-   g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;

-  }

-

- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);

- if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);

- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);

- if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);

- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);

- if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);

-         

- if(bCheckMask) 

-  {

-   uint32_t ma=*pdest;

-

-   *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);

-   

-   if((color&0xffff)==0    ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);

-   if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);

-   if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);

-   if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);

-

-   return;                            

-  }

- if((color&0xffff)==0    ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}

- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}

-

- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)

-{

- int r,g,b;

-

- if(color==0) return;

- 

- if(bCheckMask && *pdest&0x8000) return;

-

- m1=(((XCOL1D(color)))*m1)>>4;

- m2=(((XCOL2D(color)))*m2)>>4;

- m3=(((XCOL3D(color)))*m3)>>4;

-

- if(DrawSemiTrans && (color&0x8000))

-  {

-   r=((XCOL1D(*pdest))<<3);

-   b=((XCOL2D(*pdest))<<3);

-   g=((XCOL3D(*pdest))<<3);

-

-   if(GlobalTextABR==0)

-    {

-     r=(r>>1)+(m1>>1);

-     b=(b>>1)+(m2>>1);

-     g=(g>>1)+(m3>>1);

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r+=m1;

-     b+=m2;

-     g+=m3;

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r-=m1;

-     b-=m2;

-     g-=m3;

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r+=(m1>>2);

-     b+=(m2>>2);

-     g+=(m3>>2);

-#else

-     r+=(m1>>1);

-     b+=(m2>>1);

-     g+=(m3>>1);

-#endif

-    }

-  }

- else 

-  {

-   r=m1;

-   b=m2;

-   g=m3;

-  }

-

- if(r&0x7FFFFF00) r=0xff;

- if(b&0x7FFFFF00) b=0xff;

- if(g&0x7FFFFF00) g=0xff;

-

- Dither16(pdest,r,b,g,sSetMask|(color&0x8000));

-

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

-{

- int r,g,b;unsigned short l;

-

- if(color==0) return;

- 

- if(bCheckMask && *pdest&0x8000) return;

-

- l=sSetMask|(color&0x8000);

-

- if(DrawSemiTrans && (color&0x8000))

-  {

-   if(GlobalTextABR==0)

-    {

-     unsigned short d;

-     d     =((*pdest)&0x7bde)>>1;

-     color =((color) &0x7bde)>>1;

-     r=(XCOL1(d))+((((XCOL1(color)))* m1)>>7);

-     b=(XCOL2(d))+((((XCOL2(color)))* m2)>>7);

-     g=(XCOL3(d))+((((XCOL3(color)))* m3)>>7);

-/*

-     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* m1)>>7);

-     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* m2)>>7);

-     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* m3)>>7);

-*/

-    }

-   else

-   if(GlobalTextABR==1)

-    {

-     r=(XCOL1(*pdest))+((((XCOL1(color)))* m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color)))* m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color)))* m3)>>7);

-    }

-   else

-   if(GlobalTextABR==2)

-    {

-     r=(XCOL1(*pdest))-((((XCOL1(color)))* m1)>>7);

-     b=(XCOL2(*pdest))-((((XCOL2(color)))* m2)>>7);

-     g=(XCOL3(*pdest))-((((XCOL3(color)))* m3)>>7);

-     if(r&0x80000000) r=0;

-     if(b&0x80000000) b=0;

-     if(g&0x80000000) g=0;

-    }

-   else

-    {

-#ifdef HALFBRIGHTMODE3

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* m3)>>7);

-#else

-     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* m1)>>7);

-     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* m2)>>7);

-     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* m3)>>7);

-#endif

-    }

-  }

- else 

-  {

-   r=((XCOL1(color))* m1)>>7;

-   b=((XCOL2(color))* m2)>>7;

-   g=((XCOL3(color))* m3)>>7;

-  }

-

- if(r&0x7FFFFFE0) r=0x1f;

- if(b&0x7FFFFC00) b=0x3e0;

- if(g&0x7FFF8000) g=0x7c00;

-

- *pdest=(XPSXCOL(r,g,b))|l;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

-{

- int r,g,b;

-

- if(color==0) return;

- 

- r=((XCOL1(color))* m1)>>7;

- b=((XCOL2(color))* m2)>>7;

- g=((XCOL3(color))* m3)>>7;

-

- if(r&0x7FFFFFE0) r=0x1f;

- if(b&0x7FFFFC00) b=0x3e0;

- if(g&0x7FFF8000) g=0x7c00;

-

- *pdest=(XPSXCOL(r,g,b))|sSetMask|(color&0x8000);

-}

-

-////////////////////////////////////////////////////////////////////////

-

-__inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)

-{

- int r,g,b;

- 

- if(color==0) return;

-

- r=(((X32COL1(color))* m1)&0xFF80FF80)>>7;

- b=(((X32COL2(color))* m2)&0xFF80FF80)>>7;

- g=(((X32COL3(color))* m3)&0xFF80FF80)>>7;

-                

- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);

- if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);

- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);

- if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);

- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);

- if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);

-

- if((color&0xffff)==0)     {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}

- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}

-

- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);

-}

-

-////////////////////////////////////////////////////////////////////////

-// FILL FUNCS

-////////////////////////////////////////////////////////////////////////

-

-void FillSoftwareAreaTrans(short x0,short y0,short x1, // FILL AREA TRANS

-                      short y1,unsigned short col)

-{

- short j,i,dx,dy;

-

- if(y0>y1) return;

- if(x0>x1) return;

-

- if(x1<drawX) return;

- if(y1<drawY) return;

- if(x0>drawW) return;

- if(y0>drawH) return;

-

- x1=min(x1,drawW+1);

- y1=min(y1,drawH+1);

- x0=max(x0,drawX);

- y0=max(y0,drawY);

-    

- if(y0>=iGPUHeight)   return;

- if(x0>1023)          return;

-

- if(y1>iGPUHeight) y1=iGPUHeight;

- if(x1>1024)       x1=1024;

-

- dx=x1-x0;dy=y1-y0;

-

- if(dx==1 && dy==1 && x0==1020 && y0==511)             // special fix for pinball game... emu protection???

-  {

-/*

-m->v 1020 511 1 1

-writedatamem 0x00000000 1

-tile1 newcol 7fff (orgcol 0xffffff), oldvram 0

-v->m 1020 511 1 1

-readdatamem 0x00007fff 1

-m->v 1020 511 1 1

-writedatamem 0x00000000 1

-tile1 newcol 8000 (orgcol 0xffffff), oldvram 0

-v->m 1020 511 1 1

-readdatamem 0x00008000 1

-*/

-

-   static int iCheat=0;

-   col+=iCheat;

-   if(iCheat==1) iCheat=0; else iCheat=1;

-  }

-

- if(dx&1)                                              // slow fill

-  {

-   unsigned short *DSTPtr;

-   unsigned short LineOffset;

-   DSTPtr = psxVuw + (1024*y0) + x0;

-   LineOffset = 1024 - dx;

-   for(i=0;i<dy;i++)

-    {

-     for(j=0;j<dx;j++)

-      GetShadeTransCol(DSTPtr++,col);

-     DSTPtr += LineOffset;

-    } 

-  }

- else                                                  // fast fill

-  {

-   uint32_t *DSTPtr;

-   unsigned short LineOffset;

-   uint32_t lcol=lSetMask|(((uint32_t)(col))<<16)|col;

-   dx>>=1;

-   DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);

-   LineOffset = 512 - dx;

-

-   if(!bCheckMask && !DrawSemiTrans)

-    {

-     for(i=0;i<dy;i++)

-      {

-       for(j=0;j<dx;j++) *DSTPtr++=lcol;

-       DSTPtr += LineOffset;

-      }

-    }

-   else

-    {

-     for(i=0;i<dy;i++)

-      {

-       for(j=0;j<dx;j++) 

-        GetShadeTransCol32(DSTPtr++,lcol);

-       DSTPtr += LineOffset;

-      } 

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void FillSoftwareArea(short x0,short y0,short x1,      // FILL AREA (BLK FILL)

-                      short y1,unsigned short col)     // no draw area check here!

-{

- short j,i,dx,dy;

-

- if(y0>y1) return;

- if(x0>x1) return;

-    

- if(y0>=iGPUHeight)   return;

- if(x0>1023)          return;

-

- if(y1>iGPUHeight) y1=iGPUHeight;

- if(x1>1024)       x1=1024;

-

- dx=x1-x0;dy=y1-y0;

- if(dx&1)

-  {

-   unsigned short *DSTPtr;

-   unsigned short LineOffset;

-

-   DSTPtr = psxVuw + (1024*y0) + x0;

-   LineOffset = 1024 - dx;

-

-   for(i=0;i<dy;i++)

-    {

-     for(j=0;j<dx;j++) *DSTPtr++=col;

-     DSTPtr += LineOffset;

-    } 

-  }

- else

-  {

-   uint32_t *DSTPtr;

-   unsigned short LineOffset;

-   uint32_t lcol=(((int)col)<<16)|col;

-   dx>>=1;

-   DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);

-   LineOffset = 512 - dx;

-

-   for(i=0;i<dy;i++)

-    {

-     for(j=0;j<dx;j++) *DSTPtr++=lcol;

-     DSTPtr += LineOffset;

-    } 

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// EDGE INTERPOLATION

-////////////////////////////////////////////////////////////////////////

-

-typedef struct SOFTVTAG

-{

- int x,y;   

- int u,v;

- int R,G,B;

-} soft_vertex;

-

-static soft_vertex vtx[4];

-static soft_vertex * left_array[4], * right_array[4];

-static int left_section, right_section;

-static int left_section_height, right_section_height;

-static int left_x, delta_left_x, right_x, delta_right_x;

-static int left_u, delta_left_u, left_v, delta_left_v;

-static int right_u, delta_right_u, right_v, delta_right_v;

-static int left_R, delta_left_R, right_R, delta_right_R;

-static int left_G, delta_left_G, right_G, delta_right_G;

-static int left_B, delta_left_B, right_B, delta_right_B;

-

-#ifdef _MSC_VER

-

-#pragma warning  (disable : 4035)

-

-__inline int shl10idiv(int x, int y)

-{

- __asm

-  {

-   mov   eax,x

-   mov   ebx,y

-   mov   edx, eax

-   shl   eax, 10

-   sar   edx, 22

-   idiv  ebx

-   // return result in eax

-  }

-}

-

-#else

-

-__inline int shl10idiv(int x, int y)

-{

- long long int bi=x;

- bi<<=10;

- return bi/y;

-}

-

-#endif

-

-__inline int RightSection_F(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_right_x = (v2->x - v1->x) / height;

- right_x = v1->x;

-

- right_section_height = height;

- return height;

-}

-

-__inline int LeftSection_F(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_left_x = (v2->x - v1->x) / height;

- left_x = v1->x;

-

- left_section_height = height;

- return height;  

-}

-

-__inline BOOL NextRow_F(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section <= 0) {return TRUE;}

-   if(LeftSection_F()  <= 0) {return TRUE;}

-  }

- else

-  {

-   left_x += delta_left_x;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section<=0) {return TRUE;}

-   if(RightSection_F() <=0) {return TRUE;}

-  }

- else

-  {

-   right_x += delta_right_x;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

-{

- soft_vertex * v1, * v2, * v3;

- int height,longest;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

-

- height = v3->y - v1->y;

- if(height == 0) {return FALSE;}

- longest = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

- if(longest == 0) {return FALSE;}

-

- if(longest < 0)

-  {

-   right_array[0] = v3;

-   right_array[1] = v2;

-   right_array[2] = v1;

-   right_section  = 2;

-   left_array[0]  = v3;

-   left_array[1]  = v1;

-   left_section   = 1;

-

-   if(LeftSection_F() <= 0) return FALSE;

-   if(RightSection_F() <= 0)

-    {

-     right_section--;

-     if(RightSection_F() <= 0) return FALSE;

-    }

-  }

- else

-  {

-   left_array[0]  = v3;

-   left_array[1]  = v2;

-   left_array[2]  = v1;

-   left_section   = 2;

-   right_array[0] = v3;

-   right_array[1] = v1;

-   right_section  = 1;

-

-   if(RightSection_F() <= 0) return FALSE;

-   if(LeftSection_F() <= 0)

-    {    

-     left_section--;

-     if(LeftSection_F() <= 0) return FALSE;

-    }

-  }

-

- Ymin=v1->y;

- Ymax=min(v3->y-1,drawH);

-

- return TRUE;

-}

-

-__inline int RightSection_G(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_right_x = (v2->x - v1->x) / height;

- right_x = v1->x;

-

- right_section_height = height;

- return height;

-}

-

-__inline int LeftSection_G(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_left_x = (v2->x - v1->x) / height;

- left_x = v1->x;

-

- delta_left_R = ((v2->R - v1->R)) / height;

- left_R = v1->R;

- delta_left_G = ((v2->G - v1->G)) / height;

- left_G = v1->G;

- delta_left_B = ((v2->B - v1->B)) / height;

- left_B = v1->B;

-

- left_section_height = height;

- return height;  

-}

-

-__inline BOOL NextRow_G(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section <= 0) {return TRUE;}

-   if(LeftSection_G()  <= 0) {return TRUE;}

-  }

- else

-  {

-   left_x += delta_left_x;

-   left_R += delta_left_R;

-   left_G += delta_left_G;

-   left_B += delta_left_B;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section<=0) {return TRUE;}

-   if(RightSection_G() <=0) {return TRUE;}

-  }

- else

-  {

-   right_x += delta_right_x;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){

- soft_vertex *v1, *v2, *v3;

- int height, longest, temp;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v1->R=(rgb1) & 0x00ff0000;

- v1->G=(rgb1<<8) & 0x00ff0000;

- v1->B=(rgb1<<16) & 0x00ff0000;

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v2->R=(rgb2) & 0x00ff0000;

- v2->G=(rgb2<<8) & 0x00ff0000;

- v2->B=(rgb2<<16) & 0x00ff0000;

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v3->R=(rgb3) & 0x00ff0000;

- v3->G=(rgb3<<8) & 0x00ff0000;

- v3->B=(rgb3<<16) & 0x00ff0000;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

-

- height = v3->y - v1->y;

- if(height == 0) {return FALSE;}

- temp=(((v2->y - v1->y) << 16) / height);

- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

- if(longest == 0) {return FALSE;}

-

- if(longest < 0)

-  {

-   right_array[0] = v3;

-   right_array[1] = v2;

-   right_array[2] = v1;

-   right_section  = 2;

-   left_array[0]  = v3;

-   left_array[1]  = v1;

-   left_section   = 1;

-

-   if(LeftSection_G() <= 0) return FALSE;

-   if(RightSection_G() <= 0)

-    {

-     right_section--;

-     if(RightSection_G() <= 0) return FALSE;

-    }

-   if(longest > -0x1000) longest = -0x1000;     

-  }

- else

-  {

-   left_array[0]  = v3;

-   left_array[1]  = v2;

-   left_array[2]  = v1;

-   left_section   = 2;

-   right_array[0] = v3;

-   right_array[1] = v1;

-   right_section  = 1;

-

-   if(RightSection_G() <= 0) return FALSE;

-   if(LeftSection_G() <= 0)

-    {    

-     left_section--;

-     if(LeftSection_G() <= 0) return FALSE;

-    }

-   if(longest < 0x1000) longest = 0x1000;     

-  }

-

- Ymin=v1->y;

- Ymax=min(v3->y-1,drawH);    

-

- delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);

- delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);

- delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);

-

- return TRUE;

-}

-

-__inline int RightSection_FT(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_right_x = (v2->x - v1->x) / height;

- right_x = v1->x;

-

- right_section_height = height;

- return height;

-}

-

-__inline int LeftSection_FT(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_left_x = (v2->x - v1->x) / height;

- left_x = v1->x;

- 

- delta_left_u = ((v2->u - v1->u)) / height;

- left_u = v1->u;

- delta_left_v = ((v2->v - v1->v)) / height;

- left_v = v1->v;

-

- left_section_height = height;

- return height;  

-}

-

-__inline BOOL NextRow_FT(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section <= 0) {return TRUE;}

-   if(LeftSection_FT()  <= 0) {return TRUE;}

-  }

- else

-  {

-   left_x += delta_left_x;

-   left_u += delta_left_u;

-   left_v += delta_left_v;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section<=0) {return TRUE;}

-   if(RightSection_FT() <=0) {return TRUE;}

-  }

- else

-  {

-   right_x += delta_right_x;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

-{

- soft_vertex * v1, * v2, * v3;

- int height,longest,temp;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v1->u=tx1<<16;v1->v=ty1<<16;

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v2->u=tx2<<16;v2->v=ty2<<16;

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v3->u=tx3<<16;v3->v=ty3<<16;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

-

- height = v3->y - v1->y;

- if(height == 0) {return FALSE;}

-

- temp=(((v2->y - v1->y) << 16) / height);

- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-

- if(longest == 0) {return FALSE;}

-

- if(longest < 0)

-  {

-   right_array[0] = v3;

-   right_array[1] = v2;

-   right_array[2] = v1;

-   right_section  = 2;

-   left_array[0]  = v3;

-   left_array[1]  = v1;

-   left_section   = 1;

-

-   if(LeftSection_FT() <= 0) return FALSE;

-   if(RightSection_FT() <= 0)

-    {

-     right_section--;

-     if(RightSection_FT() <= 0) return FALSE;

-    }

-   if(longest > -0x1000) longest = -0x1000;     

-  }

- else

-  {

-   left_array[0]  = v3;

-   left_array[1]  = v2;

-   left_array[2]  = v1;

-   left_section   = 2;

-   right_array[0] = v3;

-   right_array[1] = v1;

-   right_section  = 1;

-

-   if(RightSection_FT() <= 0) return FALSE;

-   if(LeftSection_FT() <= 0)

-    {    

-     left_section--;                

-     if(LeftSection_FT() <= 0) return FALSE;

-    }

-   if(longest < 0x1000) longest = 0x1000;     

-  }

-

- Ymin=v1->y;

- Ymax=min(v3->y-1,drawH);

-

- delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);

- delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);

-

-/*

-Mmm... adjust neg tex deltas... will sometimes cause slight

-texture distortions 

-

- longest>>=16;

- if(longest)

-  {

-   if(longest<0) longest=-longest;

-   if(delta_right_u<0)

-    delta_right_u-=delta_right_u/longest;

-   if(delta_right_v<0)

-    delta_right_v-=delta_right_v/longest;

-  }

-*/

-

- return TRUE;

-}

-

-__inline int RightSection_GT(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_right_x = (v2->x - v1->x) / height;

- right_x = v1->x;

-

- right_section_height = height;

- return height;

-}

-

-__inline int LeftSection_GT(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- if(height == 0) return 0;

- delta_left_x = (v2->x - v1->x) / height;

- left_x = v1->x;

-

- delta_left_u = ((v2->u - v1->u)) / height;

- left_u = v1->u;

- delta_left_v = ((v2->v - v1->v)) / height;

- left_v = v1->v;

-

- delta_left_R = ((v2->R - v1->R)) / height;

- left_R = v1->R;

- delta_left_G = ((v2->G - v1->G)) / height;

- left_G = v1->G;

- delta_left_B = ((v2->B - v1->B)) / height;

- left_B = v1->B;

-

- left_section_height = height;

- return height;  

-}

-

-__inline BOOL NextRow_GT(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section <= 0) {return TRUE;}

-   if(LeftSection_GT()  <= 0) {return TRUE;}

-  }

- else

-  {

-   left_x += delta_left_x;

-   left_u += delta_left_u;

-   left_v += delta_left_v;

-   left_R += delta_left_R;

-   left_G += delta_left_G;

-   left_B += delta_left_B;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section<=0) {return TRUE;}

-   if(RightSection_GT() <=0) {return TRUE;}

-  }

- else

-  {

-   right_x += delta_right_x;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)

-{

- soft_vertex * v1, * v2, * v3;

- int height,longest,temp;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v1->u=tx1<<16;v1->v=ty1<<16;

- v1->R=(rgb1) & 0x00ff0000;

- v1->G=(rgb1<<8) & 0x00ff0000;

- v1->B=(rgb1<<16) & 0x00ff0000;

-

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v2->u=tx2<<16;v2->v=ty2<<16;

- v2->R=(rgb2) & 0x00ff0000;

- v2->G=(rgb2<<8) & 0x00ff0000;

- v2->B=(rgb2<<16) & 0x00ff0000;

-             

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v3->u=tx3<<16;v3->v=ty3<<16;

- v3->R=(rgb3) & 0x00ff0000;

- v3->G=(rgb3<<8) & 0x00ff0000;

- v3->B=(rgb3<<16) & 0x00ff0000;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

-

- height = v3->y - v1->y;

- if(height == 0) {return FALSE;}

-

- temp=(((v2->y - v1->y) << 16) / height);

- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-

- if(longest == 0) {return FALSE;}

-

- if(longest < 0)

-  {

-   right_array[0] = v3;

-   right_array[1] = v2;

-   right_array[2] = v1;

-   right_section  = 2;

-   left_array[0]  = v3;

-   left_array[1]  = v1;

-   left_section   = 1;

-

-   if(LeftSection_GT() <= 0) return FALSE;

-   if(RightSection_GT() <= 0)

-    {

-     right_section--;

-     if(RightSection_GT() <= 0) return FALSE;

-    }

-

-   if(longest > -0x1000) longest = -0x1000;     

-  }

- else

-  {

-   left_array[0]  = v3;

-   left_array[1]  = v2;

-   left_array[2]  = v1;

-   left_section   = 2;

-   right_array[0] = v3;

-   right_array[1] = v1;

-   right_section  = 1;

-

-   if(RightSection_GT() <= 0) return FALSE;

-   if(LeftSection_GT() <= 0)

-    {    

-     left_section--;

-     if(LeftSection_GT() <= 0) return FALSE;

-    }

-   if(longest < 0x1000) longest = 0x1000;     

-  }

-

- Ymin=v1->y;

- Ymax=min(v3->y-1,drawH);

-

- delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);

- delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);

- delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);

-

- delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);

- delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);

-

-

-/*

-Mmm... adjust neg tex deltas... will sometimes cause slight

-texture distortions 

- longest>>=16;

- if(longest)

-  {

-   if(longest<0) longest=-longest;

-   if(delta_right_u<0)

-    delta_right_u-=delta_right_u/longest;

-   if(delta_right_v<0)

-    delta_right_v-=delta_right_v/longest;

-  }

-*/

-

-

- return TRUE;

-}

-

-__inline int RightSection_F4(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- right_section_height = height;

- right_x = v1->x;

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_right_x = (v2->x - v1->x) / height;

-

- return height;

-}

-

-__inline int LeftSection_F4(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- left_section_height = height;

- left_x = v1->x;

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_left_x = (v2->x - v1->x) / height;

-

- return height;  

-}

-

-__inline BOOL NextRow_F4(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section > 0) 

-    while(LeftSection_F4()<=0) 

-     {

-      if(--left_section  <= 0) break;

-     }

-  }

- else

-  {

-   left_x += delta_left_x;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section > 0) 

-    while(RightSection_F4()<=0) 

-     {

-      if(--right_section<=0) break;

-     }

-  }

- else

-  {

-   right_x += delta_right_x;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

-{

- soft_vertex * v1, * v2, * v3, * v4;

- int height,width,longest1,longest2;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }

- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }

-

- height = v4->y - v1->y; if(height == 0) height =1;

- width  = (v4->x - v1->x)>>16;

- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);

- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);

-

- if(longest1 < 0)                                      // 2 is right

-  {

-   if(longest2 < 0)                                    // 3 is right

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v1;

-     left_section   = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1 >= 0)

-      {

-       right_array[0] = v4;                     //  1

-       right_array[1] = v3;                     //     3

-       right_array[2] = v1;                     //  4

-       right_section  = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1 >= 0)

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v2;                    //     2

-         right_array[2] = v1;                    //  4

-         right_section  = 2;    

-        }

-       else

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v3;                    //     2

-         right_array[2] = v2;                    //     3

-         right_array[3] = v1;                    //  4

-         right_section  = 3;    

-        }

-      }

-    }

-   else                                            

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v3;                         //    1

-     left_array[2]  = v1;                         //      2

-     left_section   = 2;                          //  3

-     right_array[0] = v4;                         //    4

-     right_array[1] = v2;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-  }

- else

-  {

-   if(longest2 < 0)             

-    {

-     left_array[0]  = v4;                          //    1

-     left_array[1]  = v2;                          //  2

-     left_array[2]  = v1;                          //      3

-     left_section   = 2;                           //    4

-     right_array[0] = v4;

-     right_array[1] = v3;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-   else                         

-    {

-     right_array[0] = v4;

-     right_array[1] = v1;

-     right_section  = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1<0)

-      {

-       left_array[0]  = v4;                        //    1

-       left_array[1]  = v3;                        //  3

-       left_array[2]  = v1;                        //    4

-       left_section   = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1<0)

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v2;                      //  2

-         left_array[2]  = v1;                      //    4

-         left_section   = 2;    

-        }

-       else

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v3;                      //  2

-         left_array[2]  = v2;                      //  3

-         left_array[3]  = v1;                      //     4

-         left_section   = 3;    

-        }

-      }

-    }

-  }

-

- while(LeftSection_F4()<=0) 

-  {

-   if(--left_section  <= 0) break;

-  }

-

- while(RightSection_F4()<=0) 

-  {

-   if(--right_section <= 0) break;

-  }

-

- Ymin=v1->y;

- Ymax=min(v4->y-1,drawH);

-

- return TRUE;

-}

-

-__inline int RightSection_FT4(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- right_section_height = height;

- right_x = v1->x;

- right_u = v1->u;

- right_v = v1->v;

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_right_x = (v2->x - v1->x) / height;

- delta_right_u = (v2->u - v1->u) / height;

- delta_right_v = (v2->v - v1->v) / height;

-

- return height;

-}

-

-__inline int LeftSection_FT4(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- left_section_height = height;

- left_x = v1->x;

- left_u = v1->u;

- left_v = v1->v;

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_left_x = (v2->x - v1->x) / height;

- delta_left_u = (v2->u - v1->u) / height;

- delta_left_v = (v2->v - v1->v) / height;

-

- return height;  

-}

-

-__inline BOOL NextRow_FT4(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section > 0) 

-    while(LeftSection_FT4()<=0) 

-     {

-      if(--left_section  <= 0) break;

-     }

-  }

- else

-  {

-   left_x += delta_left_x;

-   left_u += delta_left_u;

-   left_v += delta_left_v;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section > 0) 

-    while(RightSection_FT4()<=0) 

-     {

-      if(--right_section<=0) break;

-     }

-  }

- else

-  {

-   right_x += delta_right_x;

-   right_u += delta_right_u;

-   right_v += delta_right_v;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

-{

- soft_vertex * v1, * v2, * v3, * v4;

- int height,width,longest1,longest2;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v1->u=tx1<<16;v1->v=ty1<<16;

-

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v2->u=tx2<<16;v2->v=ty2<<16;

-             

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v3->u=tx3<<16;v3->v=ty3<<16;

-

- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;

- v4->u=tx4<<16;v4->v=ty4<<16;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }

- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }

-

- height = v4->y - v1->y; if(height == 0) height =1;

- width  = (v4->x - v1->x)>>16;

- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);

- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);

-

- if(longest1 < 0)                                      // 2 is right

-  {

-   if(longest2 < 0)                                    // 3 is right

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v1;

-     left_section   = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1 >= 0)

-      {

-       right_array[0] = v4;                     //  1

-       right_array[1] = v3;                     //     3

-       right_array[2] = v1;                     //  4

-       right_section  = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1 >= 0)

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v2;                    //     2

-         right_array[2] = v1;                    //  4

-         right_section  = 2;    

-        }

-       else

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v3;                    //     2

-         right_array[2] = v2;                    //     3

-         right_array[3] = v1;                    //  4

-         right_section  = 3;    

-        }

-      }

-    }

-   else                                            

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v3;                         //    1

-     left_array[2]  = v1;                         //      2

-     left_section   = 2;                          //  3

-     right_array[0] = v4;                         //    4

-     right_array[1] = v2;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-  }

- else

-  {

-   if(longest2 < 0)             

-    {

-     left_array[0]  = v4;                          //    1

-     left_array[1]  = v2;                          //  2

-     left_array[2]  = v1;                          //      3

-     left_section   = 2;                           //    4

-     right_array[0] = v4;

-     right_array[1] = v3;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-   else                         

-    {

-     right_array[0] = v4;

-     right_array[1] = v1;

-     right_section  = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1<0)

-      {

-       left_array[0]  = v4;                        //    1

-       left_array[1]  = v3;                        //  3

-       left_array[2]  = v1;                        //    4

-       left_section   = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1<0)

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v2;                      //  2

-         left_array[2]  = v1;                      //    4

-         left_section   = 2;    

-        }

-       else

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v3;                      //  2

-         left_array[2]  = v2;                      //  3

-         left_array[3]  = v1;                      //     4

-         left_section   = 3;    

-        }

-      }

-    }

-  }

-

- while(LeftSection_FT4()<=0) 

-  {

-   if(--left_section  <= 0) break;

-  }

-

- while(RightSection_FT4()<=0) 

-  {

-   if(--right_section <= 0) break;

-  }

-

- Ymin=v1->y;

- Ymax=min(v4->y-1,drawH);

-

- return TRUE;

-}

-

-__inline int RightSection_GT4(void)

-{

- soft_vertex * v1 = right_array[ right_section ];

- soft_vertex * v2 = right_array[ right_section-1 ];

-

- int height = v2->y - v1->y;

- right_section_height = height;

- right_x = v1->x;

- right_u = v1->u;

- right_v = v1->v;

- right_R = v1->R;

- right_G = v1->G;

- right_B = v1->B;

-

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_right_x = (v2->x - v1->x) / height;

- delta_right_u = (v2->u - v1->u) / height;

- delta_right_v = (v2->v - v1->v) / height;

- delta_right_R = (v2->R - v1->R) / height;

- delta_right_G = (v2->G - v1->G) / height;

- delta_right_B = (v2->B - v1->B) / height;

-

- return height;

-}

-

-__inline int LeftSection_GT4(void)

-{

- soft_vertex * v1 = left_array[ left_section ];

- soft_vertex * v2 = left_array[ left_section-1 ];

-

- int height = v2->y - v1->y;

- left_section_height = height;

- left_x = v1->x;

- left_u = v1->u;

- left_v = v1->v;

- left_R = v1->R;

- left_G = v1->G;

- left_B = v1->B;

-

- if(height == 0) 

-  {

-   return 0;

-  }

- delta_left_x = (v2->x - v1->x) / height;

- delta_left_u = (v2->u - v1->u) / height;

- delta_left_v = (v2->v - v1->v) / height;

- delta_left_R = (v2->R - v1->R) / height;

- delta_left_G = (v2->G - v1->G) / height;

- delta_left_B = (v2->B - v1->B) / height;

-

- return height;  

-}

-

-__inline BOOL NextRow_GT4(void)

-{

- if(--left_section_height<=0) 

-  {

-   if(--left_section > 0) 

-    while(LeftSection_GT4()<=0) 

-     {

-      if(--left_section  <= 0) break;

-     }

-  }

- else

-  {

-   left_x += delta_left_x;

-   left_u += delta_left_u;

-   left_v += delta_left_v;

-   left_R += delta_left_R;

-   left_G += delta_left_G;

-   left_B += delta_left_B;

-  }

-

- if(--right_section_height<=0) 

-  {

-   if(--right_section > 0) 

-    while(RightSection_GT4()<=0) 

-     {

-      if(--right_section<=0) break;

-     }

-  }

- else

-  {

-   right_x += delta_right_x;

-   right_u += delta_right_u;

-   right_v += delta_right_v;

-   right_R += delta_right_R;

-   right_G += delta_right_G;

-   right_B += delta_right_B;

-  }

- return FALSE;

-}

-

-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)

-{

- soft_vertex * v1, * v2, * v3, * v4;

- int height,width,longest1,longest2;

-

- v1 = vtx;   v1->x=x1<<16;v1->y=y1;

- v1->u=tx1<<16;v1->v=ty1<<16;

- v1->R=(rgb1) & 0x00ff0000;

- v1->G=(rgb1<<8) & 0x00ff0000;

- v1->B=(rgb1<<16) & 0x00ff0000;

-

- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;

- v2->u=tx2<<16;v2->v=ty2<<16;

- v2->R=(rgb2) & 0x00ff0000;

- v2->G=(rgb2<<8) & 0x00ff0000;

- v2->B=(rgb2<<16) & 0x00ff0000;

-             

- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;

- v3->u=tx3<<16;v3->v=ty3<<16;

- v3->R=(rgb3) & 0x00ff0000;

- v3->G=(rgb3<<8) & 0x00ff0000;

- v3->B=(rgb3<<16) & 0x00ff0000;

-

- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;

- v4->u=tx4<<16;v4->v=ty4<<16;

- v4->R=(rgb4) & 0x00ff0000;

- v4->G=(rgb4<<8) & 0x00ff0000;

- v4->B=(rgb4<<16) & 0x00ff0000;

-

- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }

- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }

- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }

- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }

- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }

- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }

-

- height = v4->y - v1->y; if(height == 0) height =1;

- width  = (v4->x - v1->x)>>16;

- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);

- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);

-

- if(longest1 < 0)                                      // 2 is right

-  {

-   if(longest2 < 0)                                    // 3 is right

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v1;

-     left_section   = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1 >= 0)

-      {

-       right_array[0] = v4;                     //  1

-       right_array[1] = v3;                     //     3

-       right_array[2] = v1;                     //  4

-       right_section  = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1 >= 0)

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v2;                    //     2

-         right_array[2] = v1;                    //  4

-         right_section  = 2;    

-        }

-       else

-        {

-         right_array[0] = v4;                    //  1

-         right_array[1] = v3;                    //     2

-         right_array[2] = v2;                    //     3

-         right_array[3] = v1;                    //  4

-         right_section  = 3;    

-        }

-      }

-    }

-   else                                            

-    {

-     left_array[0]  = v4;

-     left_array[1]  = v3;                         //    1

-     left_array[2]  = v1;                         //      2

-     left_section   = 2;                          //  3

-     right_array[0] = v4;                         //    4

-     right_array[1] = v2;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-  }

- else

-  {

-   if(longest2 < 0)             

-    {

-     left_array[0]  = v4;                          //    1

-     left_array[1]  = v2;                          //  2

-     left_array[2]  = v1;                          //      3

-     left_section   = 2;                           //    4

-     right_array[0] = v4;

-     right_array[1] = v3;

-     right_array[2] = v1;

-     right_section  = 2;

-    }

-   else                         

-    {

-     right_array[0] = v4;

-     right_array[1] = v1;

-     right_section  = 1;

-

-     height = v3->y - v1->y; if(height == 0) height=1;

-     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);

-     if(longest1<0)

-      {

-       left_array[0]  = v4;                        //    1

-       left_array[1]  = v3;                        //  3

-       left_array[2]  = v1;                        //    4

-       left_section   = 2;    

-      }

-     else

-      {

-       height = v4->y - v2->y; if(height == 0) height=1;

-       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);

-       if(longest1<0)

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v2;                      //  2

-         left_array[2]  = v1;                      //    4

-         left_section   = 2;    

-        }

-       else

-        {

-         left_array[0]  = v4;                      //    1

-         left_array[1]  = v3;                      //  2

-         left_array[2]  = v2;                      //  3

-         left_array[3]  = v1;                      //     4

-         left_section   = 3;    

-        }

-      }

-    }

-  }

-

- while(LeftSection_GT4()<=0) 

-  {

-   if(--left_section  <= 0) break;

-  }

-

- while(RightSection_GT4()<=0) 

-  {

-   if(--right_section <= 0) break;

-  }

-

- Ymin=v1->y;

- Ymax=min(v4->y-1,drawH);

-

- return TRUE;

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY FUNCS

-////////////////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3/4 FLAT SHADED

-////////////////////////////////////////////////////////////////////////

-

-__inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)

-{

- int i,j,xmin,xmax,ymin,ymax;

- unsigned short color;

- uint32_t lcolor;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_F(x1,y1,x2,y2,x3,y3)) return;

-

- ymax=Ymax;

-

- color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);

- lcolor=lSetMask|(((uint32_t)(color))<<16)|color;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_F()) return;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   color |=sSetMask;

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;

-     xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2) 

-      {

-       *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;

-      }

-     if(j==xmax) psxVuw[(i<<10)+j]=color;

-

-     if(NextRow_F()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;

-   xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;

-

-   for(j=xmin;j<xmax;j+=2) 

-    {

-     GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10)+j], lcolor);

-    }

-   if(j == xmax)

-    GetShadeTransCol(&psxVuw[(i << 10) + j],color);

-

-   if(NextRow_F()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3F(int rgb)

-{

- drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);

-}

-

-#ifdef POLYQUAD3FS

-

-void drawPoly4F_TRI(int rgb)

-{

- drawPoly3Fi(lx1,ly1,lx3,ly3,lx2,ly2,rgb);

- drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);

-}

-

-#endif

-

-// more exact:

-

-void drawPoly4F(int rgb)

-{

- int i,j,xmin,xmax,ymin,ymax;

- unsigned short color;unsigned int lcolor;

- 

- if(lx0>drawW && lx1>drawW && lx2>drawW && lx3>drawW) return;

- if(ly0>drawH && ly1>drawH && ly2>drawH && ly3>drawH) return;

- if(lx0<drawX && lx1<drawX && lx2<drawX && lx3<drawX) return;

- if(ly0<drawY && ly1<drawY && ly2<drawY && ly3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_F4(lx0,ly0,lx1,ly1,lx2,ly2,lx3,ly3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_F4()) return;

-

- color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);

- lcolor= lSetMask|(((uint32_t)(color))<<16)|color;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   color |=sSetMask;

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;

-     xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2) 

-      {

-       *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;

-      }

-     if(j==xmax) psxVuw[(i<<10)+j]=color;

-

-     if(NextRow_F4()) return;

-    }

-   return;

-  }                                                        

-

-#endif

-

- for (i = ymin; i <= ymax; i++)

-  {

-   xmin = left_x >> 16;      if(drawX > xmin) xmin = drawX;

-   xmax = (right_x >> 16) - 1; if(drawW < xmax) xmax = drawW;

-

-   for(j = xmin; j < xmax; j += 2) 

-    {

-     GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10) + j],lcolor);

-    }

-   if(j == xmax) GetShadeTransCol(&psxVuw[(i<<10) + j],color);

-

-   if(NextRow_F4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3/4 F-SHADED TEX PAL 4

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,XAdjust;

- int clutP;

- short tC1,tC2;

- 

- if (x1 > drawW && x2 > drawW && x3 > drawW) return;

- if (y1 > drawH && y2 > drawH && y3 > drawH) return;

- if (x1 < drawX && x2 < drawX && x3 < drawX) return;

- if (y1 < drawY && y2 < drawY && y3 < drawY) return;

- if (drawY >= drawH) return;

- if (drawX >= drawW) return; 

-

- if (!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax = Ymax;

-

- for (ymin = Ymin; ymin < drawY; ymin++)

-  if (NextRow_FT()) return;

-

- clutP = (clY << 10) + clX;

-

- YAdjust = ((GlobalTextAddrY) << 11) + (GlobalTextAddrX << 1);

-

- difX = delta_right_u; difX2 = difX << 1;

- difY = delta_right_v; difY2 = difY << 1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16);

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                    (XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                      (XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       XAdjust=((posX+difX)>>16);

-       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                    (XAdjust>>1)];

-       tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                    (XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,XAdjust;

- int clutP;

- short tC1,tC2;

- 

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1;

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16);

-

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         XAdjust=((posX+difX)>>16);

-

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16);

-

-       TXV=posY>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       XAdjust=((posX+difX)>>16);

-

-       TXV=(posY+difY)>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16);

-

-       TXV=posY>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,XAdjust;

- int clutP;

- short tC1,tC2;

- 

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!

-     if(xmax>xmin) xmax--;

-

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i << 10) + j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-#ifdef POLYQUAD3

-

-void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- drawPoly3TEx4(x2,y2,x3,y3,x4,y4,

-               tx2,ty2,tx3,ty3,tx4,ty4,

-               clX,clY);

- drawPoly3TEx4(x1,y1,x2,y2,x4,y4,

-               tx1,ty1,tx2,ty2,tx4,ty4,

-               clX,clY);

-}

-

-#endif

-

-// more exact:

-

-void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16);

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                       (XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                      (XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       XAdjust=((posX+difX)>>16);

-       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                     (XAdjust>>1)];

-       tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                    (XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<10)+GlobalTextAddrX;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16);

-

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         XAdjust=((posX+difX)>>16);

-

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16);

-

-       TXV=posY>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       XAdjust=((posX+difX)>>16);

-

-       TXV=(posY+difY)>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16);

-       TXV=posY>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-////////////////////////////////////////////////////////////////////////

-// POLY 3 F-SHADED TEX PAL 8

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                      ((posX+difX)>>16)];

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-

-       if(j==xmax)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                    ((posX+difX)>>16)];

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-

-     if(j==xmax)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         TXU=(posX+difX)>>16;

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-

-       if(j==xmax)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       TXU=posX>>16;

-       TXV=posY>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       TXU=(posX+difX)>>16;

-       TXV=(posY+difY)>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-

-     if(j==xmax)

-      {

-       TXU=posX>>16;

-       TXV=posY>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!

-     if(xmax>xmin) xmax--;

-

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-             psxVuw[clutP+tC1]|

-             ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-

-       if(j==xmax)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-           psxVuw[clutP+tC1]|

-           ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-

-     if(j==xmax)

-      {

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-#ifdef POLYQUAD3

-

-void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- drawPoly3TEx8(x2,y2,x3,y3,x4,y4,

-               tx2,ty2,tx3,ty3,tx4,ty4,

-               clX,clY);

-

- drawPoly3TEx8(x1,y1,x2,y2,x4,y4,

-               tx1,ty1,tx2,ty2,tx4,ty4,

-               clX,clY);

-}

-

-#endif

-

-// more exact:

-

-void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                     ((posX+difX)>>16)];

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                     ((posX+difX)>>16)];

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         TXU=(posX+difX)>>16;

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       TXU=posX>>16;

-       TXV=posY>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       TXU=(posX+difX)>>16;

-       TXV=(posY+difY)>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-       

-       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       TXU=posX>>16;

-       TXV=posY>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i, j, xmin, xmax, ymin, ymax;

- int difX, difY, difX2, difY2;

- int posX, posY, YAdjust, clutP;

- short tC1, tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX += difX2;

-         posY += difY2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                     YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16);

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-        }

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                     YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],

-            psxVuw[clutP+tC1]|

-            ((int)psxVuw[clutP+tC2])<<16);

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      {

-       tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);

-      }

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3 F-SHADED TEX 15 BIT

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-                     

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],

-             psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-       GetTextureTransColG(&psxVuw[(i<<10)+j],

-           psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY,difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-                     

- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT()) return;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-              (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                     (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-         GetTextureTransColG_S(&psxVuw[(i<<10)+j],

-             psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                    ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-      }

-     if(NextRow_FT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-            (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                   (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-       GetTextureTransColG(&psxVuw[(i<<10)+j],

-           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-    }

-   if(NextRow_FT()) 

-    {

-     return;

-    }

-  }

-}

-

-

-////////////////////////////////////////////////////////////////////////

-

-#ifdef POLYQUAD3

-

-void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

-{

- drawPoly3TD(x2,y2,x3,y3,x4,y4,

-            tx2,ty2,tx3,ty3,tx4,ty4);

- drawPoly3TD(x1,y1,x2,y2,x4,y4,

-            tx1,ty1,tx2,ty2,tx4,ty4);

-}

-

-#endif

-

-// more exact:

-

-void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        GetTextureTransColG_S(&psxVuw[(i<<10)+j],

-           psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      GetTextureTransColG(&psxVuw[(i<<10)+j],

-         psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+

-                     ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        GetTextureTransColG_S(&psxVuw[(i<<10)+j],

-           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],

-            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                           (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      GetTextureTransColG(&psxVuw[(i<<10)+j],

-         psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int difX, difY, difX2, difY2;

- int posX, posY;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_FT4()) return;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+

-                     ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-         posX+=difX2;

-         posY+=difY2;

-        }

-       if(j==xmax)

-        GetTextureTransColG_S(&psxVuw[(i<<10)+j],

-           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-      }

-     if(NextRow_FT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<xmax;j+=2)

-      {

-       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],

-            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                           (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-

-       posX+=difX2;

-       posY+=difY2;

-      }

-     if(j==xmax)

-      GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],

-         psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);

-    }

-   if(NextRow_FT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3/4 G-SHADED

-////////////////////////////////////////////////////////////////////////

- 

-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_G(x1,y1,x2,y2,x3,y3,rgb1,rgb2,rgb3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_G()) return;

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && iDither!=2)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2) 

-        {

-         *((uint32_t *)&psxVuw[(i<<10)+j])=

-            ((((cR1+difR) <<7)&0x7c000000)|(((cG1+difG) << 2)&0x03e00000)|(((cB1+difB)>>3)&0x001f0000)|

-             (((cR1) >> 9)&0x7c00)|(((cG1) >> 14)&0x03e0)|(((cB1) >> 19)&0x001f))|lSetMask;

-   

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        psxVuw[(i<<10)+j]=(((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f))|sSetMask;

-      }

-     if(NextRow_G()) return;

-    }

-   return;

-  }

-

-#endif

-

- if(iDither==2)

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++) 

-      {

-       GetShadeTransCol_Dither(&psxVuw[(i<<10)+j],(cB1>>16),(cG1>>16),(cR1>>16));

-

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_G()) return;

-  }

- else

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++) 

-      {

-       GetShadeTransCol(&psxVuw[(i<<10)+j],((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f));

-

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_G()) return;

-  }

-

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3G(int rgb1, int rgb2, int rgb3)

-{

- drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,rgb1,rgb2,rgb3);

-}

-

-// draw two g-shaded tris for right psx shading emulation

-

-void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4)

-{

- drawPoly3Gi(lx1,ly1,lx3,ly3,lx2,ly2,

-             rgb2,rgb4,rgb3);

- drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,

-             rgb1,rgb2,rgb3);

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3/4 G-SHADED TEX PAL4

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=((left_x) >> 16);

-     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2) 

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16);

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                      (XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-               psxVuw[clutP+tC1]|

-               ((int)psxVuw[clutP+tC2])<<16,

-               (cB1>>16)|((cB1+difB)&0xff0000),

-               (cG1>>16)|((cG1+difG)&0xff0000),

-               (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-              psxVuw[clutP+tC1],

-              (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++) 

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=((left_x) >> 16);

-     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2) 

-        {

-         XAdjust=(posX>>16);

-

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

- 

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         XAdjust=((posX+difX)>>16);

-

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-               psxVuw[clutP+tC1]|

-               ((int)psxVuw[clutP+tC2])<<16,

-               (cB1>>16)|((cB1+difB)&0xff0000),

-               (cG1>>16)|((cG1+difG)&0xff0000),

-               (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-

-         TXV=posY>>16;

-         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-              psxVuw[clutP+tC1],

-              (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++) 

-      {

-       XAdjust=(posX>>16);

-

-       TXV=posY>>16;

-       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;

-

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)

-{

- int i, j, xmin, xmax, ymin, ymax;

- int cR1, cG1, cB1;

- int difR, difB, difG, difR2, difB2, difG2;

- int difX, difY,difX2, difY2;

- int posX, posY, YAdjust, clutP, XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

-

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=((left_x) >> 16);

-     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2) 

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16)%TWin.Position.x1;

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16)%TWin.Position.x1;

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                       YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-             psxVuw[clutP+tC1],

-             (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++) 

-      {

-       XAdjust=(posX>>16)%TWin.Position.x1;

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+(XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-// note: the psx is doing g-shaded quads as two g-shaded tris,

-// like the following func... sadly texturing is not 100%

-// correct that way, so small texture distortions can 

-// happen... 

-

-void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                    short clX, short clY,

-                    int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx4_IL(x2,y2,x3,y3,x4,y4,

-                   tx2,ty2,tx3,ty3,tx4,ty4,

-                   clX,clY,

-                   col2,col4,col3);

- drawPoly3TGEx4_IL(x1,y1,x2,y2,x4,y4,

-                   tx1,ty1,tx2,ty2,tx4,ty4,

-                   clX,clY,

-                   col1,col2,col3);

-}

-

-#ifdef POLYQUAD3GT

-

-void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                    short clX, short clY,

-                    int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx4(x2,y2,x3,y3,x4,y4,

-                tx2,ty2,tx3,ty3,tx4,ty4,

-                clX,clY,

-                col2,col4,col3);

- drawPoly3TGEx4(x1,y1,x2,y2,x4,y4,

-                tx1,ty1,tx2,ty2,tx4,ty4,

-                clX,clY,

-                col1,col2,col3);

-}

-

-#endif

-               

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                    short clX, short clY,

-                    int col1, int col2, int col4, int col3)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP,XAdjust;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-       difR=(right_R-cR1)/num;

-       difG=(right_G-cG1)/num;

-       difB=(right_B-cB1)/num;

-       difR2=difR<<1;

-       difG2=difG<<1;

-       difB2=difB<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-         XAdjust=((posX+difX)>>16);

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                       (XAdjust>>1)];

-         tC2=(tC2>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         XAdjust=(posX>>16);

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                      (XAdjust>>1)];

-         tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-             psxVuw[clutP+tC1],

-             (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-     difR=(right_R-cR1)/num;

-     difG=(right_G-cG1)/num;

-     difB=(right_B-cB1)/num;

-     difR2=difR<<1;

-     difG2=difG<<1;

-     difB2=difB<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       XAdjust=(posX>>16);

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+

-                    (XAdjust>>1)];

-       tC1=(tC1>>((XAdjust&1)<<2))&0xf;

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-           psxVuw[clutP+tC1],

-           (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-           psxVuw[clutP+tC1],

-           (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                    short clX, short clY,

-                    int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx4_TW(x2,y2,x3,y3,x4,y4,

-                   tx2,ty2,tx3,ty3,tx4,ty4,

-                   clX,clY,

-                   col2,col4,col3);

-

- drawPoly3TGEx4_TW(x1,y1,x2,y2,x4,y4,

-                   tx1,ty1,tx2,ty2,tx4,ty4,

-                   clX,clY,

-                   col1,col2,col3);

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3/4 G-SHADED TEX PAL8

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                      (((posX+difX)>>16))];

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-              psxVuw[clutP+tC1],

-              (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         TXU=(posX+difX)>>16;

-         TXV=(posY+difY)>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         TXU=posX>>16;

-         TXV=posY>>16;

-         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-              psxVuw[clutP+tC1],

-              (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       TXU=posX>>16;

-       TXV=posY>>16;

-       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;

-

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];

-                      

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                      YAdjust+((posX>>16)%TWin.Position.x1)];

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-              psxVuw[clutP+tC1],

-              (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+

-                    YAdjust+((posX>>16)%TWin.Position.x1)];

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-            psxVuw[clutP+tC1],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-// note: two g-shaded tris: small texture distortions can happen

-

-void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                           short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                           short clX, short clY,

-                           int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx8_IL(x2,y2,x3,y3,x4,y4,

-                   tx2,ty2,tx3,ty3,tx4,ty4,

-                   clX,clY,

-                   col2,col4,col3);

- drawPoly3TGEx8_IL(x1,y1,x2,y2,x4,y4,

-                   tx1,ty1,tx2,ty2,tx4,ty4,

-                   clX,clY,

-                   col1,col2,col3);

-}

-

-#ifdef POLYQUAD3GT

-                      

-void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                   short clX, short clY,

-                   int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx8(x2,y2,x3,y3,x4,y4,

-                tx2,ty2,tx3,ty3,tx4,ty4,

-                clX,clY,

-                col2,col4,col3);

- drawPoly3TGEx8(x1,y1,x2,y2,x4,y4,

-                tx1,ty1,tx2,ty2,tx4,ty4,

-                clX,clY,

-                col1,col2,col3);

-}

-

-#endif

-

-void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                   short clX, short clY,

-                   int col1, int col2, int col4, int col3)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY, difX2, difY2;

- int posX,posY,YAdjust,clutP;

- short tC1,tC2;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT4()) return;

-

- clutP=(clY<<10)+clX;

-

- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16);

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-

-       num=(xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-       difR=(right_R-cR1)/num;

-       difG=(right_G-cG1)/num;

-       difB=(right_B-cB1)/num;

-       difR2=difR<<1;

-       difG2=difG<<1;

-       difB2=difB<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+

-                     ((posX+difX)>>16)];

-

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              psxVuw[clutP+tC1]|

-              ((int)psxVuw[clutP+tC2])<<16,

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        {

-         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 

-             psxVuw[clutP+tC1],

-             (cB1>>16),(cG1>>16),(cR1>>16));

-        }

-      }

-     if(NextRow_GT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-     difR=(right_R-cR1)/num;

-     difG=(right_G-cG1)/num;

-     difB=(right_B-cB1)/num;

-     difR2=difR<<1;

-     difG2=difG<<1;

-     difB2=difB<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 

-           psxVuw[clutP+tC1],

-           (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j], 

-           psxVuw[clutP+tC1],

-           (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 

-                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 

-                   short clX, short clY,

-                   int col1, int col2, int col3, int col4)

-{

- drawPoly3TGEx8_TW(x2,y2,x3,y3,x4,y4,

-                tx2,ty2,tx3,ty3,tx4,ty4,

-                clX,clY,

-                col2,col4,col3);

- drawPoly3TGEx8_TW(x1,y1,x2,y2,x4,y4,

-                tx1,ty1,tx2,ty2,tx4,ty4,

-                clX,clY,

-                col1,col2,col3);

-}

-

-////////////////////////////////////////////////////////////////////////

-// POLY 3 G-SHADED TEX 15 BIT

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax=Ymax;

-

- for(ymin=Ymin;ymin<drawY;ymin++)

-  if(NextRow_GT()) return;

-

- difR=delta_right_R;

- difG=delta_right_G;

- difB=delta_right_B;

- difR2=difR<<1;

- difG2=difG<<1;

- difB2=difB<<1;

- difX=delta_right_u;difX2=difX<<1;

- difY=delta_right_v;difY2=difY<<1;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {       

-   for (i=ymin;i<=ymax;i++)

-    {

-     xmin=(left_x >> 16);

-     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],

-            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],

-          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j],

-          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)

-{

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY,difX2, difY2;

- int posX,posY;

-

- if (x1>drawW && x2>drawW && x3>drawW) return;

- if (y1>drawH && y2>drawH && y3>drawH) return;

- if (x1<drawX && x2<drawX && x3<drawX) return;

- if (y1<drawY && y2<drawY && y3<drawY) return;

- if (drawY >= drawH) return;

- if (drawX >= drawW) return; 

-

- if (!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;

-

- ymax = Ymax;

-

- for(ymin = Ymin; ymin < drawY; ymin++)

-  if(NextRow_GT()) return;

-

- difR = delta_right_R;

- difG = delta_right_G;

- difB = delta_right_B;

- difR2 = difR<<1;

- difG2 = difG<<1;

- difB2 = difB<<1;

- difX = delta_right_u; difX2 = difX<<1;

- difY = delta_right_v; difY2 = difY<<1;

-

-#ifdef FASTSOLID

-

- if (!bCheckMask && !DrawSemiTrans && !iDither)

-  {       

-   for (i = ymin; i <= ymax; i++)

-    {

-     xmin = (left_x >> 16);

-     xmax = (right_x >> 16) - 1; //!!!!!!!!!!!!!!!!!!!!

-     if(drawW<xmax) xmax=drawW;

-

-     if(xmax>=xmin)

-      {

-       posX=left_u;

-       posY=left_v;

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|

-              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                     (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],

-            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-      }

-     if(NextRow_GT()) 

-      {

-       return;

-      }

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!

-   if(drawW<xmax) xmax=drawW;

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       if(iDither)

-        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],

-          psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                 ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j],

-          psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+

-                 ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT()) 

-    {

-     return;

-    }

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-// note: two g-shaded tris: small texture distortions can happen

-

-#ifdef POLYQUAD3GT

-

-void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)

-{

- drawPoly3TGD(x2,y2,x3,y3,x4,y4,

-              tx2,ty2,tx3,ty3,tx4,ty4,

-              col2,col4,col3);

- drawPoly3TGD(x1,y1,x2,y2,x4,y4,

-              tx1,ty1,tx2,ty2,tx4,ty4,

-              col1,col2,col3);

-}

-

-#endif

-

-void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col4, int col3)

-{

- int num; 

- int i,j,xmin,xmax,ymin,ymax;

- int cR1,cG1,cB1;

- int difR,difB,difG,difR2,difB2,difG2;

- int difX, difY, difX2, difY2;

- int posX,posY;

-

- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;

- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;

- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;

- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;

- if(drawY>=drawH) return;

- if(drawX>=drawW) return; 

-

- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;

-

- ymax = Ymax;

-

- for (ymin = Ymin; ymin < drawY; ymin++)

-  if (NextRow_GT4()) return;

-

-#ifdef FASTSOLID

-

- if(!bCheckMask && !DrawSemiTrans && !iDither)

-  {

-   for (i = ymin; i <= ymax; i++)

-    {

-     xmin = (left_x >> 16);

-     xmax = (right_x >> 16);

-

-     if(xmax >= xmin)

-      {

-       posX = left_u;

-       posY = left_v;

-

-       num = (xmax-xmin);

-       if(num==0) num=1;

-       difX=(right_u-posX)/num;

-       difY=(right_v-posY)/num;

-       difX2=difX<<1;

-       difY2=difY<<1;

-

-       cR1=left_R;

-       cG1=left_G;

-       cB1=left_B;

-       difR=(right_R-cR1)/num;

-       difG=(right_G-cG1)/num;

-       difB=(right_B-cB1)/num;

-       difR2=difR<<1;

-       difG2=difG<<1;

-       difB2=difB<<1;

-

-       if(xmin<drawX)

-        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-       xmax--;if(drawW<xmax) xmax=drawW;

-

-       for(j=xmin;j<xmax;j+=2)

-        {

-         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],

-              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|

-              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],

-              (cB1>>16)|((cB1+difB)&0xff0000),

-              (cG1>>16)|((cG1+difG)&0xff0000),

-              (cR1>>16)|((cR1+difR)&0xff0000));

-         posX+=difX2;

-         posY+=difY2;

-         cR1+=difR2;

-         cG1+=difG2;

-         cB1+=difB2;

-        }

-       if(j==xmax)

-        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],

-            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-            (cB1>>16),(cG1>>16),(cR1>>16));

-      }

-     if(NextRow_GT4()) return;

-    }

-   return;

-  }

-

-#endif

-

- for (i=ymin;i<=ymax;i++)

-  {

-   xmin=(left_x >> 16);

-   xmax=(right_x >> 16);

-

-   if(xmax>=xmin)

-    {

-     posX=left_u;

-     posY=left_v;

-

-     num=(xmax-xmin);

-     if(num==0) num=1;

-     difX=(right_u-posX)/num;

-     difY=(right_v-posY)/num;

-     difX2=difX<<1;

-     difY2=difY<<1;

-

-     cR1=left_R;

-     cG1=left_G;

-     cB1=left_B;

-     difR=(right_R-cR1)/num;

-     difG=(right_G-cG1)/num;

-     difB=(right_B-cB1)/num;

-     difR2=difR<<1;

-     difG2=difG<<1;

-     difB2=difB<<1;

-

-     if(xmin<drawX)

-      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}

-     xmax--;if(drawW<xmax) xmax=drawW;

-

-     for(j=xmin;j<=xmax;j++)

-      {

-       if(iDither)

-        GetTextureTransColGX(&psxVuw[(i<<10)+j],

-          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       else

-        GetTextureTransColGX(&psxVuw[(i<<10)+j],

-          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],

-          (cB1>>16),(cG1>>16),(cR1>>16));

-       posX+=difX;

-       posY+=difY;

-       cR1+=difR;

-       cG1+=difG;

-       cB1+=difB;

-      }

-    }

-   if(NextRow_GT4()) return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)

-{

- drawPoly3TGD_TW(x2,y2,x3,y3,x4,y4,

-              tx2,ty2,tx3,ty3,tx4,ty4,

-              col2,col4,col3);

- drawPoly3TGD_TW(x1,y1,x2,y2,x4,y4,

-              tx1,ty1,tx2,ty2,tx4,ty4,

-              col1,col2,col3);

-}

-

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////

-

-

-/*

-// no real rect test, but it does its job the way I need it

-__inline BOOL IsNoRect(void)

-{

- if(lx0==lx1 && lx2==lx3) return FALSE;

- if(lx0==lx2 && lx1==lx3) return FALSE;

- if(lx0==lx3 && lx1==lx2) return FALSE;

- return TRUE;                      

-}

-*/

-

-// real rect test

-__inline BOOL IsNoRect(void)

-{

- //if(!(dwActFixes&0x200)) return FALSE;

-

- if(ly0==ly1)

-  {

-   if(lx1==lx3 && ly3==ly2 && lx2==lx0) return FALSE;

-   if(lx1==lx2 && ly2==ly3 && lx3==lx0) return FALSE;

-   return TRUE;

-  }

- 

- if(ly0==ly2)

-  {

-   if(lx2==lx3 && ly3==ly1 && lx1==lx0) return FALSE;

-   if(lx2==lx1 && ly1==ly3 && lx3==lx0) return FALSE;

-   return TRUE;

-  }

- 

- if(ly0==ly3)

-  {

-   if(lx3==lx2 && ly2==ly1 && lx1==lx0) return FALSE;

-   if(lx3==lx1 && ly1==ly2 && lx2==lx0) return FALSE;

-   return TRUE;

-  }

- return TRUE;

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3FT(unsigned char *baseAddr)

-{

- uint32_t *gpuData = ((uint32_t *) baseAddr);

-

- if(GlobalTextIL && GlobalTextTP<2)

-  {

-   if(GlobalTextTP==0)

-    drawPoly3TEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-   else

-    drawPoly3TEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-   return;

-  }

-

- if(!bUsingTWin)// && !(dwActFixes&0x100))

-  {

-   switch(GlobalTextTP)   // depending on texture mode

-    {

-     case 0:

-      drawPoly3TEx4(lx0,ly0,lx1,ly1,lx2,ly2,

-                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                    ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-      return;

-     case 1:

-      drawPoly3TEx8(lx0,ly0,lx1,ly1,lx2,ly2,

-                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                    ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-      return;

-     case 2:

-      drawPoly3TD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));

-      return;

-    }

-   return;

-  }

-

- switch(GlobalTextTP)   // depending on texture mode

-  {

-   case 0:

-    drawPoly3TEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 1:

-    drawPoly3TEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 2:

-    drawPoly3TD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));

-    return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4FT(unsigned char *baseAddr)

-{

- uint32_t *gpuData = ((uint32_t *) baseAddr);

-

- if(GlobalTextIL && GlobalTextTP<2)

-  {

-   if(GlobalTextTP==0)

-    drawPoly4TEx4_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-   else

-    drawPoly4TEx8_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                  (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-   return;

-  }

-

- if(!bUsingTWin)

-  {

-#ifdef POLYQUAD3GT

-   if(IsNoRect())

-    {

-     switch (GlobalTextTP)

-      {

-       case 0:

-        drawPoly4TEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-        return;

-       case 1:

-        drawPoly4TEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-        return;

-       case 2:

-        drawPoly4TD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));

-        return;

-      }

-     return;

-    }

-#endif

-          

-   switch (GlobalTextTP)

-    {

-     case 0: // grandia investigations needed

-      drawPoly4TEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-      return;

-     case 1:

-      drawPoly4TEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                  (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-      return;

-     case 2:

-      drawPoly4TD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));

-      return;

-    }

-   return;

-  }

-

- switch (GlobalTextTP)

-  {

-   case 0:

-    drawPoly4TEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 1:

-    drawPoly4TEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 2:

-    drawPoly4TD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));

-    return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly3GT(unsigned char * baseAddr)

-{

- uint32_t *gpuData = ((uint32_t *) baseAddr);

-

- if(GlobalTextIL && GlobalTextTP<2)

-  {

-   if(GlobalTextTP==0)

-    drawPoly3TGEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6]);

-   else

-    drawPoly3TGEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6]);

-   return;

-  }

-

- if(!bUsingTWin)

-  {

-   switch (GlobalTextTP)

-    {

-     case 0:

-      drawPoly3TGEx4(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                     gpuData[0],gpuData[3],gpuData[6]);

-      return;

-     case 1:

-      drawPoly3TGEx8(lx0,ly0,lx1,ly1,lx2,ly2,

-                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                     gpuData[0],gpuData[3],gpuData[6]);

-      return;

-     case 2:

-      drawPoly3TGD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);

-      return;

-    }

-   return;

-  }

-

- switch(GlobalTextTP)

-  {

-   case 0:

-    drawPoly3TGEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6]);

-    return;

-   case 1:

-    drawPoly3TGEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 

-                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6]);

-    return;

-   case 2:

-    drawPoly3TGD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);

-    return;

-  }

-}              

-

-////////////////////////////////////////////////////////////////////////

-

-void drawPoly4GT(unsigned char *baseAddr)

-{

- uint32_t *gpuData = ((uint32_t *) baseAddr);

-

- if(GlobalTextIL && GlobalTextTP<2)

-  {

-   if(GlobalTextTP==0)

-    drawPoly4TGEx4_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                          (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                          ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                          gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-   else

-    drawPoly4TGEx8_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                          (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                          ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                          gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-   return;

-  }

-

- if(!bUsingTWin)

-  {

-#ifdef POLYQUAD3GT

-   if(IsNoRect())

-    {

-     switch (GlobalTextTP)

-      {

-       case 0:

-        drawPoly4TGEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                       gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-

-        return;

-       case 1:

-        drawPoly4TGEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-        return;

-       case 2:

-        drawPoly4TGD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-        return;

-      }

-     return;

-    }

-#endif

-

-   switch (GlobalTextTP)

-    {

-     case 0:

-      drawPoly4TGEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                    ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                     gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-

-      return;

-     case 1:

-      drawPoly4TGEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                    ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                    gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-      return;

-     case 2:

-      drawPoly4TGD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-      return;

-    }

-   return;

-  }

-             

- switch (GlobalTextTP)

-  {

-   case 0:

-    drawPoly4TGEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-    return;

-   case 1:

-    drawPoly4TGEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,

-                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),

-                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),

-                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-    return;

-   case 2:

-    drawPoly4TGD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);

-    return;

-  }

-}

-                

-////////////////////////////////////////////////////////////////////////

-// SPRITE FUNCS

-////////////////////////////////////////////////////////////////////////

-

-void DrawSoftwareSpriteTWin(unsigned char * baseAddr, int w, int h)

-{ 

- uint32_t *gpuData = (uint32_t *)baseAddr;

- short sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3;

- short tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3;

-

- sx0=lx0;

- sy0=ly0;

-

- sx0=sx3=sx0+PSXDisplay.DrawOffset.x;

- sx1=sx2=sx0+w;

- sy0=sy1=sy0+PSXDisplay.DrawOffset.y;

- sy2=sy3=sy0+h;

- 

- tx0=tx3=gpuData[2]&0xff;

- tx1=tx2=tx0+w;

- ty0=ty1=(gpuData[2]>>8)&0xff;

- ty2=ty3=ty0+h;

-

- switch (GlobalTextTP)

-  {

-   case 0:

-    drawPoly4TEx4_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,

-                     tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 

-                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 1:

-    drawPoly4TEx8_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,

-                       tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 

-                       ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));

-    return;

-   case 2:

-    drawPoly4TD_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,

-                     tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3);

-    return;

-  }

-}                                                   

-

-////////////////////////////////////////////////////////////////////////

-

-void DrawSoftwareSpriteMirror(unsigned char * baseAddr, int w, int h)

-{

- int sprtY,sprtX,sprtW,sprtH,lXDir,lYDir;

- int clutY0,clutX0,clutP,textX0,textY0,sprtYa,sprCY,sprCX,sprA;

- short tC;

- uint32_t *gpuData = (uint32_t *)baseAddr;

- sprtY = ly0;

- sprtX = lx0;

- sprtH = h;

- sprtW = w;

- clutY0 = (gpuData[2]>>22) & iGPUHeightMask;

- clutX0 = (gpuData[2]>>12) & 0x3f0;

- clutP  = (clutY0<<11) + (clutX0<<1);

- textY0 = ((gpuData[2]>>8) & 0x000000ff) + GlobalTextAddrY;

- textX0 = (gpuData[2] & 0x000000ff);

-

- sprtX+=PSXDisplay.DrawOffset.x;

- sprtY+=PSXDisplay.DrawOffset.y;

-

-// while (sprtX>1023)             sprtX-=1024;

-// while (sprtY>MAXYLINESMIN1)    sprtY-=MAXYLINES;

-

- if(sprtX>drawW)

-  {

-//   if((sprtX+sprtW)>1023) sprtX-=1024;

-//   else return;

-   return;

-  }

-

- if(sprtY>drawH)

-  {

-//   if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;

-//   else return;

-   return;

-  }

-

- if(sprtY<drawY)

-  {

-   if((sprtY+sprtH)<drawY) return;

-   sprtH-=(drawY-sprtY);

-   textY0+=(drawY-sprtY);

-   sprtY=drawY;

-  }

-

- if(sprtX<drawX)

-  {

-   if((sprtX+sprtW)<drawX) return;

-   sprtW-=(drawX-sprtX);

-   textX0+=(drawX-sprtX);

-   sprtX=drawX;

-  }

-

- if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;

- if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;

-

- if(usMirror&0x1000) lXDir=-1; else lXDir=1;

- if(usMirror&0x2000) lYDir=-1; else lYDir=1;

-

- switch (GlobalTextTP)

-  {

-   case 0: // texture is 4-bit

-  

-    sprtW=sprtW/2;

-    textX0=(GlobalTextAddrX<<1)+(textX0>>1);

-    sprtYa=(sprtY<<10);

-    clutP=(clutY0<<10)+clutX0;

-    for (sprCY=0;sprCY<sprtH;sprCY++)

-     for (sprCX=0;sprCX<sprtW;sprCX++)

-      {

-       tC= psxVub[((textY0+(sprCY*lYDir))<<11) + textX0 +(sprCX*lXDir)];

-       sprA=sprtYa+(sprCY<<10)+sprtX + (sprCX<<1);

-       GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+((tC>>4)&0xf)]);

-       GetTextureTransColG_SPR(&psxVuw[sprA+1],psxVuw[clutP+(tC&0xf)]);

-      }

-    return;

-

-   case 1: 

-

-    clutP>>=1;

-    for(sprCY=0;sprCY<sprtH;sprCY++)

-     for(sprCX=0;sprCX<sprtW;sprCX++)

-      { 

-       tC = psxVub[((textY0+(sprCY*lYDir))<<11)+(GlobalTextAddrX<<1) + textX0 + (sprCX*lXDir)] & 0xff;

-       GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX + sprCX],psxVuw[clutP+tC]);

-      }

-     return;

-

-

-   case 2:

-

-    for (sprCY=0;sprCY<sprtH;sprCY++)

-     for (sprCX=0;sprCX<sprtW;sprCX++)

-      { 

-       GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX+sprCX],

-           psxVuw[((textY0+(sprCY*lYDir))<<10)+GlobalTextAddrX + textX0 +(sprCX*lXDir)]);

-      }

-     return;

-  }

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int tx,int ty)

-{

- int sprtY,sprtX,sprtW,sprtH,tdx,tdy;

- uint32_t *gpuData = (uint32_t *)baseAddr;

-

- sprtY = ly0;

- sprtX = lx0;

- sprtH = h;

- sprtW = w;

-

- sprtX+=PSXDisplay.DrawOffset.x;

- sprtY+=PSXDisplay.DrawOffset.y;

-

- if(sprtX>drawW) return;

- if(sprtY>drawH) return;

-

- tdx=tx+sprtW;

- tdy=ty+sprtH;

-

- sprtW+=sprtX;

- sprtH+=sprtY;

-

- // Pete is too lazy to make a faster version ;)

-

- if(GlobalTextTP==0)

-  drawPoly4TEx4_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,

-                   tx,ty,      tx,tdy,     tdx,tdy,    tdx,ty,     

-                   (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));

-

-

- else

-  drawPoly4TEx8_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,

-                   tx,ty,      tx,tdy,     tdx,tdy,    tdx,ty,     

-                   (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));

-}

-

-////////////////////////////////////////////////////////////////////////

-

-void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty)

-{

- int sprtY, sprtX, sprtW, sprtH;

- int clutY0, clutX0, clutP, textX0, textY0, sprtYa, sprCY, sprCX, sprA;

- short tC, tC2;

- uint32_t *gpuData = (uint32_t *)baseAddr;

- unsigned char *pV;

- BOOL bWT,bWS;

-

- if(GlobalTextIL && GlobalTextTP<2)

-  {DrawSoftwareSprite_IL(baseAddr,w,h,tx,ty);return;}

-

- sprtY = ly0;

- sprtX = lx0;

- sprtH = h;

- sprtW = w;

- clutY0 = (gpuData[2]>>22) & iGPUHeightMask;

- clutX0 = (gpuData[2]>>12) & 0x3f0;

-

- clutP  = (clutY0<<11) + (clutX0<<1);

-

- textY0 =ty+ GlobalTextAddrY;

- textX0 =tx;

-

- sprtX+=PSXDisplay.DrawOffset.x;

- sprtY+=PSXDisplay.DrawOffset.y;

-

- //while (sprtX>1023)             sprtX-=1024;

- //while (sprtY>MAXYLINESMIN1)    sprtY-=MAXYLINES;

-

- if(sprtX>drawW)

-  {

-//   if((sprtX+sprtW)>1023) sprtX-=1024;

-//   else return;

-   return;

-  }

-

- if(sprtY>drawH)

-  {

-//   if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;

-//   else return;

-   return;

-  }

-

- if(sprtY<drawY)

-  {

-   if((sprtY+sprtH)<drawY) return;

-   sprtH-=(drawY-sprtY);

-   textY0+=(drawY-sprtY);

-   sprtY=drawY;

-  }

-

- if(sprtX<drawX)

-  {

-   if((sprtX+sprtW)<drawX) return;

-

-   sprtW-=(drawX-sprtX);

-   textX0+=(drawX-sprtX);

-   sprtX=drawX;

-  }

-

- if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;

- if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;

-

-

- bWT=FALSE;

- bWS=FALSE;

-

- switch (GlobalTextTP)

-  {

-   case 0:

-

-    if(textX0&1) {bWS=TRUE;sprtW--;}

-    if(sprtW&1)  bWT=TRUE;

-    

-    sprtW=sprtW>>1;

-    textX0=(GlobalTextAddrX<<1)+(textX0>>1)+(textY0<<11);

-    sprtYa=(sprtY<<10)+sprtX;

-    clutP=(clutY0<<10)+clutX0;

-

-#ifdef FASTSOLID

- 

-    if(!bCheckMask && !DrawSemiTrans)

-     {

-      for (sprCY=0;sprCY<sprtH;sprCY++)

-       {

-        sprA=sprtYa+(sprCY<<10);

-        pV=&psxVub[(sprCY<<11)+textX0];

-

-        if(bWS)

-         {

-          tC=*pV++;

-          GetTextureTransColG_S(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);

-         }

-

-        for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)

-         { 

-          tC=*pV++;

-

-          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],

-              (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|

-              psxVuw[clutP+(tC&0x0f)]);

-         }

-

-        if(bWT)

-         {

-          tC=*pV;

-          GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);

-         }

-       }

-      return;

-     }

-

-#endif

-

-    for (sprCY=0;sprCY<sprtH;sprCY++)

-     {

-      sprA=sprtYa+(sprCY<<10);

-      pV=&psxVub[(sprCY<<11)+textX0];

-

-      if(bWS)

-       {

-        tC=*pV++;

-        GetTextureTransColG_SPR(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);

-       }

-

-      for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)

-       { 

-        tC=*pV++;

-

-        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],

-            (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|

-            psxVuw[clutP+(tC&0x0f)]);

-       }

-

-      if(bWT)

-       {

-        tC=*pV;

-        GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);

-       }

-     }

-    return;

-

-   case 1:

-    clutP>>=1;sprtW--;

-    textX0+=(GlobalTextAddrX<<1) + (textY0<<11);

-

-#ifdef FASTSOLID

-

-    if(!bCheckMask && !DrawSemiTrans)

-     {

-      for(sprCY=0;sprCY<sprtH;sprCY++)

-       {

-        sprA=((sprtY+sprCY)<<10)+sprtX;

-        pV=&psxVub[(sprCY<<11)+textX0];

-        for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)

-         { 

-          tC = *pV++;tC2 = *pV++;

-          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],

-              (((int)psxVuw[clutP+tC2])<<16)|

-              psxVuw[clutP+tC]);

-         }

-        if(sprCX==sprtW)

-         GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(*pV)]);

-       }

-      return;

-     }

-

-#endif

-

-    for(sprCY=0;sprCY<sprtH;sprCY++)

-     {

-      sprA=((sprtY+sprCY)<<10)+sprtX;

-      pV=&psxVub[(sprCY<<11)+textX0];

-      for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)

-       { 

-        tC = *pV++;tC2 = *pV++;

-        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],

-            (((int)psxVuw[clutP+tC2])<<16)|

-            psxVuw[clutP+tC]);

-       }

-      if(sprCX==sprtW)

-       GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(*pV)]);

-     }

-    return;

-

-   case 2:

-

-    textX0+=(GlobalTextAddrX) + (textY0<<10);

-    sprtW--;

-

-#ifdef FASTSOLID

-

-    if(!bCheckMask && !DrawSemiTrans)

-     {

-      for (sprCY=0;sprCY<sprtH;sprCY++)

-       {

-        sprA=((sprtY+sprCY)<<10)+sprtX;

-

-        for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)

-         { 

-          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],

-              (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|

-              psxVuw[(sprCY<<10) + textX0 + sprCX]);

-         }

-        if(sprCX==sprtW)

-         GetTextureTransColG_S(&psxVuw[sprA],

-              psxVuw[(sprCY<<10) + textX0 + sprCX]);

-

-       }

-      return;

-     }

-

-#endif

-

-    for (sprCY=0;sprCY<sprtH;sprCY++)

-     {

-      sprA=((sprtY+sprCY)<<10)+sprtX;

-

-      for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)

-       { 

-        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],

-            (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|

-            psxVuw[(sprCY<<10) + textX0 + sprCX]);

-       }

-      if(sprCX==sprtW)

-       GetTextureTransColG_SPR(&psxVuw[sprA],

-            psxVuw[(sprCY<<10) + textX0 + sprCX]);

-

-     }

-    return;

-   }                

-}

- 

-///////////////////////////////////////////////////////////////////////

-

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-// LINE FUNCS

-////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////

-

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)

-{

-    int dx, dy, incrE, incrSE, d;

-		uint32_t r0, g0, b0, r1, g1, b1;

-		int dr, dg, db;

-

-		r0 = (rgb0 & 0x00ff0000);

-		g0 = (rgb0 & 0x0000ff00) << 8;

-		b0 = (rgb0 & 0x000000ff) << 16;

-		r1 = (rgb1 & 0x00ff0000);

-		g1 = (rgb1 & 0x0000ff00) << 8;

-		b1 = (rgb1 & 0x000000ff) << 16;

-

-    dx = x1 - x0;

-    dy = y1 - y0;

-

-		if (dx > 0)

-		{

-			dr = ((int)r1 - (int)r0) / dx;

-			dg = ((int)g1 - (int)g0) / dx;

-			db = ((int)b1 - (int)b0) / dx;

-		}

-		else

-		{

-			dr = ((int)r1 - (int)r0);

-			dg = ((int)g1 - (int)g0);

-			db = ((int)b1 - (int)b0);

-		}

-

-    d = 2*dy - dx;              /* Initial value of d */

-    incrE = 2*dy;               /* incr. used for move to E */

-    incrSE = 2*(dy - dx);       /* incr. used for move to SE */

-

-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    while(x0 < x1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrE;              /* Choose E */

-        }

-        else

-        {

-            d = d + incrSE;             /* Choose SE */

-            y0++;

-        }

-        x0++;

-

-				r0+=dr;

-				g0+=dg;

-				b0+=db;

-

-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)

-{

-    int dx, dy, incrS, incrSE, d;

-		uint32_t r0, g0, b0, r1, g1, b1;

-		int dr, dg, db;

-

-		r0 = (rgb0 & 0x00ff0000);

-		g0 = (rgb0 & 0x0000ff00) << 8;

-		b0 = (rgb0 & 0x000000ff) << 16;

-		r1 = (rgb1 & 0x00ff0000);

-		g1 = (rgb1 & 0x0000ff00) << 8;

-		b1 = (rgb1 & 0x000000ff) << 16;

-

-    dx = x1 - x0;

-    dy = y1 - y0;

-

-		if (dy > 0)

-		{

-			dr = ((int)r1 - (int)r0) / dy;

-			dg = ((int)g1 - (int)g0) / dy;

-			db = ((int)b1 - (int)b0) / dy;

-		}

-		else

-		{

-			dr = ((int)r1 - (int)r0);

-			dg = ((int)g1 - (int)g0);

-			db = ((int)b1 - (int)b0);

-		}

-

-    d = 2*dx - dy;              /* Initial value of d */

-    incrS = 2*dx;               /* incr. used for move to S */

-    incrSE = 2*(dx - dy);       /* incr. used for move to SE */

-

-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    while(y0 < y1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrS;              /* Choose S */

-        }

-        else

-        {

-            d = d + incrSE;             /* Choose SE */

-            x0++;

-        }

-        y0++;

-

-				r0+=dr;

-				g0+=dg;

-				b0+=db;

-

-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)

-{

-    int dx, dy, incrN, incrNE, d;

-		uint32_t r0, g0, b0, r1, g1, b1;

-		int dr, dg, db;

-

-		r0 = (rgb0 & 0x00ff0000);

-		g0 = (rgb0 & 0x0000ff00) << 8;

-		b0 = (rgb0 & 0x000000ff) << 16;

-		r1 = (rgb1 & 0x00ff0000);

-		g1 = (rgb1 & 0x0000ff00) << 8;

-		b1 = (rgb1 & 0x000000ff) << 16;

-

-    dx = x1 - x0;

-    dy = -(y1 - y0);

-

-		if (dy > 0)

-		{

-			dr = ((uint32_t)r1 - (uint32_t)r0) / dy;

-			dg = ((uint32_t)g1 - (uint32_t)g0) / dy;

-			db = ((uint32_t)b1 - (uint32_t)b0) / dy;

-		}

-		else

-		{

-			dr = ((uint32_t)r1 - (uint32_t)r0);

-			dg = ((uint32_t)g1 - (uint32_t)g0);

-			db = ((uint32_t)b1 - (uint32_t)b0);

-		}

-

-    d = 2*dx - dy;              /* Initial value of d */

-    incrN = 2*dx;               /* incr. used for move to N */

-    incrNE = 2*(dx - dy);       /* incr. used for move to NE */

-

-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    while(y0 > y1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrN;              /* Choose N */

-        }

-        else

-        {

-            d = d + incrNE;             /* Choose NE */

-            x0++;

-        }

-        y0--;

-

-				r0+=dr;

-				g0+=dg;

-				b0+=db;

-

-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)

-{

-    int dx, dy, incrE, incrNE, d;

-		uint32_t r0, g0, b0, r1, g1, b1;

-		int dr, dg, db;

-

-		r0 = (rgb0 & 0x00ff0000);

-		g0 = (rgb0 & 0x0000ff00) << 8;

-		b0 = (rgb0 & 0x000000ff) << 16;

-		r1 = (rgb1 & 0x00ff0000);

-		g1 = (rgb1 & 0x0000ff00) << 8;

-		b1 = (rgb1 & 0x000000ff) << 16;

-

-    dx = x1 - x0;

-    dy = -(y1 - y0);

-

-		if (dx > 0)

-		{

-			dr = ((int)r1 - (int)r0) / dx;

-			dg = ((int)g1 - (int)g0) / dx;

-			db = ((int)b1 - (int)b0) / dx;

-		}

-		else

-		{

-			dr = ((int)r1 - (int)r0);

-			dg = ((int)g1 - (int)g0);

-			db = ((int)b1 - (int)b0);

-		}

-

-    d = 2*dy - dx;              /* Initial value of d */

-    incrE = 2*dy;               /* incr. used for move to E */

-    incrNE = 2*(dy - dx);       /* incr. used for move to NE */

-

-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    while(x0 < x1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrE;              /* Choose E */

-        }

-        else

-        {

-            d = d + incrNE;             /* Choose NE */

-            y0--;

-        }

-        x0++;

-

-				r0+=dr;

-				g0+=dg;

-				b0+=db;

-

-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))

-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)

-{

-  int y, dy;

-	uint32_t r0, g0, b0, r1, g1, b1;

-	int dr, dg, db;

-

-	r0 = (rgb0 & 0x00ff0000);

-	g0 = (rgb0 & 0x0000ff00) << 8;

-	b0 = (rgb0 & 0x000000ff) << 16;

-	r1 = (rgb1 & 0x00ff0000);

-	g1 = (rgb1 & 0x0000ff00) << 8;

-	b1 = (rgb1 & 0x000000ff) << 16;

-

-	dy = (y1 - y0);

-

-	if (dy > 0)

-	{

-		dr = ((int)r1 - (int)r0) / dy;

-		dg = ((int)g1 - (int)g0) / dy;

-		db = ((int)b1 - (int)b0) / dy;

-	}

-	else

-	{

-		dr = ((int)r1 - (int)r0);

-		dg = ((int)g1 - (int)g0);

-		db = ((int)b1 - (int)b0);

-	}

-

-	if (y0 < drawY)

-	{

-		r0+=dr*(drawY - y0);

-		g0+=dg*(drawY - y0);

-		b0+=db*(drawY - y0);

-		y0 = drawY;

-	}

-

-	if (y1 > drawH)

-		y1 = drawH;

-

-  for (y = y0; y <= y1; y++)

-	{

-		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-		r0+=dr;

-		g0+=dg;

-		b0+=db;

-	}

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)

-{

-  int x, dx;

-	uint32_t r0, g0, b0, r1, g1, b1;

-	int dr, dg, db;

-

-	r0 = (rgb0 & 0x00ff0000);

-	g0 = (rgb0 & 0x0000ff00) << 8;

-	b0 = (rgb0 & 0x000000ff) << 16;

-	r1 = (rgb1 & 0x00ff0000);

-	g1 = (rgb1 & 0x0000ff00) << 8;

-	b1 = (rgb1 & 0x000000ff) << 16;

-

-	dx = (x1 - x0);

-

-	if (dx > 0)

-	{

-		dr = ((int)r1 - (int)r0) / dx;

-		dg = ((int)g1 - (int)g0) / dx;

-		db = ((int)b1 - (int)b0) / dx;

-	}

-	else

-	{

-		dr = ((int)r1 - (int)r0);

-		dg = ((int)g1 - (int)g0);

-		db = ((int)b1 - (int)b0);

-	}

-

-	if (x0 < drawX)

-	{

-		r0+=dr*(drawX - x0);

-		g0+=dg*(drawX - x0);

-		b0+=db*(drawX - x0);

-		x0 = drawX;

-	}

-

-	if (x1 > drawW)

-		x1 = drawW;

-

-  for (x = x0; x <= x1; x++)

-	{

-		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));

-		r0+=dr;

-		g0+=dg;

-		b0+=db;

-	}

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)

-{

-    int dx, dy, incrE, incrSE, d, x, y;

-

-    dx = x1 - x0;

-    dy = y1 - y0;

-    d = 2*dy - dx;              /* Initial value of d */

-    incrE = 2*dy;               /* incr. used for move to E */

-    incrSE = 2*(dy - dx);       /* incr. used for move to SE */

-    x = x0;

-    y = y0;

-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    while(x < x1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrE;              /* Choose E */

-            x++;

-        }

-        else

-        {

-            d = d + incrSE;             /* Choose SE */

-            x++;

-            y++;

-        }

-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)

-{

-    int dx, dy, incrS, incrSE, d, x, y;

-

-    dx = x1 - x0;

-    dy = y1 - y0;

-    d = 2*dx - dy;              /* Initial value of d */

-    incrS = 2*dx;               /* incr. used for move to S */

-    incrSE = 2*(dx - dy);       /* incr. used for move to SE */

-    x = x0;

-    y = y0;

-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    while(y < y1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrS;              /* Choose S */

-            y++;

-        }

-        else

-        {

-            d = d + incrSE;             /* Choose SE */

-            x++;

-            y++;

-        }

-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)

-{

-    int dx, dy, incrN, incrNE, d, x, y;

-

-    dx = x1 - x0;

-    dy = -(y1 - y0);

-    d = 2*dx - dy;              /* Initial value of d */

-    incrN = 2*dx;               /* incr. used for move to N */

-    incrNE = 2*(dx - dy);       /* incr. used for move to NE */

-    x = x0;

-    y = y0;

-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    while(y > y1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrN;              /* Choose N */

-            y--;

-        }

-        else

-        {

-            d = d + incrNE;             /* Choose NE */

-            x++;

-            y--;

-        }

-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)

-{

-    int dx, dy, incrE, incrNE, d, x, y;

-

-    dx = x1 - x0;

-    dy = -(y1 - y0);

-    d = 2*dy - dx;              /* Initial value of d */

-    incrE = 2*dy;               /* incr. used for move to E */

-    incrNE = 2*(dy - dx);       /* incr. used for move to NE */

-    x = x0;

-    y = y0;

-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    while(x < x1)

-    {

-        if (d <= 0)

-        {

-            d = d + incrE;              /* Choose E */

-            x++;

-        }

-        else

-        {

-            d = d + incrNE;             /* Choose NE */

-            x++;

-            y--;

-        }

-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))

-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-    }

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void VertLineFlat(int x, int y0, int y1, unsigned short colour)

-{

-	int y;

-

-	if (y0 < drawY)

-		y0 = drawY;

-

-	if (y1 > drawH)

-		y1 = drawH;

-

-  for (y = y0; y <= y1; y++)

-		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void HorzLineFlat(int y, int x0, int x1, unsigned short colour)

-{

-	int x;

-

-	if (x0 < drawX)

-		x0 = drawX;

-

-	if (x1 > drawW)

-		x1 = drawW;

-

-	for (x = x0; x <= x1; x++)

-		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);

-}

-

-///////////////////////////////////////////////////////////////////////

-

-/* Bresenham Line drawing function */

-void DrawSoftwareLineShade(int rgb0, int rgb1)

-{

-	short x0, y0, x1, y1, xt, yt;

-	int rgbt;

-	double m, dy, dx;

-

-	if(lx0>drawW && lx1>drawW) return;

-	if(ly0>drawH && ly1>drawH) return;

-	if(lx0<drawX && lx1<drawX) return;

-	if(ly0<drawY && ly1<drawY) return;

-	if(drawY>=drawH) return;

-	if(drawX>=drawW) return; 

-

-	x0 = lx0;

-	y0 = ly0;

-	x1 = lx1;

-	y1 = ly1;

-

-	dx = x1 - x0;

-	dy = y1 - y0;

-

-	if (dx == 0)

-	{

-		if (dy > 0)

-			VertLineShade(x0, y0, y1, rgb0, rgb1);

-		else

-			VertLineShade(x0, y1, y0, rgb1, rgb0);

-	}

-	else

-		if (dy == 0)

-		{

-			if (dx > 0)

-				HorzLineShade(y0, x0, x1, rgb0, rgb1);

-			else

-				HorzLineShade(y0, x1, x0, rgb1, rgb0);

-		}

-		else

-		{

-			if (dx < 0)

-			{

-				xt = x0;

-				yt = y0;

-				rgbt = rgb0;

-				x0 = x1;

-				y0 = y1;

-				rgb0 = rgb1;

-				x1 = xt;

-				y1 = yt;

-				rgb1 = rgbt;

-

-				dx = x1 - x0;

-				dy = y1 - y0;

-			}

-

-			m = dy/dx;

-

-			if (m >= 0)

-			{

-				if (m > 1)

-					Line_S_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);

-				else

-					Line_E_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);

-			}

-			else

-				if (m < -1)

-					Line_N_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);

-				else

-					Line_E_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);

-		}

-}

-

-///////////////////////////////////////////////////////////////////////

-

-void DrawSoftwareLineFlat(int rgb)

-{

-	short x0, y0, x1, y1, xt, yt;

-	double m, dy, dx;

-	unsigned short colour = 0;

- 

-	if(lx0>drawW && lx1>drawW) return;

-	if(ly0>drawH && ly1>drawH) return;

-	if(lx0<drawX && lx1<drawX) return;

-	if(ly0<drawY && ly1<drawY) return;

-	if(drawY>=drawH) return;

-	if(drawX>=drawW) return; 

-

-	colour = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);

-

-	x0 = lx0;

-	y0 = ly0;

-	x1 = lx1;

-	y1 = ly1;

-

-	dx = x1 - x0;

-	dy = y1 - y0;

-

-	if (dx == 0)

-	{

-		if (dy == 0)

-			return; // Nothing to draw

-		else if (dy > 0)

-			VertLineFlat(x0, y0, y1, colour);

-		else

-			VertLineFlat(x0, y1, y0, colour);

-	}

-	else

-		if (dy == 0)

-		{

-			if (dx > 0)

-				HorzLineFlat(y0, x0, x1, colour);

-			else

-				HorzLineFlat(y0, x1, x0, colour);

-		}

-		else

-		{

-			if (dx < 0)

-			{

-				xt = x0;

-				yt = y0;

-				x0 = x1;

-				y0 = y1;

-				x1 = xt;

-				y1 = yt;

-

-				dx = x1 - x0;

-				dy = y1 - y0;

-			}

-

-			m = dy/dx;

-

-			if (m >= 0)

-			{

-				if (m > 1)

-					Line_S_SE_Flat(x0, y0, x1, y1, colour);

-				else

-					Line_E_SE_Flat(x0, y0, x1, y1, colour);

-			}

-			else

-				if (m < -1)

-					Line_N_NE_Flat(x0, y0, x1, y1, colour);

-				else

-					Line_E_NE_Flat(x0, y0, x1, y1, colour);

-		}

-}

-

-///////////////////////////////////////////////////////////////////////

+/***************************************************************************
+                          soft.c  -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_SOFT
+
+#include "externals.h"
+#include "soft.h"
+
+int iDither = 0;
+
+////////////////////////////////////////////////////////////////////////////////////
+// "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
+////////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////////
+// defines
+////////////////////////////////////////////////////////////////////////////////////
+
+// switches for painting textured quads as 2 triangles (small glitches, but better shading!)
+// can be toggled by game fix 0x200 in version 1.17 anyway, so let the defines enabled!
+
+#define POLYQUAD3                 
+#define POLYQUAD3GT                 
+
+// fast solid loops... a bit more additional code, of course
+
+#define FASTSOLID
+
+// psx blending mode 3 with 25% incoming color (instead 50% without the define)
+
+#define HALFBRIGHTMODE3
+
+// color decode defines
+
+#define XCOL1(x)     (x & 0x1f)
+#define XCOL2(x)     (x & 0x3e0)
+#define XCOL3(x)     (x & 0x7c00)
+
+#define XCOL1D(x)     (x & 0x1f)
+#define XCOL2D(x)     ((x>>5) & 0x1f)
+#define XCOL3D(x)     ((x>>10) & 0x1f)
+
+#define X32TCOL1(x)  ((x & 0x001f001f)<<7)
+#define X32TCOL2(x)  ((x & 0x03e003e0)<<2)
+#define X32TCOL3(x)  ((x & 0x7c007c00)>>3)
+
+#define X32COL1(x)   (x & 0x001f001f)
+#define X32COL2(x)   ((x>>5) & 0x001f001f)
+#define X32COL3(x)   ((x>>10) & 0x001f001f)
+
+#define X32ACOL1(x)  (x & 0x001e001e)
+#define X32ACOL2(x)  ((x>>5) & 0x001e001e)
+#define X32ACOL3(x)  ((x>>10) & 0x001e001e)
+
+#define X32BCOL1(x)  (x & 0x001c001c)
+#define X32BCOL2(x)  ((x>>5) & 0x001c001c)
+#define X32BCOL3(x)  ((x>>10) & 0x001c001c)
+
+#define X32PSXCOL(r,g,b) ((g<<10)|(b<<5)|r)
+
+#define XPSXCOL(r,g,b) ((g&0x7c00)|(b&0x3e0)|(r&0x1f))
+
+////////////////////////////////////////////////////////////////////////////////////
+// soft globals
+////////////////////////////////////////////////////////////////////////////////////
+
+short g_m1 = 255, g_m2 = 255, g_m3 = 255;
+short DrawSemiTrans = FALSE;
+short Ymin;
+short Ymax;
+
+short          ly0, lx0, ly1, lx1, ly2, lx2, ly3, lx3;   // global psx vertex coords
+int            GlobalTextAddrX, GlobalTextAddrY, GlobalTextTP;
+int            GlobalTextREST, GlobalTextABR, GlobalTextPAGE;
+
+////////////////////////////////////////////////////////////////////////
+// POLYGON OFFSET FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void offsetPSXLine(void)
+{
+ short x0,x1,y0,y1,dx,dy;float px,py;
+
+ x0 = lx0+1+PSXDisplay.DrawOffset.x;
+ x1 = lx1+1+PSXDisplay.DrawOffset.x;
+ y0 = ly0+1+PSXDisplay.DrawOffset.y;
+ y1 = ly1+1+PSXDisplay.DrawOffset.y;
+
+ dx=x1-x0;
+ dy=y1-y0;
+
+ // tricky line width without sqrt
+
+ if(dx>=0)
+  {
+   if(dy>=0)
+    {
+     px=0.5f;
+          if(dx>dy) py=-0.5f;
+     else if(dx<dy) py= 0.5f;
+     else           py= 0.0f;
+    }
+   else
+    {
+     py=-0.5f;
+     dy=-dy;
+          if(dx>dy) px= 0.5f;
+     else if(dx<dy) px=-0.5f;
+     else           px= 0.0f;
+    }
+  }
+ else
+  {
+   if(dy>=0)
+    {
+     py=0.5f;
+     dx=-dx;
+          if(dx>dy) px=-0.5f;
+     else if(dx<dy) px= 0.5f;
+     else           px= 0.0f;
+    }
+   else
+    {
+     px=-0.5f;
+          if(dx>dy) py=-0.5f;
+     else if(dx<dy) py= 0.5f;
+     else           py= 0.0f;
+    }
+  } 
+ 
+ lx0=(short)((float)x0-px);
+ lx3=(short)((float)x0+py);
+ 
+ ly0=(short)((float)y0-py);
+ ly3=(short)((float)y0-px);
+ 
+ lx1=(short)((float)x1-py);
+ lx2=(short)((float)x1+px);
+ 
+ ly1=(short)((float)y1+px);
+ ly2=(short)((float)y1+py);
+}
+
+void offsetPSX2(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+}
+
+void offsetPSX3(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+ lx2 += PSXDisplay.DrawOffset.x;
+ ly2 += PSXDisplay.DrawOffset.y;
+}
+
+void offsetPSX4(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+ lx2 += PSXDisplay.DrawOffset.x;
+ ly2 += PSXDisplay.DrawOffset.y;
+ lx3 += PSXDisplay.DrawOffset.x;
+ ly3 += PSXDisplay.DrawOffset.y;
+}
+
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+// PER PIXEL FUNCS
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+
+
+unsigned char dithertable[16] =
+{
+    7, 0, 6, 1,
+    2, 5, 3, 4,
+    1, 6, 0, 7,
+    4, 3, 5, 2
+};
+
+static void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigned short sM)
+{
+ unsigned char coeff;
+ unsigned char rlow, glow, blow;
+ int x, y;
+                 
+ x = pdest - psxVuw;
+ y = x >> 10;
+ x -= (y << 10);
+
+ coeff = dithertable[(y&3)*4+(x&3)];
+
+ rlow = r&7; glow = g&7; blow = b&7;
+
+ r>>=3; g>>=3; b>>=3;
+
+ if ((r < 0x1F) && rlow > coeff) r++;
+ if ((g < 0x1F) && glow > coeff) g++;
+ if ((b < 0x1F) && blow > coeff) b++;
+
+ *pdest=((unsigned short)b<<10) |
+        ((unsigned short)g<<5) |
+        (unsigned short)r | sM;
+}
+
+/////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)
+{
+ int r,g,b;
+
+ if (bCheckMask && *pdest & 0x8000) return;
+
+ if (DrawSemiTrans)
+  {
+   r=((XCOL1D(*pdest))<<3);
+   b=((XCOL2D(*pdest))<<3);
+   g=((XCOL3D(*pdest))<<3);
+
+   if(GlobalTextABR==0)
+    {
+     r=(r>>1)+(m1>>1);
+     b=(b>>1)+(m2>>1);
+     g=(g>>1)+(m3>>1);
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r+=m1;
+     b+=m2;
+     g+=m3;
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r-=m1;
+     b-=m2;
+     g-=m3;
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r+=(m1>>2);
+     b+=(m2>>2);
+     g+=(m3>>2);
+#else
+     r+=(m1>>1);
+     b+=(m2>>1);
+     g+=(m3>>1);
+#endif
+    }
+  }
+ else 
+  {
+   r=m1;
+   b=m2;
+   g=m3;
+  }
+
+ if(r&0x7FFFFF00) r=0xff;
+ if(b&0x7FFFFF00) b=0xff;
+ if(g&0x7FFFFF00) g=0xff;
+
+ Dither16(pdest,r,b,g,sSetMask);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+{
+ if(bCheckMask && *pdest&0x8000) return;
+
+ if(DrawSemiTrans)
+  {
+   int r,g,b;
+ 
+   if(GlobalTextABR==0)
+    {
+     *pdest=((((*pdest)&0x7bde)>>1)+(((color)&0x7bde)>>1))|sSetMask;//0x8000;
+     return;
+/*
+     r=(XCOL1(*pdest)>>1)+((XCOL1(color))>>1);
+     b=(XCOL2(*pdest)>>1)+((XCOL2(color))>>1);
+     g=(XCOL3(*pdest)>>1)+((XCOL3(color))>>1);
+*/
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(XCOL1(*pdest))+((XCOL1(color)));
+     b=(XCOL2(*pdest))+((XCOL2(color)));
+     g=(XCOL3(*pdest))+((XCOL3(color)));
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r=(XCOL1(*pdest))-((XCOL1(color)));
+     b=(XCOL2(*pdest))-((XCOL2(color)));
+     g=(XCOL3(*pdest))-((XCOL3(color)));
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(XCOL1(*pdest))+((XCOL1(color))>>2);
+     b=(XCOL2(*pdest))+((XCOL2(color))>>2);
+     g=(XCOL3(*pdest))+((XCOL3(color))>>2);
+#else
+     r=(XCOL1(*pdest))+((XCOL1(color))>>1);
+     b=(XCOL2(*pdest))+((XCOL2(color))>>1);
+     g=(XCOL3(*pdest))+((XCOL3(color))>>1);
+#endif
+    }
+
+   if(r&0x7FFFFFE0) r=0x1f;
+   if(b&0x7FFFFC00) b=0x3e0;
+   if(g&0x7FFF8000) g=0x7c00;
+
+   *pdest=(XPSXCOL(r,g,b))|sSetMask;//0x8000;
+  }
+ else *pdest=color|sSetMask;
+}  
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
+{
+ if (DrawSemiTrans)
+  {
+   int r,g,b;
+
+   if(GlobalTextABR==0)
+    {
+     if(!bCheckMask)
+      {
+       *pdest=((((*pdest)&0x7bde7bde)>>1)+(((color)&0x7bde7bde)>>1))|lSetMask;//0x80008000;
+       return;
+      }
+     r=(X32ACOL1(*pdest)>>1)+((X32ACOL1(color))>>1);
+     b=(X32ACOL2(*pdest)>>1)+((X32ACOL2(color))>>1);
+     g=(X32ACOL3(*pdest)>>1)+((X32ACOL3(color))>>1);
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(X32COL1(*pdest))+((X32COL1(color)));
+     b=(X32COL2(*pdest))+((X32COL2(color)));
+     g=(X32COL3(*pdest))+((X32COL3(color)));
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     int sr,sb,sg,src,sbc,sgc,c;
+     src=XCOL1(color);sbc=XCOL2(color);sgc=XCOL3(color);
+     c=(*pdest)>>16;
+     sr=(XCOL1(c))-src;   if(sr&0x8000) sr=0;
+     sb=(XCOL2(c))-sbc;  if(sb&0x8000) sb=0;
+     sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
+     r=((int)sr)<<16;b=((int)sb)<<11;g=((int)sg)<<6;
+     c=LOWORD(*pdest);
+     sr=(XCOL1(c))-src;   if(sr&0x8000) sr=0;
+     sb=(XCOL2(c))-sbc;  if(sb&0x8000) sb=0;
+     sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
+     r|=sr;b|=sb>>5;g|=sg>>10;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(X32COL1(*pdest))+((X32BCOL1(color))>>2);
+     b=(X32COL2(*pdest))+((X32BCOL2(color))>>2);
+     g=(X32COL3(*pdest))+((X32BCOL3(color))>>2);
+#else
+     r=(X32COL1(*pdest))+((X32ACOL1(color))>>1);
+     b=(X32COL2(*pdest))+((X32ACOL2(color))>>1);
+     g=(X32COL3(*pdest))+((X32ACOL3(color))>>1);
+#endif
+    }
+
+   if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+   if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);
+   if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+   if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);
+   if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+   if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);
+
+   if(bCheckMask) 
+    {
+     uint32_t ma=*pdest;
+     *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
+     if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+     if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);
+     return;
+    }
+   *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
+  }
+ else
+  {
+   if(bCheckMask) 
+    {
+     uint32_t ma=*pdest;
+     *pdest=color|lSetMask;//0x80008000;
+     if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+     if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);
+     return;
+    }
+
+   *pdest=color|lSetMask;//0x80008000;
+  }
+}  
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+  {
+   if(GlobalTextABR==0)
+    {
+     unsigned short d;
+     d     =((*pdest)&0x7bde)>>1;
+     color =((color) &0x7bde)>>1;
+     r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
+
+/*
+     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
+     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
+     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
+*/
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
+#else
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
+#endif
+    }
+  }
+ else 
+  {
+   r=((XCOL1(color))* g_m1)>>7;
+   b=((XCOL2(color))* g_m2)>>7;
+   g=((XCOL3(color))* g_m3)>>7;
+  }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ l=sSetMask|(color&0x8000);
+
+ r=((XCOL1(color))* g_m1)>>7;
+ b=((XCOL2(color))* g_m2)>>7;
+ g=((XCOL3(color))* g_m3)>>7;
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+  {
+   if(GlobalTextABR==0)
+    {
+     unsigned short d;
+     d     =((*pdest)&0x7bde)>>1;
+     color =((color) &0x7bde)>>1;
+     r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
+
+/*
+     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
+     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
+     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
+*/
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
+     b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
+     g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
+#else
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
+#endif
+    }
+  }
+ else 
+  {
+   r=((XCOL1(color))* g_m1)>>7;
+   b=((XCOL2(color))* g_m2)>>7;
+   g=((XCOL3(color))* g_m3)>>7;
+  }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b,l;
+
+ if(color==0) return;
+
+ l=lSetMask|(color&0x80008000);
+
+ if(DrawSemiTrans && (color&0x80008000))
+  {
+   if(GlobalTextABR==0)
+    {                 
+     r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
+     b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
+     g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     int t;
+     r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+     t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
+     r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
+     r|=t;
+
+     b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+     t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
+     b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
+     b|=t;
+
+     g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+     t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
+     g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
+     g|=t;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
+#else
+     r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
+#endif
+    }
+
+   if(!(color&0x8000))
+    {
+     r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
+     b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
+     g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
+    }
+   if(!(color&0x80000000))
+    {
+     r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
+     b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
+     g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
+    }
+
+  }
+ else 
+  {
+   r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+   b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+   g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+  }
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);
+         
+ if(bCheckMask) 
+  {
+   uint32_t ma=*pdest;
+
+   *pdest=(X32PSXCOL(r,g,b))|l;
+   
+   if((color&0xffff)==0    ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
+   if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
+   if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+   if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);
+
+   return;                            
+  }
+ if((color&0xffff)==0    ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|l)&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|l)&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b;
+
+ if(color==0) return;
+
+ r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);
+         
+ if((color&0xffff)==0)     {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b;
+
+ if(color==0) return;
+
+ if(DrawSemiTrans && (color&0x80008000))
+  {
+   if(GlobalTextABR==0)
+    {                 
+     r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
+     b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
+     g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     int t;
+     r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+     t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
+     r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
+     r|=t;
+
+     b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+     t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
+     b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
+     b|=t;
+
+     g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+     t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
+     g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
+     g|=t;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
+#else
+     r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
+     b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
+     g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
+#endif
+    }
+
+   if(!(color&0x8000))
+    {
+     r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
+     b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
+     g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
+    }
+   if(!(color&0x80000000))
+    {
+     r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
+     b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
+     g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
+    }
+
+  }
+ else 
+  {
+   r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+   b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+   g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+  }
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);
+         
+ if(bCheckMask) 
+  {
+   uint32_t ma=*pdest;
+
+   *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+   
+   if((color&0xffff)==0    ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
+   if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
+   if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+   if(ma&0x00008000) *pdest=(ma&0xFFFF)    |(*pdest&0xFFFF0000);
+
+   return;                            
+  }
+ if((color&0xffff)==0    ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)
+{
+ int r,g,b;
+
+ if(color==0) return;
+ 
+ if(bCheckMask && *pdest&0x8000) return;
+
+ m1=(((XCOL1D(color)))*m1)>>4;
+ m2=(((XCOL2D(color)))*m2)>>4;
+ m3=(((XCOL3D(color)))*m3)>>4;
+
+ if(DrawSemiTrans && (color&0x8000))
+  {
+   r=((XCOL1D(*pdest))<<3);
+   b=((XCOL2D(*pdest))<<3);
+   g=((XCOL3D(*pdest))<<3);
+
+   if(GlobalTextABR==0)
+    {
+     r=(r>>1)+(m1>>1);
+     b=(b>>1)+(m2>>1);
+     g=(g>>1)+(m3>>1);
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r+=m1;
+     b+=m2;
+     g+=m3;
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r-=m1;
+     b-=m2;
+     g-=m3;
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r+=(m1>>2);
+     b+=(m2>>2);
+     g+=(m3>>2);
+#else
+     r+=(m1>>1);
+     b+=(m2>>1);
+     g+=(m3>>1);
+#endif
+    }
+  }
+ else 
+  {
+   r=m1;
+   b=m2;
+   g=m3;
+  }
+
+ if(r&0x7FFFFF00) r=0xff;
+ if(b&0x7FFFFF00) b=0xff;
+ if(g&0x7FFFFF00) g=0xff;
+
+ Dither16(pdest,r,b,g,sSetMask|(color&0x8000));
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+ 
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+  {
+   if(GlobalTextABR==0)
+    {
+     unsigned short d;
+     d     =((*pdest)&0x7bde)>>1;
+     color =((color) &0x7bde)>>1;
+     r=(XCOL1(d))+((((XCOL1(color)))* m1)>>7);
+     b=(XCOL2(d))+((((XCOL2(color)))* m2)>>7);
+     g=(XCOL3(d))+((((XCOL3(color)))* m3)>>7);
+/*
+     r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* m1)>>7);
+     b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* m2)>>7);
+     g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* m3)>>7);
+*/
+    }
+   else
+   if(GlobalTextABR==1)
+    {
+     r=(XCOL1(*pdest))+((((XCOL1(color)))* m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color)))* m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color)))* m3)>>7);
+    }
+   else
+   if(GlobalTextABR==2)
+    {
+     r=(XCOL1(*pdest))-((((XCOL1(color)))* m1)>>7);
+     b=(XCOL2(*pdest))-((((XCOL2(color)))* m2)>>7);
+     g=(XCOL3(*pdest))-((((XCOL3(color)))* m3)>>7);
+     if(r&0x80000000) r=0;
+     if(b&0x80000000) b=0;
+     if(g&0x80000000) g=0;
+    }
+   else
+    {
+#ifdef HALFBRIGHTMODE3
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* m3)>>7);
+#else
+     r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* m1)>>7);
+     b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* m2)>>7);
+     g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* m3)>>7);
+#endif
+    }
+  }
+ else 
+  {
+   r=((XCOL1(color))* m1)>>7;
+   b=((XCOL2(color))* m2)>>7;
+   g=((XCOL3(color))* m3)>>7;
+  }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+{
+ int r,g,b;
+
+ if(color==0) return;
+ 
+ r=((XCOL1(color))* m1)>>7;
+ b=((XCOL2(color))* m2)>>7;
+ g=((XCOL3(color))* m3)>>7;
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|sSetMask|(color&0x8000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)
+{
+ int r,g,b;
+ 
+ if(color==0) return;
+
+ r=(((X32COL1(color))* m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* m3)&0xFF80FF80)>>7;
+                
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0)     r=0x1f    |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0)     b=0x1f    |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0)     g=0x1f    |(g&0xFFFF0000);
+
+ if((color&0xffff)==0)     {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+// FILL FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void FillSoftwareAreaTrans(short x0,short y0,short x1, // FILL AREA TRANS
+                      short y1,unsigned short col)
+{
+ short j,i,dx,dy;
+
+ if(y0>y1) return;
+ if(x0>x1) return;
+
+ if(x1<drawX) return;
+ if(y1<drawY) return;
+ if(x0>drawW) return;
+ if(y0>drawH) return;
+
+ x1=min(x1,drawW+1);
+ y1=min(y1,drawH+1);
+ x0=max(x0,drawX);
+ y0=max(y0,drawY);
+    
+ if(y0>=iGPUHeight)   return;
+ if(x0>1023)          return;
+
+ if(y1>iGPUHeight) y1=iGPUHeight;
+ if(x1>1024)       x1=1024;
+
+ dx=x1-x0;dy=y1-y0;
+
+ if(dx==1 && dy==1 && x0==1020 && y0==511)             // special fix for pinball game... emu protection???
+  {
+/*
+m->v 1020 511 1 1
+writedatamem 0x00000000 1
+tile1 newcol 7fff (orgcol 0xffffff), oldvram 0
+v->m 1020 511 1 1
+readdatamem 0x00007fff 1
+m->v 1020 511 1 1
+writedatamem 0x00000000 1
+tile1 newcol 8000 (orgcol 0xffffff), oldvram 0
+v->m 1020 511 1 1
+readdatamem 0x00008000 1
+*/
+
+   static int iCheat=0;
+   col+=iCheat;
+   if(iCheat==1) iCheat=0; else iCheat=1;
+  }
+
+ if(dx&1)                                              // slow fill
+  {
+   unsigned short *DSTPtr;
+   unsigned short LineOffset;
+   DSTPtr = psxVuw + (1024*y0) + x0;
+   LineOffset = 1024 - dx;
+   for(i=0;i<dy;i++)
+    {
+     for(j=0;j<dx;j++)
+      GetShadeTransCol(DSTPtr++,col);
+     DSTPtr += LineOffset;
+    } 
+  }
+ else                                                  // fast fill
+  {
+   uint32_t *DSTPtr;
+   unsigned short LineOffset;
+   uint32_t lcol=lSetMask|(((uint32_t)(col))<<16)|col;
+   dx>>=1;
+   DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
+   LineOffset = 512 - dx;
+
+   if(!bCheckMask && !DrawSemiTrans)
+    {
+     for(i=0;i<dy;i++)
+      {
+       for(j=0;j<dx;j++) *DSTPtr++=lcol;
+       DSTPtr += LineOffset;
+      }
+    }
+   else
+    {
+     for(i=0;i<dy;i++)
+      {
+       for(j=0;j<dx;j++) 
+        GetShadeTransCol32(DSTPtr++,lcol);
+       DSTPtr += LineOffset;
+      } 
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void FillSoftwareArea(short x0,short y0,short x1,      // FILL AREA (BLK FILL)
+                      short y1,unsigned short col)     // no draw area check here!
+{
+ short j,i,dx,dy;
+
+ if(y0>y1) return;
+ if(x0>x1) return;
+    
+ if(y0>=iGPUHeight)   return;
+ if(x0>1023)          return;
+
+ if(y1>iGPUHeight) y1=iGPUHeight;
+ if(x1>1024)       x1=1024;
+
+ dx=x1-x0;dy=y1-y0;
+ if(dx&1)
+  {
+   unsigned short *DSTPtr;
+   unsigned short LineOffset;
+
+   DSTPtr = psxVuw + (1024*y0) + x0;
+   LineOffset = 1024 - dx;
+
+   for(i=0;i<dy;i++)
+    {
+     for(j=0;j<dx;j++) *DSTPtr++=col;
+     DSTPtr += LineOffset;
+    } 
+  }
+ else
+  {
+   uint32_t *DSTPtr;
+   unsigned short LineOffset;
+   uint32_t lcol=(((int)col)<<16)|col;
+   dx>>=1;
+   DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
+   LineOffset = 512 - dx;
+
+   for(i=0;i<dy;i++)
+    {
+     for(j=0;j<dx;j++) *DSTPtr++=lcol;
+     DSTPtr += LineOffset;
+    } 
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// EDGE INTERPOLATION
+////////////////////////////////////////////////////////////////////////
+
+typedef struct SOFTVTAG
+{
+ int x,y;   
+ int u,v;
+ int R,G,B;
+} soft_vertex;
+
+static soft_vertex vtx[4];
+static soft_vertex * left_array[4], * right_array[4];
+static int left_section, right_section;
+static int left_section_height, right_section_height;
+static int left_x, delta_left_x, right_x, delta_right_x;
+static int left_u, delta_left_u, left_v, delta_left_v;
+static int right_u, delta_right_u, right_v, delta_right_v;
+static int left_R, delta_left_R, right_R, delta_right_R;
+static int left_G, delta_left_G, right_G, delta_right_G;
+static int left_B, delta_left_B, right_B, delta_right_B;
+
+#ifdef _MSC_VER
+
+#pragma warning  (disable : 4035)
+
+static __inline int shl10idiv(int x, int y)
+{
+ __asm
+  {
+   mov   eax,x
+   mov   ebx,y
+   mov   edx, eax
+   shl   eax, 10
+   sar   edx, 22
+   idiv  ebx
+   // return result in eax
+  }
+}
+
+#else
+
+static __inline int shl10idiv(int x, int y)
+{
+ long long int bi=x;
+ bi<<=10;
+ return bi/y;
+}
+
+#endif
+
+static __inline int RightSection_F(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_F(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ left_section_height = height;
+ return height;  
+}
+
+static __inline BOOL NextRow_F(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section <= 0) {return TRUE;}
+   if(LeftSection_F()  <= 0) {return TRUE;}
+  }
+ else
+  {
+   left_x += delta_left_x;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section<=0) {return TRUE;}
+   if(RightSection_F() <=0) {return TRUE;}
+  }
+ else
+  {
+   right_x += delta_right_x;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+ longest = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+  {
+   right_array[0] = v3;
+   right_array[1] = v2;
+   right_array[2] = v1;
+   right_section  = 2;
+   left_array[0]  = v3;
+   left_array[1]  = v1;
+   left_section   = 1;
+
+   if(LeftSection_F() <= 0) return FALSE;
+   if(RightSection_F() <= 0)
+    {
+     right_section--;
+     if(RightSection_F() <= 0) return FALSE;
+    }
+  }
+ else
+  {
+   left_array[0]  = v3;
+   left_array[1]  = v2;
+   left_array[2]  = v1;
+   left_section   = 2;
+   right_array[0] = v3;
+   right_array[1] = v1;
+   right_section  = 1;
+
+   if(RightSection_F() <= 0) return FALSE;
+   if(LeftSection_F() <= 0)
+    {    
+     left_section--;
+     if(LeftSection_F() <= 0) return FALSE;
+    }
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_G(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_G(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ delta_left_R = ((v2->R - v1->R)) / height;
+ left_R = v1->R;
+ delta_left_G = ((v2->G - v1->G)) / height;
+ left_G = v1->G;
+ delta_left_B = ((v2->B - v1->B)) / height;
+ left_B = v1->B;
+
+ left_section_height = height;
+ return height;  
+}
+
+static __inline BOOL NextRow_G(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section <= 0) {return TRUE;}
+   if(LeftSection_G()  <= 0) {return TRUE;}
+  }
+ else
+  {
+   left_x += delta_left_x;
+   left_R += delta_left_R;
+   left_G += delta_left_G;
+   left_B += delta_left_B;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section<=0) {return TRUE;}
+   if(RightSection_G() <=0) {return TRUE;}
+  }
+ else
+  {
+   right_x += delta_right_x;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){
+ soft_vertex *v1, *v2, *v3;
+ int height, longest, temp;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+  {
+   right_array[0] = v3;
+   right_array[1] = v2;
+   right_array[2] = v1;
+   right_section  = 2;
+   left_array[0]  = v3;
+   left_array[1]  = v1;
+   left_section   = 1;
+
+   if(LeftSection_G() <= 0) return FALSE;
+   if(RightSection_G() <= 0)
+    {
+     right_section--;
+     if(RightSection_G() <= 0) return FALSE;
+    }
+   if(longest > -0x1000) longest = -0x1000;     
+  }
+ else
+  {
+   left_array[0]  = v3;
+   left_array[1]  = v2;
+   left_array[2]  = v1;
+   left_section   = 2;
+   right_array[0] = v3;
+   right_array[1] = v1;
+   right_section  = 1;
+
+   if(RightSection_G() <= 0) return FALSE;
+   if(LeftSection_G() <= 0)
+    {    
+     left_section--;
+     if(LeftSection_G() <= 0) return FALSE;
+    }
+   if(longest < 0x1000) longest = 0x1000;     
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);    
+
+ delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
+ delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
+ delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
+
+ return TRUE;
+}
+
+static __inline int RightSection_FT(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_FT(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+ 
+ delta_left_u = ((v2->u - v1->u)) / height;
+ left_u = v1->u;
+ delta_left_v = ((v2->v - v1->v)) / height;
+ left_v = v1->v;
+
+ left_section_height = height;
+ return height;  
+}
+
+static __inline BOOL NextRow_FT(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section <= 0) {return TRUE;}
+   if(LeftSection_FT()  <= 0) {return TRUE;}
+  }
+ else
+  {
+   left_x += delta_left_x;
+   left_u += delta_left_u;
+   left_v += delta_left_v;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section<=0) {return TRUE;}
+   if(RightSection_FT() <=0) {return TRUE;}
+  }
+ else
+  {
+   right_x += delta_right_x;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest,temp;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+  {
+   right_array[0] = v3;
+   right_array[1] = v2;
+   right_array[2] = v1;
+   right_section  = 2;
+   left_array[0]  = v3;
+   left_array[1]  = v1;
+   left_section   = 1;
+
+   if(LeftSection_FT() <= 0) return FALSE;
+   if(RightSection_FT() <= 0)
+    {
+     right_section--;
+     if(RightSection_FT() <= 0) return FALSE;
+    }
+   if(longest > -0x1000) longest = -0x1000;     
+  }
+ else
+  {
+   left_array[0]  = v3;
+   left_array[1]  = v2;
+   left_array[2]  = v1;
+   left_section   = 2;
+   right_array[0] = v3;
+   right_array[1] = v1;
+   right_section  = 1;
+
+   if(RightSection_FT() <= 0) return FALSE;
+   if(LeftSection_FT() <= 0)
+    {    
+     left_section--;                
+     if(LeftSection_FT() <= 0) return FALSE;
+    }
+   if(longest < 0x1000) longest = 0x1000;     
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
+ delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
+
+/*
+Mmm... adjust neg tex deltas... will sometimes cause slight
+texture distortions 
+
+ longest>>=16;
+ if(longest)
+  {
+   if(longest<0) longest=-longest;
+   if(delta_right_u<0)
+    delta_right_u-=delta_right_u/longest;
+   if(delta_right_v<0)
+    delta_right_v-=delta_right_v/longest;
+  }
+*/
+
+ return TRUE;
+}
+
+static __inline int RightSection_GT(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_GT(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ delta_left_u = ((v2->u - v1->u)) / height;
+ left_u = v1->u;
+ delta_left_v = ((v2->v - v1->v)) / height;
+ left_v = v1->v;
+
+ delta_left_R = ((v2->R - v1->R)) / height;
+ left_R = v1->R;
+ delta_left_G = ((v2->G - v1->G)) / height;
+ left_G = v1->G;
+ delta_left_B = ((v2->B - v1->B)) / height;
+ left_B = v1->B;
+
+ left_section_height = height;
+ return height;  
+}
+
+static __inline BOOL NextRow_GT(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section <= 0) {return TRUE;}
+   if(LeftSection_GT()  <= 0) {return TRUE;}
+  }
+ else
+  {
+   left_x += delta_left_x;
+   left_u += delta_left_u;
+   left_v += delta_left_v;
+   left_R += delta_left_R;
+   left_G += delta_left_G;
+   left_B += delta_left_B;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section<=0) {return TRUE;}
+   if(RightSection_GT() <=0) {return TRUE;}
+  }
+ else
+  {
+   right_x += delta_right_x;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest,temp;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+             
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+  {
+   right_array[0] = v3;
+   right_array[1] = v2;
+   right_array[2] = v1;
+   right_section  = 2;
+   left_array[0]  = v3;
+   left_array[1]  = v1;
+   left_section   = 1;
+
+   if(LeftSection_GT() <= 0) return FALSE;
+   if(RightSection_GT() <= 0)
+    {
+     right_section--;
+     if(RightSection_GT() <= 0) return FALSE;
+    }
+
+   if(longest > -0x1000) longest = -0x1000;     
+  }
+ else
+  {
+   left_array[0]  = v3;
+   left_array[1]  = v2;
+   left_array[2]  = v1;
+   left_section   = 2;
+   right_array[0] = v3;
+   right_array[1] = v1;
+   right_section  = 1;
+
+   if(RightSection_GT() <= 0) return FALSE;
+   if(LeftSection_GT() <= 0)
+    {    
+     left_section--;
+     if(LeftSection_GT() <= 0) return FALSE;
+    }
+   if(longest < 0x1000) longest = 0x1000;     
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
+ delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
+ delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
+
+ delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
+ delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
+
+
+/*
+Mmm... adjust neg tex deltas... will sometimes cause slight
+texture distortions 
+ longest>>=16;
+ if(longest)
+  {
+   if(longest<0) longest=-longest;
+   if(delta_right_u<0)
+    delta_right_u-=delta_right_u/longest;
+   if(delta_right_v<0)
+    delta_right_v-=delta_right_v/longest;
+  }
+*/
+
+
+ return TRUE;
+}
+
+static __inline int RightSection_F4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_right_x = (v2->x - v1->x) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_F4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_left_x = (v2->x - v1->x) / height;
+
+ return height;  
+}
+
+static __inline BOOL NextRow_F4(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section > 0) 
+    while(LeftSection_F4()<=0) 
+     {
+      if(--left_section  <= 0) break;
+     }
+  }
+ else
+  {
+   left_x += delta_left_x;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section > 0) 
+    while(RightSection_F4()<=0) 
+     {
+      if(--right_section<=0) break;
+     }
+  }
+ else
+  {
+   right_x += delta_right_x;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width  = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0)                                      // 2 is right
+  {
+   if(longest2 < 0)                                    // 3 is right
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v1;
+     left_section   = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1 >= 0)
+      {
+       right_array[0] = v4;                     //  1
+       right_array[1] = v3;                     //     3
+       right_array[2] = v1;                     //  4
+       right_section  = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1 >= 0)
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v2;                    //     2
+         right_array[2] = v1;                    //  4
+         right_section  = 2;    
+        }
+       else
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v3;                    //     2
+         right_array[2] = v2;                    //     3
+         right_array[3] = v1;                    //  4
+         right_section  = 3;    
+        }
+      }
+    }
+   else                                            
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v3;                         //    1
+     left_array[2]  = v1;                         //      2
+     left_section   = 2;                          //  3
+     right_array[0] = v4;                         //    4
+     right_array[1] = v2;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+  }
+ else
+  {
+   if(longest2 < 0)             
+    {
+     left_array[0]  = v4;                          //    1
+     left_array[1]  = v2;                          //  2
+     left_array[2]  = v1;                          //      3
+     left_section   = 2;                           //    4
+     right_array[0] = v4;
+     right_array[1] = v3;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+   else                         
+    {
+     right_array[0] = v4;
+     right_array[1] = v1;
+     right_section  = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1<0)
+      {
+       left_array[0]  = v4;                        //    1
+       left_array[1]  = v3;                        //  3
+       left_array[2]  = v1;                        //    4
+       left_section   = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1<0)
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v2;                      //  2
+         left_array[2]  = v1;                      //    4
+         left_section   = 2;    
+        }
+       else
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v3;                      //  2
+         left_array[2]  = v2;                      //  3
+         left_array[3]  = v1;                      //     4
+         left_section   = 3;    
+        }
+      }
+    }
+  }
+
+ while(LeftSection_F4()<=0) 
+  {
+   if(--left_section  <= 0) break;
+  }
+
+ while(RightSection_F4()<=0) 
+  {
+   if(--right_section <= 0) break;
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_FT4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ right_u = v1->u;
+ right_v = v1->v;
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_right_x = (v2->x - v1->x) / height;
+ delta_right_u = (v2->u - v1->u) / height;
+ delta_right_v = (v2->v - v1->v) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_FT4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ left_u = v1->u;
+ left_v = v1->v;
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_left_x = (v2->x - v1->x) / height;
+ delta_left_u = (v2->u - v1->u) / height;
+ delta_left_v = (v2->v - v1->v) / height;
+
+ return height;  
+}
+
+static __inline BOOL NextRow_FT4(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section > 0) 
+    while(LeftSection_FT4()<=0) 
+     {
+      if(--left_section  <= 0) break;
+     }
+  }
+ else
+  {
+   left_x += delta_left_x;
+   left_u += delta_left_u;
+   left_v += delta_left_v;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section > 0) 
+    while(RightSection_FT4()<=0) 
+     {
+      if(--right_section<=0) break;
+     }
+  }
+ else
+  {
+   right_x += delta_right_x;
+   right_u += delta_right_u;
+   right_v += delta_right_v;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+             
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+ v4->u=tx4<<16;v4->v=ty4<<16;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width  = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0)                                      // 2 is right
+  {
+   if(longest2 < 0)                                    // 3 is right
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v1;
+     left_section   = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1 >= 0)
+      {
+       right_array[0] = v4;                     //  1
+       right_array[1] = v3;                     //     3
+       right_array[2] = v1;                     //  4
+       right_section  = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1 >= 0)
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v2;                    //     2
+         right_array[2] = v1;                    //  4
+         right_section  = 2;    
+        }
+       else
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v3;                    //     2
+         right_array[2] = v2;                    //     3
+         right_array[3] = v1;                    //  4
+         right_section  = 3;    
+        }
+      }
+    }
+   else                                            
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v3;                         //    1
+     left_array[2]  = v1;                         //      2
+     left_section   = 2;                          //  3
+     right_array[0] = v4;                         //    4
+     right_array[1] = v2;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+  }
+ else
+  {
+   if(longest2 < 0)             
+    {
+     left_array[0]  = v4;                          //    1
+     left_array[1]  = v2;                          //  2
+     left_array[2]  = v1;                          //      3
+     left_section   = 2;                           //    4
+     right_array[0] = v4;
+     right_array[1] = v3;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+   else                         
+    {
+     right_array[0] = v4;
+     right_array[1] = v1;
+     right_section  = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1<0)
+      {
+       left_array[0]  = v4;                        //    1
+       left_array[1]  = v3;                        //  3
+       left_array[2]  = v1;                        //    4
+       left_section   = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1<0)
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v2;                      //  2
+         left_array[2]  = v1;                      //    4
+         left_section   = 2;    
+        }
+       else
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v3;                      //  2
+         left_array[2]  = v2;                      //  3
+         left_array[3]  = v1;                      //     4
+         left_section   = 3;    
+        }
+      }
+    }
+  }
+
+ while(LeftSection_FT4()<=0) 
+  {
+   if(--left_section  <= 0) break;
+  }
+
+ while(RightSection_FT4()<=0) 
+  {
+   if(--right_section <= 0) break;
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_GT4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ right_u = v1->u;
+ right_v = v1->v;
+ right_R = v1->R;
+ right_G = v1->G;
+ right_B = v1->B;
+
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_right_x = (v2->x - v1->x) / height;
+ delta_right_u = (v2->u - v1->u) / height;
+ delta_right_v = (v2->v - v1->v) / height;
+ delta_right_R = (v2->R - v1->R) / height;
+ delta_right_G = (v2->G - v1->G) / height;
+ delta_right_B = (v2->B - v1->B) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_GT4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ left_u = v1->u;
+ left_v = v1->v;
+ left_R = v1->R;
+ left_G = v1->G;
+ left_B = v1->B;
+
+ if(height == 0) 
+  {
+   return 0;
+  }
+ delta_left_x = (v2->x - v1->x) / height;
+ delta_left_u = (v2->u - v1->u) / height;
+ delta_left_v = (v2->v - v1->v) / height;
+ delta_left_R = (v2->R - v1->R) / height;
+ delta_left_G = (v2->G - v1->G) / height;
+ delta_left_B = (v2->B - v1->B) / height;
+
+ return height;  
+}
+
+static __inline BOOL NextRow_GT4(void)
+{
+ if(--left_section_height<=0) 
+  {
+   if(--left_section > 0) 
+    while(LeftSection_GT4()<=0) 
+     {
+      if(--left_section  <= 0) break;
+     }
+  }
+ else
+  {
+   left_x += delta_left_x;
+   left_u += delta_left_u;
+   left_v += delta_left_v;
+   left_R += delta_left_R;
+   left_G += delta_left_G;
+   left_B += delta_left_B;
+  }
+
+ if(--right_section_height<=0) 
+  {
+   if(--right_section > 0) 
+    while(RightSection_GT4()<=0) 
+     {
+      if(--right_section<=0) break;
+     }
+  }
+ else
+  {
+   right_x += delta_right_x;
+   right_u += delta_right_u;
+   right_v += delta_right_v;
+   right_R += delta_right_R;
+   right_G += delta_right_G;
+   right_B += delta_right_B;
+  }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx;   v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+             
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+ v4->u=tx4<<16;v4->v=ty4<<16;
+ v4->R=(rgb4) & 0x00ff0000;
+ v4->G=(rgb4<<8) & 0x00ff0000;
+ v4->B=(rgb4<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width  = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0)                                      // 2 is right
+  {
+   if(longest2 < 0)                                    // 3 is right
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v1;
+     left_section   = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1 >= 0)
+      {
+       right_array[0] = v4;                     //  1
+       right_array[1] = v3;                     //     3
+       right_array[2] = v1;                     //  4
+       right_section  = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1 >= 0)
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v2;                    //     2
+         right_array[2] = v1;                    //  4
+         right_section  = 2;    
+        }
+       else
+        {
+         right_array[0] = v4;                    //  1
+         right_array[1] = v3;                    //     2
+         right_array[2] = v2;                    //     3
+         right_array[3] = v1;                    //  4
+         right_section  = 3;    
+        }
+      }
+    }
+   else                                            
+    {
+     left_array[0]  = v4;
+     left_array[1]  = v3;                         //    1
+     left_array[2]  = v1;                         //      2
+     left_section   = 2;                          //  3
+     right_array[0] = v4;                         //    4
+     right_array[1] = v2;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+  }
+ else
+  {
+   if(longest2 < 0)             
+    {
+     left_array[0]  = v4;                          //    1
+     left_array[1]  = v2;                          //  2
+     left_array[2]  = v1;                          //      3
+     left_section   = 2;                           //    4
+     right_array[0] = v4;
+     right_array[1] = v3;
+     right_array[2] = v1;
+     right_section  = 2;
+    }
+   else                         
+    {
+     right_array[0] = v4;
+     right_array[1] = v1;
+     right_section  = 1;
+
+     height = v3->y - v1->y; if(height == 0) height=1;
+     longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+     if(longest1<0)
+      {
+       left_array[0]  = v4;                        //    1
+       left_array[1]  = v3;                        //  3
+       left_array[2]  = v1;                        //    4
+       left_section   = 2;    
+      }
+     else
+      {
+       height = v4->y - v2->y; if(height == 0) height=1;
+       longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+       if(longest1<0)
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v2;                      //  2
+         left_array[2]  = v1;                      //    4
+         left_section   = 2;    
+        }
+       else
+        {
+         left_array[0]  = v4;                      //    1
+         left_array[1]  = v3;                      //  2
+         left_array[2]  = v2;                      //  3
+         left_array[3]  = v1;                      //     4
+         left_section   = 3;    
+        }
+      }
+    }
+  }
+
+ while(LeftSection_GT4()<=0) 
+  {
+   if(--left_section  <= 0) break;
+  }
+
+ while(RightSection_GT4()<=0) 
+  {
+   if(--right_section <= 0) break;
+  }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY FUNCS
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 FLAT SHADED
+////////////////////////////////////////////////////////////////////////
+
+static __inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ unsigned short color;
+ uint32_t lcolor;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_F(x1,y1,x2,y2,x3,y3)) return;
+
+ ymax=Ymax;
+
+ color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+ lcolor=lSetMask|(((uint32_t)(color))<<16)|color;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_F()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   color |=sSetMask;
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;
+     xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2) 
+      {
+       *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
+      }
+     if(j==xmax) psxVuw[(i<<10)+j]=color;
+
+     if(NextRow_F()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;
+   xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+   for(j=xmin;j<xmax;j+=2) 
+    {
+     GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10)+j], lcolor);
+    }
+   if(j == xmax)
+    GetShadeTransCol(&psxVuw[(i << 10) + j],color);
+
+   if(NextRow_F()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3F(int rgb)
+{
+ drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
+}
+
+#ifdef POLYQUAD3FS
+
+void drawPoly4F_TRI(int rgb)
+{
+ drawPoly3Fi(lx1,ly1,lx3,ly3,lx2,ly2,rgb);
+ drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
+}
+
+#endif
+
+// more exact:
+
+void drawPoly4F(int rgb)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ unsigned short color;unsigned int lcolor;
+ 
+ if(lx0>drawW && lx1>drawW && lx2>drawW && lx3>drawW) return;
+ if(ly0>drawH && ly1>drawH && ly2>drawH && ly3>drawH) return;
+ if(lx0<drawX && lx1<drawX && lx2<drawX && lx3<drawX) return;
+ if(ly0<drawY && ly1<drawY && ly2<drawY && ly3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_F4(lx0,ly0,lx1,ly1,lx2,ly2,lx3,ly3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_F4()) return;
+
+ color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+ lcolor= lSetMask|(((uint32_t)(color))<<16)|color;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   color |=sSetMask;
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=left_x >> 16;      if(drawX>xmin) xmin=drawX;
+     xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2) 
+      {
+       *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
+      }
+     if(j==xmax) psxVuw[(i<<10)+j]=color;
+
+     if(NextRow_F4()) return;
+    }
+   return;
+  }                                                        
+
+#endif
+
+ for (i = ymin; i <= ymax; i++)
+  {
+   xmin = left_x >> 16;      if(drawX > xmin) xmin = drawX;
+   xmax = (right_x >> 16) - 1; if(drawW < xmax) xmax = drawW;
+
+   for(j = xmin; j < xmax; j += 2) 
+    {
+     GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10) + j],lcolor);
+    }
+   if(j == xmax) GetShadeTransCol(&psxVuw[(i<<10) + j],color);
+
+   if(NextRow_F4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 F-SHADED TEX PAL 4
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if (x1 > drawW && x2 > drawW && x3 > drawW) return;
+ if (y1 > drawH && y2 > drawH && y3 > drawH) return;
+ if (x1 < drawX && x2 < drawX && x3 < drawX) return;
+ if (y1 < drawY && y2 < drawY && y3 < drawY) return;
+ if (drawY >= drawH) return;
+ if (drawX >= drawW) return; 
+
+ if (!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax = Ymax;
+
+ for (ymin = Ymin; ymin < drawY; ymin++)
+  if (NextRow_FT()) return;
+
+ clutP = (clY << 10) + clX;
+
+ YAdjust = ((GlobalTextAddrY) << 11) + (GlobalTextAddrX << 1);
+
+ difX = delta_right_u; difX2 = difX << 1;
+ difY = delta_right_v; difY2 = difY << 1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16);
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                    (XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                      (XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       XAdjust=((posX+difX)>>16);
+       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                    (XAdjust>>1)];
+       tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                    (XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1;
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16);
+
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         XAdjust=((posX+difX)>>16);
+
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16);
+
+       TXV=posY>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       XAdjust=((posX+difX)>>16);
+
+       TXV=(posY+difY)>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16);
+
+       TXV=posY>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
+     if(xmax>xmin) xmax--;
+
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i << 10) + j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+static void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ drawPoly3TEx4(x2,y2,x3,y3,x4,y4,
+               tx2,ty2,tx3,ty3,tx4,ty4,
+               clX,clY);
+ drawPoly3TEx4(x1,y1,x2,y2,x4,y4,
+               tx1,ty1,tx2,ty2,tx4,ty4,
+               clX,clY);
+}
+
+#endif
+
+// more exact:
+
+static void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16);
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                       (XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                      (XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       XAdjust=((posX+difX)>>16);
+       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                     (XAdjust>>1)];
+       tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                    (XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<10)+GlobalTextAddrX;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16);
+
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         XAdjust=((posX+difX)>>16);
+
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16);
+
+       TXV=posY>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       XAdjust=((posX+difX)>>16);
+
+       TXV=(posY+difY)>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16);
+       TXV=posY>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+////////////////////////////////////////////////////////////////////////
+// POLY 3 F-SHADED TEX PAL 8
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                      ((posX+difX)>>16)];
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+
+       if(j==xmax)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                    ((posX+difX)>>16)];
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+
+     if(j==xmax)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         TXU=(posX+difX)>>16;
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+
+       if(j==xmax)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       TXU=posX>>16;
+       TXV=posY>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       TXU=(posX+difX)>>16;
+       TXV=(posY+difY)>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+
+     if(j==xmax)
+      {
+       TXU=posX>>16;
+       TXV=posY>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
+     if(xmax>xmin) xmax--;
+
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+             psxVuw[clutP+tC1]|
+             ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+
+       if(j==xmax)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+           psxVuw[clutP+tC1]|
+           ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+
+     if(j==xmax)
+      {
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+static void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ drawPoly3TEx8(x2,y2,x3,y3,x4,y4,
+               tx2,ty2,tx3,ty3,tx4,ty4,
+               clX,clY);
+
+ drawPoly3TEx8(x1,y1,x2,y2,x4,y4,
+               tx1,ty1,tx2,ty2,tx4,ty4,
+               clX,clY);
+}
+
+#endif
+
+// more exact:
+
+static void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                     ((posX+difX)>>16)];
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+       tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                     ((posX+difX)>>16)];
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         TXU=(posX+difX)>>16;
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       TXU=posX>>16;
+       TXV=posY>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       TXU=(posX+difX)>>16;
+       TXV=(posY+difY)>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+       
+       tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       TXU=posX>>16;
+       TXV=posY>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i, j, xmin, xmax, ymin, ymax;
+ int difX, difY, difX2, difY2;
+ int posX, posY, YAdjust, clutP;
+ short tC1, tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX += difX2;
+         posY += difY2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                     YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16);
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+        }
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                     YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+            psxVuw[clutP+tC1]|
+            ((int)psxVuw[clutP+tC2])<<16);
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      {
+       tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+      }
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3 F-SHADED TEX 15 BIT
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+                     
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+             psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+       GetTextureTransColG(&psxVuw[(i<<10)+j],
+           psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+                     
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT()) return;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+              (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                     (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+         GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+             psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                    ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+      }
+     if(NextRow_FT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+            (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                   (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+       GetTextureTransColG(&psxVuw[(i<<10)+j],
+           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+    }
+   if(NextRow_FT()) 
+    {
+     return;
+    }
+  }
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+static void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ drawPoly3TD(x2,y2,x3,y3,x4,y4,
+            tx2,ty2,tx3,ty3,tx4,ty4);
+ drawPoly3TD(x1,y1,x2,y2,x4,y4,
+            tx1,ty1,tx2,ty2,tx4,ty4);
+}
+
+#endif
+
+// more exact:
+
+static void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+           psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      GetTextureTransColG(&psxVuw[(i<<10)+j],
+         psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
+                     ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                           (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      GetTextureTransColG(&psxVuw[(i<<10)+j],
+         psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX, posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
+                     ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+         posX+=difX2;
+         posY+=difY2;
+        }
+       if(j==xmax)
+        GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+           psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                  ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+      }
+     if(NextRow_FT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<xmax;j+=2)
+      {
+       GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+            (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                           (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+       posX+=difX2;
+       posY+=difY2;
+      }
+     if(j==xmax)
+      GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],
+         psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+    }
+   if(NextRow_FT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED
+////////////////////////////////////////////////////////////////////////
+ 
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_G(x1,y1,x2,y2,x3,y3,rgb1,rgb2,rgb3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_G()) return;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && iDither!=2)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2) 
+        {
+         *((uint32_t *)&psxVuw[(i<<10)+j])=
+            ((((cR1+difR) <<7)&0x7c000000)|(((cG1+difG) << 2)&0x03e00000)|(((cB1+difB)>>3)&0x001f0000)|
+             (((cR1) >> 9)&0x7c00)|(((cG1) >> 14)&0x03e0)|(((cB1) >> 19)&0x001f))|lSetMask;
+   
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        psxVuw[(i<<10)+j]=(((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f))|sSetMask;
+      }
+     if(NextRow_G()) return;
+    }
+   return;
+  }
+
+#endif
+
+ if(iDither==2)
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++) 
+      {
+       GetShadeTransCol_Dither(&psxVuw[(i<<10)+j],(cB1>>16),(cG1>>16),(cR1>>16));
+
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_G()) return;
+  }
+ else
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++) 
+      {
+       GetShadeTransCol(&psxVuw[(i<<10)+j],((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f));
+
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_G()) return;
+  }
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3G(int rgb1, int rgb2, int rgb3)
+{
+ drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,rgb1,rgb2,rgb3);
+}
+
+// draw two g-shaded tris for right psx shading emulation
+
+void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4)
+{
+ drawPoly3Gi(lx1,ly1,lx3,ly3,lx2,ly2,
+             rgb2,rgb4,rgb3);
+ drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,
+             rgb1,rgb2,rgb3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED TEX PAL4
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=((left_x) >> 16);
+     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2) 
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16);
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                      (XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+               psxVuw[clutP+tC1]|
+               ((int)psxVuw[clutP+tC2])<<16,
+               (cB1>>16)|((cB1+difB)&0xff0000),
+               (cG1>>16)|((cG1+difG)&0xff0000),
+               (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+              psxVuw[clutP+tC1],
+              (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++) 
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=((left_x) >> 16);
+     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2) 
+        {
+         XAdjust=(posX>>16);
+
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+ 
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         XAdjust=((posX+difX)>>16);
+
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+               psxVuw[clutP+tC1]|
+               ((int)psxVuw[clutP+tC2])<<16,
+               (cB1>>16)|((cB1+difB)&0xff0000),
+               (cG1>>16)|((cG1+difG)&0xff0000),
+               (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+
+         TXV=posY>>16;
+         n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+         n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+              psxVuw[clutP+tC1],
+              (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++) 
+      {
+       XAdjust=(posX>>16);
+
+       TXV=posY>>16;
+       n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+       n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i, j, xmin, xmax, ymin, ymax;
+ int cR1, cG1, cB1;
+ int difR, difB, difG, difR2, difB2, difG2;
+ int difX, difY,difX2, difY2;
+ int posX, posY, YAdjust, clutP, XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=((left_x) >> 16);
+     xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2) 
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16)%TWin.Position.x1;
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                       YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+             psxVuw[clutP+tC1],
+             (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++) 
+      {
+       XAdjust=(posX>>16)%TWin.Position.x1;
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+(XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: the psx is doing g-shaded quads as two g-shaded tris,
+// like the following func... sadly texturing is not 100%
+// correct that way, so small texture distortions can 
+// happen... 
+
+static void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                    short clX, short clY,
+                    int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4_IL(x2,y2,x3,y3,x4,y4,
+                   tx2,ty2,tx3,ty3,tx4,ty4,
+                   clX,clY,
+                   col2,col4,col3);
+ drawPoly3TGEx4_IL(x1,y1,x2,y2,x4,y4,
+                   tx1,ty1,tx2,ty2,tx4,ty4,
+                   clX,clY,
+                   col1,col2,col3);
+}
+
+#ifdef POLYQUAD3GT
+
+static void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                    short clX, short clY,
+                    int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4(x2,y2,x3,y3,x4,y4,
+                tx2,ty2,tx3,ty3,tx4,ty4,
+                clX,clY,
+                col2,col4,col3);
+ drawPoly3TGEx4(x1,y1,x2,y2,x4,y4,
+                tx1,ty1,tx2,ty2,tx4,ty4,
+                clX,clY,
+                col1,col2,col3);
+}
+
+#endif
+               
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                    short clX, short clY,
+                    int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+       difR=(right_R-cR1)/num;
+       difG=(right_G-cG1)/num;
+       difB=(right_B-cB1)/num;
+       difR2=difR<<1;
+       difG2=difG<<1;
+       difB2=difB<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+         XAdjust=((posX+difX)>>16);
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                       (XAdjust>>1)];
+         tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         XAdjust=(posX>>16);
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                      (XAdjust>>1)];
+         tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+             psxVuw[clutP+tC1],
+             (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+     difR=(right_R-cR1)/num;
+     difG=(right_G-cG1)/num;
+     difB=(right_B-cB1)/num;
+     difR2=difR<<1;
+     difG2=difG<<1;
+     difB2=difB<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       XAdjust=(posX>>16);
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+                    (XAdjust>>1)];
+       tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+           psxVuw[clutP+tC1],
+           (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+           psxVuw[clutP+tC1],
+           (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                    short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                    short clX, short clY,
+                    int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4_TW(x2,y2,x3,y3,x4,y4,
+                   tx2,ty2,tx3,ty3,tx4,ty4,
+                   clX,clY,
+                   col2,col4,col3);
+
+ drawPoly3TGEx4_TW(x1,y1,x2,y2,x4,y4,
+                   tx1,ty1,tx2,ty2,tx4,ty4,
+                   clX,clY,
+                   col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED TEX PAL8
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                      (((posX+difX)>>16))];
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+              psxVuw[clutP+tC1],
+              (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         TXU=(posX+difX)>>16;
+         TXV=(posY+difY)>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         TXU=posX>>16;
+         TXV=posY>>16;
+         n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+         n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+         tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+              psxVuw[clutP+tC1],
+              (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       TXU=posX>>16;
+       TXV=posY>>16;
+       n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+       n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+       tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+                      
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                      YAdjust+((posX>>16)%TWin.Position.x1)];
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+              psxVuw[clutP+tC1],
+              (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+                    YAdjust+((posX>>16)%TWin.Position.x1)];
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+            psxVuw[clutP+tC1],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: two g-shaded tris: small texture distortions can happen
+
+static void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                           short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                           short clX, short clY,
+                           int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8_IL(x2,y2,x3,y3,x4,y4,
+                   tx2,ty2,tx3,ty3,tx4,ty4,
+                   clX,clY,
+                   col2,col4,col3);
+ drawPoly3TGEx8_IL(x1,y1,x2,y2,x4,y4,
+                   tx1,ty1,tx2,ty2,tx4,ty4,
+                   clX,clY,
+                   col1,col2,col3);
+}
+
+#ifdef POLYQUAD3GT
+                      
+static void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                   short clX, short clY,
+                   int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8(x2,y2,x3,y3,x4,y4,
+                tx2,ty2,tx3,ty3,tx4,ty4,
+                clX,clY,
+                col2,col4,col3);
+ drawPoly3TGEx8(x1,y1,x2,y2,x4,y4,
+                tx1,ty1,tx2,ty2,tx4,ty4,
+                clX,clY,
+                col1,col2,col3);
+}
+
+#endif
+
+static void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                   short clX, short clY,
+                   int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16);
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+
+       num=(xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+       difR=(right_R-cR1)/num;
+       difG=(right_G-cG1)/num;
+       difB=(right_B-cB1)/num;
+       difR2=difR<<1;
+       difG2=difG<<1;
+       difB2=difB<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+                     ((posX+difX)>>16)];
+
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              psxVuw[clutP+tC1]|
+              ((int)psxVuw[clutP+tC2])<<16,
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        {
+         tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+         GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+             psxVuw[clutP+tC1],
+             (cB1>>16),(cG1>>16),(cR1>>16));
+        }
+      }
+     if(NextRow_GT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+     difR=(right_R-cR1)/num;
+     difG=(right_G-cG1)/num;
+     difB=(right_B-cB1)/num;
+     difR2=difR<<1;
+     difG2=difG<<1;
+     difB2=difB<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+           psxVuw[clutP+tC1],
+           (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+           psxVuw[clutP+tC1],
+           (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+                   short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+                   short clX, short clY,
+                   int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8_TW(x2,y2,x3,y3,x4,y4,
+                tx2,ty2,tx3,ty3,tx4,ty4,
+                clX,clY,
+                col2,col4,col3);
+ drawPoly3TGEx8_TW(x1,y1,x2,y2,x4,y4,
+                tx1,ty1,tx2,ty2,tx4,ty4,
+                clX,clY,
+                col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3 G-SHADED TEX 15 BIT
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+  if(NextRow_GT()) return;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {       
+   for (i=ymin;i<=ymax;i++)
+    {
+     xmin=(left_x >> 16);
+     xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
+          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j],
+          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if (x1>drawW && x2>drawW && x3>drawW) return;
+ if (y1>drawH && y2>drawH && y3>drawH) return;
+ if (x1<drawX && x2<drawX && x3<drawX) return;
+ if (y1<drawY && y2<drawY && y3<drawY) return;
+ if (drawY >= drawH) return;
+ if (drawX >= drawW) return; 
+
+ if (!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax = Ymax;
+
+ for(ymin = Ymin; ymin < drawY; ymin++)
+  if(NextRow_GT()) return;
+
+ difR = delta_right_R;
+ difG = delta_right_G;
+ difB = delta_right_B;
+ difR2 = difR<<1;
+ difG2 = difG<<1;
+ difB2 = difB<<1;
+ difX = delta_right_u; difX2 = difX<<1;
+ difY = delta_right_v; difY2 = difY<<1;
+
+#ifdef FASTSOLID
+
+ if (!bCheckMask && !DrawSemiTrans && !iDither)
+  {       
+   for (i = ymin; i <= ymax; i++)
+    {
+     xmin = (left_x >> 16);
+     xmax = (right_x >> 16) - 1; //!!!!!!!!!!!!!!!!!!!!
+     if(drawW<xmax) xmax=drawW;
+
+     if(xmax>=xmin)
+      {
+       posX=left_u;
+       posY=left_v;
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                             (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+              psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                     (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+            psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                   ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+      }
+     if(NextRow_GT()) 
+      {
+       return;
+      }
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+   if(drawW<xmax) xmax=drawW;
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       if(iDither)
+        GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
+          psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                 ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j],
+          psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+                 ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT()) 
+    {
+     return;
+    }
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: two g-shaded tris: small texture distortions can happen
+
+#ifdef POLYQUAD3GT
+
+static void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGD(x2,y2,x3,y3,x4,y4,
+              tx2,ty2,tx3,ty3,tx4,ty4,
+              col2,col4,col3);
+ drawPoly3TGD(x1,y1,x2,y2,x4,y4,
+              tx1,ty1,tx2,ty2,tx4,ty4,
+              col1,col2,col3);
+}
+
+#endif
+
+static void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax = Ymax;
+
+ for (ymin = Ymin; ymin < drawY; ymin++)
+  if (NextRow_GT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+  {
+   for (i = ymin; i <= ymax; i++)
+    {
+     xmin = (left_x >> 16);
+     xmax = (right_x >> 16);
+
+     if(xmax >= xmin)
+      {
+       posX = left_u;
+       posY = left_v;
+
+       num = (xmax-xmin);
+       if(num==0) num=1;
+       difX=(right_u-posX)/num;
+       difY=(right_v-posY)/num;
+       difX2=difX<<1;
+       difY2=difY<<1;
+
+       cR1=left_R;
+       cG1=left_G;
+       cB1=left_B;
+       difR=(right_R-cR1)/num;
+       difG=(right_G-cG1)/num;
+       difB=(right_B-cB1)/num;
+       difR2=difR<<1;
+       difG2=difG<<1;
+       difB2=difB<<1;
+
+       if(xmin<drawX)
+        {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+       xmax--;if(drawW<xmax) xmax=drawW;
+
+       for(j=xmin;j<xmax;j+=2)
+        {
+         GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+              (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+              psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
+              (cB1>>16)|((cB1+difB)&0xff0000),
+              (cG1>>16)|((cG1+difG)&0xff0000),
+              (cR1>>16)|((cR1+difR)&0xff0000));
+         posX+=difX2;
+         posY+=difY2;
+         cR1+=difR2;
+         cG1+=difG2;
+         cB1+=difB2;
+        }
+       if(j==xmax)
+        GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+            psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+            (cB1>>16),(cG1>>16),(cR1>>16));
+      }
+     if(NextRow_GT4()) return;
+    }
+   return;
+  }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+  {
+   xmin=(left_x >> 16);
+   xmax=(right_x >> 16);
+
+   if(xmax>=xmin)
+    {
+     posX=left_u;
+     posY=left_v;
+
+     num=(xmax-xmin);
+     if(num==0) num=1;
+     difX=(right_u-posX)/num;
+     difY=(right_v-posY)/num;
+     difX2=difX<<1;
+     difY2=difY<<1;
+
+     cR1=left_R;
+     cG1=left_G;
+     cB1=left_B;
+     difR=(right_R-cR1)/num;
+     difG=(right_G-cG1)/num;
+     difB=(right_B-cB1)/num;
+     difR2=difR<<1;
+     difG2=difG<<1;
+     difB2=difB<<1;
+
+     if(xmin<drawX)
+      {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+     xmax--;if(drawW<xmax) xmax=drawW;
+
+     for(j=xmin;j<=xmax;j++)
+      {
+       if(iDither)
+        GetTextureTransColGX(&psxVuw[(i<<10)+j],
+          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       else
+        GetTextureTransColGX(&psxVuw[(i<<10)+j],
+          psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+          (cB1>>16),(cG1>>16),(cR1>>16));
+       posX+=difX;
+       posY+=difY;
+       cR1+=difR;
+       cG1+=difG;
+       cB1+=difB;
+      }
+    }
+   if(NextRow_GT4()) return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGD_TW(x2,y2,x3,y3,x4,y4,
+              tx2,ty2,tx3,ty3,tx4,ty4,
+              col2,col4,col3);
+ drawPoly3TGD_TW(x1,y1,x2,y2,x4,y4,
+              tx1,ty1,tx2,ty2,tx4,ty4,
+              col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+
+/*
+// no real rect test, but it does its job the way I need it
+__inline BOOL IsNoRect(void)
+{
+ if(lx0==lx1 && lx2==lx3) return FALSE;
+ if(lx0==lx2 && lx1==lx3) return FALSE;
+ if(lx0==lx3 && lx1==lx2) return FALSE;
+ return TRUE;                      
+}
+*/
+
+// real rect test
+static __inline BOOL IsNoRect(void)
+{
+ //if(!(dwActFixes&0x200)) return FALSE;
+
+ if(ly0==ly1)
+  {
+   if(lx1==lx3 && ly3==ly2 && lx2==lx0) return FALSE;
+   if(lx1==lx2 && ly2==ly3 && lx3==lx0) return FALSE;
+   return TRUE;
+  }
+ 
+ if(ly0==ly2)
+  {
+   if(lx2==lx3 && ly3==ly1 && lx1==lx0) return FALSE;
+   if(lx2==lx1 && ly1==ly3 && lx3==lx0) return FALSE;
+   return TRUE;
+  }
+ 
+ if(ly0==ly3)
+  {
+   if(lx3==lx2 && ly2==ly1 && lx1==lx0) return FALSE;
+   if(lx3==lx1 && ly1==ly2 && lx2==lx0) return FALSE;
+   return TRUE;
+  }
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3FT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+  {
+   if(GlobalTextTP==0)
+    drawPoly3TEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+   else
+    drawPoly3TEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+   return;
+  }
+
+ if(!bUsingTWin)// && !(dwActFixes&0x100))
+  {
+   switch(GlobalTextTP)   // depending on texture mode
+    {
+     case 0:
+      drawPoly3TEx4(lx0,ly0,lx1,ly1,lx2,ly2,
+                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                    ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+      return;
+     case 1:
+      drawPoly3TEx8(lx0,ly0,lx1,ly1,lx2,ly2,
+                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                    ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+      return;
+     case 2:
+      drawPoly3TD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+      return;
+    }
+   return;
+  }
+
+ switch(GlobalTextTP)   // depending on texture mode
+  {
+   case 0:
+    drawPoly3TEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 1:
+    drawPoly3TEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 2:
+    drawPoly3TD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+    return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4FT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+  {
+   if(GlobalTextTP==0)
+    drawPoly4TEx4_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+   else
+    drawPoly4TEx8_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                  (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+   return;
+  }
+
+ if(!bUsingTWin)
+  {
+#ifdef POLYQUAD3GT
+   if(IsNoRect())
+    {
+     switch (GlobalTextTP)
+      {
+       case 0:
+        drawPoly4TEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+        return;
+       case 1:
+        drawPoly4TEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+        return;
+       case 2:
+        drawPoly4TD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+        return;
+      }
+     return;
+    }
+#endif
+          
+   switch (GlobalTextTP)
+    {
+     case 0: // grandia investigations needed
+      drawPoly4TEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+      return;
+     case 1:
+      drawPoly4TEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                  (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+      return;
+     case 2:
+      drawPoly4TD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+      return;
+    }
+   return;
+  }
+
+ switch (GlobalTextTP)
+  {
+   case 0:
+    drawPoly4TEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 1:
+    drawPoly4TEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 2:
+    drawPoly4TD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+    return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3GT(unsigned char * baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+  {
+   if(GlobalTextTP==0)
+    drawPoly3TGEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6]);
+   else
+    drawPoly3TGEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6]);
+   return;
+  }
+
+ if(!bUsingTWin)
+  {
+   switch (GlobalTextTP)
+    {
+     case 0:
+      drawPoly3TGEx4(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                     gpuData[0],gpuData[3],gpuData[6]);
+      return;
+     case 1:
+      drawPoly3TGEx8(lx0,ly0,lx1,ly1,lx2,ly2,
+                     (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                     gpuData[0],gpuData[3],gpuData[6]);
+      return;
+     case 2:
+      drawPoly3TGD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
+      return;
+    }
+   return;
+  }
+
+ switch(GlobalTextTP)
+  {
+   case 0:
+    drawPoly3TGEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6]);
+    return;
+   case 1:
+    drawPoly3TGEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+                      ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6]);
+    return;
+   case 2:
+    drawPoly3TGD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
+    return;
+  }
+}              
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4GT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+  {
+   if(GlobalTextTP==0)
+    drawPoly4TGEx4_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                          (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                          ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                          gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+   else
+    drawPoly4TGEx8_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                          (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                          ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                          gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+   return;
+  }
+
+ if(!bUsingTWin)
+  {
+#ifdef POLYQUAD3GT
+   if(IsNoRect())
+    {
+     switch (GlobalTextTP)
+      {
+       case 0:
+        drawPoly4TGEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                       gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+
+        return;
+       case 1:
+        drawPoly4TGEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+        return;
+       case 2:
+        drawPoly4TGD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+        return;
+      }
+     return;
+    }
+#endif
+
+   switch (GlobalTextTP)
+    {
+     case 0:
+      drawPoly4TGEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                    ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                     gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+
+      return;
+     case 1:
+      drawPoly4TGEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                    (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                    ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                    gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+      return;
+     case 2:
+      drawPoly4TGD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+      return;
+    }
+   return;
+  }
+             
+ switch (GlobalTextTP)
+  {
+   case 0:
+    drawPoly4TGEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+    return;
+   case 1:
+    drawPoly4TGEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+                      (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+                      ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+                      gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+    return;
+   case 2:
+    drawPoly4TGD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+    return;
+  }
+}
+                
+////////////////////////////////////////////////////////////////////////
+// SPRITE FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSpriteTWin(unsigned char * baseAddr, int w, int h)
+{ 
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ short sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3;
+ short tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3;
+
+ sx0=lx0;
+ sy0=ly0;
+
+ sx0=sx3=sx0+PSXDisplay.DrawOffset.x;
+ sx1=sx2=sx0+w;
+ sy0=sy1=sy0+PSXDisplay.DrawOffset.y;
+ sy2=sy3=sy0+h;
+ 
+ tx0=tx3=gpuData[2]&0xff;
+ tx1=tx2=tx0+w;
+ ty0=ty1=(gpuData[2]>>8)&0xff;
+ ty2=ty3=ty0+h;
+
+ switch (GlobalTextTP)
+  {
+   case 0:
+    drawPoly4TEx4_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+                     tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
+                     ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 1:
+    drawPoly4TEx8_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+                       tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
+                       ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+    return;
+   case 2:
+    drawPoly4TD_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+                     tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3);
+    return;
+  }
+}                                                   
+
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSpriteMirror(unsigned char * baseAddr, int w, int h)
+{
+ int sprtY,sprtX,sprtW,sprtH,lXDir,lYDir;
+ int clutY0,clutX0,clutP,textX0,textY0,sprtYa,sprCY,sprCX,sprA;
+ short tC;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+ clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
+ clutX0 = (gpuData[2]>>12) & 0x3f0;
+ clutP  = (clutY0<<11) + (clutX0<<1);
+ textY0 = ((gpuData[2]>>8) & 0x000000ff) + GlobalTextAddrY;
+ textX0 = (gpuData[2] & 0x000000ff);
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+// while (sprtX>1023)             sprtX-=1024;
+// while (sprtY>MAXYLINESMIN1)    sprtY-=MAXYLINES;
+
+ if(sprtX>drawW)
+  {
+//   if((sprtX+sprtW)>1023) sprtX-=1024;
+//   else return;
+   return;
+  }
+
+ if(sprtY>drawH)
+  {
+//   if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
+//   else return;
+   return;
+  }
+
+ if(sprtY<drawY)
+  {
+   if((sprtY+sprtH)<drawY) return;
+   sprtH-=(drawY-sprtY);
+   textY0+=(drawY-sprtY);
+   sprtY=drawY;
+  }
+
+ if(sprtX<drawX)
+  {
+   if((sprtX+sprtW)<drawX) return;
+   sprtW-=(drawX-sprtX);
+   textX0+=(drawX-sprtX);
+   sprtX=drawX;
+  }
+
+ if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
+ if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
+
+ if(usMirror&0x1000) lXDir=-1; else lXDir=1;
+ if(usMirror&0x2000) lYDir=-1; else lYDir=1;
+
+ switch (GlobalTextTP)
+  {
+   case 0: // texture is 4-bit
+  
+    sprtW=sprtW/2;
+    textX0=(GlobalTextAddrX<<1)+(textX0>>1);
+    sprtYa=(sprtY<<10);
+    clutP=(clutY0<<10)+clutX0;
+    for (sprCY=0;sprCY<sprtH;sprCY++)
+     for (sprCX=0;sprCX<sprtW;sprCX++)
+      {
+       tC= psxVub[((textY0+(sprCY*lYDir))<<11) + textX0 +(sprCX*lXDir)];
+       sprA=sprtYa+(sprCY<<10)+sprtX + (sprCX<<1);
+       GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+((tC>>4)&0xf)]);
+       GetTextureTransColG_SPR(&psxVuw[sprA+1],psxVuw[clutP+(tC&0xf)]);
+      }
+    return;
+
+   case 1: 
+
+    clutP>>=1;
+    for(sprCY=0;sprCY<sprtH;sprCY++)
+     for(sprCX=0;sprCX<sprtW;sprCX++)
+      { 
+       tC = psxVub[((textY0+(sprCY*lYDir))<<11)+(GlobalTextAddrX<<1) + textX0 + (sprCX*lXDir)] & 0xff;
+       GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX + sprCX],psxVuw[clutP+tC]);
+      }
+     return;
+
+
+   case 2:
+
+    for (sprCY=0;sprCY<sprtH;sprCY++)
+     for (sprCX=0;sprCX<sprtW;sprCX++)
+      { 
+       GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX+sprCX],
+           psxVuw[((textY0+(sprCY*lYDir))<<10)+GlobalTextAddrX + textX0 +(sprCX*lXDir)]);
+      }
+     return;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int tx,int ty)
+{
+ int sprtY,sprtX,sprtW,sprtH,tdx,tdy;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+ if(sprtX>drawW) return;
+ if(sprtY>drawH) return;
+
+ tdx=tx+sprtW;
+ tdy=ty+sprtH;
+
+ sprtW+=sprtX;
+ sprtH+=sprtY;
+
+ // Pete is too lazy to make a faster version ;)
+
+ if(GlobalTextTP==0)
+  drawPoly4TEx4_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
+                   tx,ty,      tx,tdy,     tdx,tdy,    tdx,ty,     
+                   (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
+
+
+ else
+  drawPoly4TEx8_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
+                   tx,ty,      tx,tdy,     tdx,tdy,    tdx,ty,     
+                   (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty)
+{
+ int sprtY, sprtX, sprtW, sprtH;
+ int clutY0, clutX0, clutP, textX0, textY0, sprtYa, sprCY, sprCX, sprA;
+ short tC, tC2;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ unsigned char *pV;
+ BOOL bWT,bWS;
+
+ if(GlobalTextIL && GlobalTextTP<2)
+  {DrawSoftwareSprite_IL(baseAddr,w,h,tx,ty);return;}
+
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+ clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
+ clutX0 = (gpuData[2]>>12) & 0x3f0;
+
+ clutP  = (clutY0<<11) + (clutX0<<1);
+
+ textY0 =ty+ GlobalTextAddrY;
+ textX0 =tx;
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+ //while (sprtX>1023)             sprtX-=1024;
+ //while (sprtY>MAXYLINESMIN1)    sprtY-=MAXYLINES;
+
+ if(sprtX>drawW)
+  {
+//   if((sprtX+sprtW)>1023) sprtX-=1024;
+//   else return;
+   return;
+  }
+
+ if(sprtY>drawH)
+  {
+//   if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
+//   else return;
+   return;
+  }
+
+ if(sprtY<drawY)
+  {
+   if((sprtY+sprtH)<drawY) return;
+   sprtH-=(drawY-sprtY);
+   textY0+=(drawY-sprtY);
+   sprtY=drawY;
+  }
+
+ if(sprtX<drawX)
+  {
+   if((sprtX+sprtW)<drawX) return;
+
+   sprtW-=(drawX-sprtX);
+   textX0+=(drawX-sprtX);
+   sprtX=drawX;
+  }
+
+ if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
+ if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
+
+
+ bWT=FALSE;
+ bWS=FALSE;
+
+ switch (GlobalTextTP)
+  {
+   case 0:
+
+    if(textX0&1) {bWS=TRUE;sprtW--;}
+    if(sprtW&1)  bWT=TRUE;
+    
+    sprtW=sprtW>>1;
+    textX0=(GlobalTextAddrX<<1)+(textX0>>1)+(textY0<<11);
+    sprtYa=(sprtY<<10)+sprtX;
+    clutP=(clutY0<<10)+clutX0;
+
+#ifdef FASTSOLID
+ 
+    if(!bCheckMask && !DrawSemiTrans)
+     {
+      for (sprCY=0;sprCY<sprtH;sprCY++)
+       {
+        sprA=sprtYa+(sprCY<<10);
+        pV=&psxVub[(sprCY<<11)+textX0];
+
+        if(bWS)
+         {
+          tC=*pV++;
+          GetTextureTransColG_S(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
+         }
+
+        for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
+         { 
+          tC=*pV++;
+
+          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+              (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
+              psxVuw[clutP+(tC&0x0f)]);
+         }
+
+        if(bWT)
+         {
+          tC=*pV;
+          GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
+         }
+       }
+      return;
+     }
+
+#endif
+
+    for (sprCY=0;sprCY<sprtH;sprCY++)
+     {
+      sprA=sprtYa+(sprCY<<10);
+      pV=&psxVub[(sprCY<<11)+textX0];
+
+      if(bWS)
+       {
+        tC=*pV++;
+        GetTextureTransColG_SPR(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
+       }
+
+      for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
+       { 
+        tC=*pV++;
+
+        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+            (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
+            psxVuw[clutP+(tC&0x0f)]);
+       }
+
+      if(bWT)
+       {
+        tC=*pV;
+        GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
+       }
+     }
+    return;
+
+   case 1:
+    clutP>>=1;sprtW--;
+    textX0+=(GlobalTextAddrX<<1) + (textY0<<11);
+
+#ifdef FASTSOLID
+
+    if(!bCheckMask && !DrawSemiTrans)
+     {
+      for(sprCY=0;sprCY<sprtH;sprCY++)
+       {
+        sprA=((sprtY+sprCY)<<10)+sprtX;
+        pV=&psxVub[(sprCY<<11)+textX0];
+        for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+         { 
+          tC = *pV++;tC2 = *pV++;
+          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+              (((int)psxVuw[clutP+tC2])<<16)|
+              psxVuw[clutP+tC]);
+         }
+        if(sprCX==sprtW)
+         GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
+       }
+      return;
+     }
+
+#endif
+
+    for(sprCY=0;sprCY<sprtH;sprCY++)
+     {
+      sprA=((sprtY+sprCY)<<10)+sprtX;
+      pV=&psxVub[(sprCY<<11)+textX0];
+      for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+       { 
+        tC = *pV++;tC2 = *pV++;
+        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+            (((int)psxVuw[clutP+tC2])<<16)|
+            psxVuw[clutP+tC]);
+       }
+      if(sprCX==sprtW)
+       GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
+     }
+    return;
+
+   case 2:
+
+    textX0+=(GlobalTextAddrX) + (textY0<<10);
+    sprtW--;
+
+#ifdef FASTSOLID
+
+    if(!bCheckMask && !DrawSemiTrans)
+     {
+      for (sprCY=0;sprCY<sprtH;sprCY++)
+       {
+        sprA=((sprtY+sprCY)<<10)+sprtX;
+
+        for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+         { 
+          GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+              (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
+              psxVuw[(sprCY<<10) + textX0 + sprCX]);
+         }
+        if(sprCX==sprtW)
+         GetTextureTransColG_S(&psxVuw[sprA],
+              psxVuw[(sprCY<<10) + textX0 + sprCX]);
+
+       }
+      return;
+     }
+
+#endif
+
+    for (sprCY=0;sprCY<sprtH;sprCY++)
+     {
+      sprA=((sprtY+sprCY)<<10)+sprtX;
+
+      for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+       { 
+        GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+            (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
+            psxVuw[(sprCY<<10) + textX0 + sprCX]);
+       }
+      if(sprCX==sprtW)
+       GetTextureTransColG_SPR(&psxVuw[sprA],
+            psxVuw[(sprCY<<10) + textX0 + sprCX]);
+
+     }
+    return;
+   }                
+}
+ 
+///////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+// LINE FUNCS
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+
+#if 0
+static void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+    int dx, dy, incrE, incrSE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+    dx = x1 - x0;
+    dy = y1 - y0;
+
+		if (dx > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dx;
+			dg = ((int)g1 - (int)g0) / dx;
+			db = ((int)b1 - (int)b0) / dx;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+    d = 2*dy - dx;              /* Initial value of d */
+    incrE = 2*dy;               /* incr. used for move to E */
+    incrSE = 2*(dy - dx);       /* incr. used for move to SE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    while(x0 < x1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrE;              /* Choose E */
+        }
+        else
+        {
+            d = d + incrSE;             /* Choose SE */
+            y0++;
+        }
+        x0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+    int dx, dy, incrS, incrSE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+    dx = x1 - x0;
+    dy = y1 - y0;
+
+		if (dy > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dy;
+			dg = ((int)g1 - (int)g0) / dy;
+			db = ((int)b1 - (int)b0) / dy;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+    d = 2*dx - dy;              /* Initial value of d */
+    incrS = 2*dx;               /* incr. used for move to S */
+    incrSE = 2*(dx - dy);       /* incr. used for move to SE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    while(y0 < y1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrS;              /* Choose S */
+        }
+        else
+        {
+            d = d + incrSE;             /* Choose SE */
+            x0++;
+        }
+        y0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+    int dx, dy, incrN, incrNE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+    dx = x1 - x0;
+    dy = -(y1 - y0);
+
+		if (dy > 0)
+		{
+			dr = ((uint32_t)r1 - (uint32_t)r0) / dy;
+			dg = ((uint32_t)g1 - (uint32_t)g0) / dy;
+			db = ((uint32_t)b1 - (uint32_t)b0) / dy;
+		}
+		else
+		{
+			dr = ((uint32_t)r1 - (uint32_t)r0);
+			dg = ((uint32_t)g1 - (uint32_t)g0);
+			db = ((uint32_t)b1 - (uint32_t)b0);
+		}
+
+    d = 2*dx - dy;              /* Initial value of d */
+    incrN = 2*dx;               /* incr. used for move to N */
+    incrNE = 2*(dx - dy);       /* incr. used for move to NE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    while(y0 > y1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrN;              /* Choose N */
+        }
+        else
+        {
+            d = d + incrNE;             /* Choose NE */
+            x0++;
+        }
+        y0--;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+    int dx, dy, incrE, incrNE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+    dx = x1 - x0;
+    dy = -(y1 - y0);
+
+		if (dx > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dx;
+			dg = ((int)g1 - (int)g0) / dx;
+			db = ((int)b1 - (int)b0) / dx;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+    d = 2*dy - dx;              /* Initial value of d */
+    incrE = 2*dy;               /* incr. used for move to E */
+    incrNE = 2*(dy - dx);       /* incr. used for move to NE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    while(x0 < x1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrE;              /* Choose E */
+        }
+        else
+        {
+            d = d + incrNE;             /* Choose NE */
+            y0--;
+        }
+        x0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+  int y, dy;
+	uint32_t r0, g0, b0, r1, g1, b1;
+	int dr, dg, db;
+
+	r0 = (rgb0 & 0x00ff0000);
+	g0 = (rgb0 & 0x0000ff00) << 8;
+	b0 = (rgb0 & 0x000000ff) << 16;
+	r1 = (rgb1 & 0x00ff0000);
+	g1 = (rgb1 & 0x0000ff00) << 8;
+	b1 = (rgb1 & 0x000000ff) << 16;
+
+	dy = (y1 - y0);
+
+	if (dy > 0)
+	{
+		dr = ((int)r1 - (int)r0) / dy;
+		dg = ((int)g1 - (int)g0) / dy;
+		db = ((int)b1 - (int)b0) / dy;
+	}
+	else
+	{
+		dr = ((int)r1 - (int)r0);
+		dg = ((int)g1 - (int)g0);
+		db = ((int)b1 - (int)b0);
+	}
+
+	if (y0 < drawY)
+	{
+		r0+=dr*(drawY - y0);
+		g0+=dg*(drawY - y0);
+		b0+=db*(drawY - y0);
+		y0 = drawY;
+	}
+
+	if (y1 > drawH)
+		y1 = drawH;
+
+  for (y = y0; y <= y1; y++)
+	{
+		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+		r0+=dr;
+		g0+=dg;
+		b0+=db;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
+{
+  int x, dx;
+	uint32_t r0, g0, b0, r1, g1, b1;
+	int dr, dg, db;
+
+	r0 = (rgb0 & 0x00ff0000);
+	g0 = (rgb0 & 0x0000ff00) << 8;
+	b0 = (rgb0 & 0x000000ff) << 16;
+	r1 = (rgb1 & 0x00ff0000);
+	g1 = (rgb1 & 0x0000ff00) << 8;
+	b1 = (rgb1 & 0x000000ff) << 16;
+
+	dx = (x1 - x0);
+
+	if (dx > 0)
+	{
+		dr = ((int)r1 - (int)r0) / dx;
+		dg = ((int)g1 - (int)g0) / dx;
+		db = ((int)b1 - (int)b0) / dx;
+	}
+	else
+	{
+		dr = ((int)r1 - (int)r0);
+		dg = ((int)g1 - (int)g0);
+		db = ((int)b1 - (int)b0);
+	}
+
+	if (x0 < drawX)
+	{
+		r0+=dr*(drawX - x0);
+		g0+=dg*(drawX - x0);
+		b0+=db*(drawX - x0);
+		x0 = drawX;
+	}
+
+	if (x1 > drawW)
+		x1 = drawW;
+
+  for (x = x0; x <= x1; x++)
+	{
+		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+		r0+=dr;
+		g0+=dg;
+		b0+=db;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+    int dx, dy, incrE, incrSE, d, x, y;
+
+    dx = x1 - x0;
+    dy = y1 - y0;
+    d = 2*dy - dx;              /* Initial value of d */
+    incrE = 2*dy;               /* incr. used for move to E */
+    incrSE = 2*(dy - dx);       /* incr. used for move to SE */
+    x = x0;
+    y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    while(x < x1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrE;              /* Choose E */
+            x++;
+        }
+        else
+        {
+            d = d + incrSE;             /* Choose SE */
+            x++;
+            y++;
+        }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+    int dx, dy, incrS, incrSE, d, x, y;
+
+    dx = x1 - x0;
+    dy = y1 - y0;
+    d = 2*dx - dy;              /* Initial value of d */
+    incrS = 2*dx;               /* incr. used for move to S */
+    incrSE = 2*(dx - dy);       /* incr. used for move to SE */
+    x = x0;
+    y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    while(y < y1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrS;              /* Choose S */
+            y++;
+        }
+        else
+        {
+            d = d + incrSE;             /* Choose SE */
+            x++;
+            y++;
+        }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+    int dx, dy, incrN, incrNE, d, x, y;
+
+    dx = x1 - x0;
+    dy = -(y1 - y0);
+    d = 2*dx - dy;              /* Initial value of d */
+    incrN = 2*dx;               /* incr. used for move to N */
+    incrNE = 2*(dx - dy);       /* incr. used for move to NE */
+    x = x0;
+    y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    while(y > y1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrN;              /* Choose N */
+            y--;
+        }
+        else
+        {
+            d = d + incrNE;             /* Choose NE */
+            x++;
+            y--;
+        }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+    int dx, dy, incrE, incrNE, d, x, y;
+
+    dx = x1 - x0;
+    dy = -(y1 - y0);
+    d = 2*dy - dx;              /* Initial value of d */
+    incrE = 2*dy;               /* incr. used for move to E */
+    incrNE = 2*(dy - dx);       /* incr. used for move to NE */
+    x = x0;
+    y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    while(x < x1)
+    {
+        if (d <= 0)
+        {
+            d = d + incrE;              /* Choose E */
+            x++;
+        }
+        else
+        {
+            d = d + incrNE;             /* Choose NE */
+            x++;
+            y--;
+        }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void VertLineFlat(int x, int y0, int y1, unsigned short colour)
+{
+	int y;
+
+	if (y0 < drawY)
+		y0 = drawY;
+
+	if (y1 > drawH)
+		y1 = drawH;
+
+  for (y = y0; y <= y1; y++)
+		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
+{
+	int x;
+
+	if (x0 < drawX)
+		x0 = drawX;
+
+	if (x1 > drawW)
+		x1 = drawW;
+
+	for (x = x0; x <= x1; x++)
+		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+}
+
+///////////////////////////////////////////////////////////////////////
+
+/* Bresenham Line drawing function */
+static void DrawSoftwareLineShade(int rgb0, int rgb1)
+{
+	short x0, y0, x1, y1, xt, yt;
+	int rgbt;
+	double m, dy, dx;
+
+	if(lx0>drawW && lx1>drawW) return;
+	if(ly0>drawH && ly1>drawH) return;
+	if(lx0<drawX && lx1<drawX) return;
+	if(ly0<drawY && ly1<drawY) return;
+	if(drawY>=drawH) return;
+	if(drawX>=drawW) return; 
+
+	x0 = lx0;
+	y0 = ly0;
+	x1 = lx1;
+	y1 = ly1;
+
+	dx = x1 - x0;
+	dy = y1 - y0;
+
+	if (dx == 0)
+	{
+		if (dy > 0)
+			VertLineShade(x0, y0, y1, rgb0, rgb1);
+		else
+			VertLineShade(x0, y1, y0, rgb1, rgb0);
+	}
+	else
+		if (dy == 0)
+		{
+			if (dx > 0)
+				HorzLineShade(y0, x0, x1, rgb0, rgb1);
+			else
+				HorzLineShade(y0, x1, x0, rgb1, rgb0);
+		}
+		else
+		{
+			if (dx < 0)
+			{
+				xt = x0;
+				yt = y0;
+				rgbt = rgb0;
+				x0 = x1;
+				y0 = y1;
+				rgb0 = rgb1;
+				x1 = xt;
+				y1 = yt;
+				rgb1 = rgbt;
+
+				dx = x1 - x0;
+				dy = y1 - y0;
+			}
+
+			m = dy/dx;
+
+			if (m >= 0)
+			{
+				if (m > 1)
+					Line_S_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+				else
+					Line_E_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+			}
+			else
+				if (m < -1)
+					Line_N_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+				else
+					Line_E_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+		}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void DrawSoftwareLineFlat(int rgb)
+{
+	short x0, y0, x1, y1, xt, yt;
+	double m, dy, dx;
+	unsigned short colour = 0;
+ 
+	if(lx0>drawW && lx1>drawW) return;
+	if(ly0>drawH && ly1>drawH) return;
+	if(lx0<drawX && lx1<drawX) return;
+	if(ly0<drawY && ly1<drawY) return;
+	if(drawY>=drawH) return;
+	if(drawX>=drawW) return; 
+
+	colour = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+
+	x0 = lx0;
+	y0 = ly0;
+	x1 = lx1;
+	y1 = ly1;
+
+	dx = x1 - x0;
+	dy = y1 - y0;
+
+	if (dx == 0)
+	{
+		if (dy == 0)
+			return; // Nothing to draw
+		else if (dy > 0)
+			VertLineFlat(x0, y0, y1, colour);
+		else
+			VertLineFlat(x0, y1, y0, colour);
+	}
+	else
+		if (dy == 0)
+		{
+			if (dx > 0)
+				HorzLineFlat(y0, x0, x1, colour);
+			else
+				HorzLineFlat(y0, x1, x0, colour);
+		}
+		else
+		{
+			if (dx < 0)
+			{
+				xt = x0;
+				yt = y0;
+				x0 = x1;
+				y0 = y1;
+				x1 = xt;
+				y1 = yt;
+
+				dx = x1 - x0;
+				dy = y1 - y0;
+			}
+
+			m = dy/dx;
+
+			if (m >= 0)
+			{
+				if (m > 1)
+					Line_S_SE_Flat(x0, y0, x1, y1, colour);
+				else
+					Line_E_SE_Flat(x0, y0, x1, y1, colour);
+			}
+			else
+				if (m < -1)
+					Line_N_NE_Flat(x0, y0, x1, y1, colour);
+				else
+					Line_E_NE_Flat(x0, y0, x1, y1, colour);
+		}
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////
diff --git a/plugins/peopsxgl/texture.c b/plugins/peopsxgl/texture.c
index c287768f..f247175a 100644
--- a/plugins/peopsxgl/texture.c
+++ b/plugins/peopsxgl/texture.c
@@ -1,62 +1,62 @@
-/***************************************************************************

-                          texture.c  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

+/***************************************************************************
+                          texture.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "stdafx.h"
   
 ////////////////////////////////////////////////////////////////////////////////////
 // Texture related functions are here !
-//

-// The texture handling is heart and soul of this gpu. The plugin was developed

-// 1999, by this time no shaders were available. Since the psx gpu is making

-// heavy use of CLUT (="color lookup tables", aka palettized textures), it was 

-// an interesting task to get those emulated at good speed on NV TNT cards 

-// (which was my major goal when I created the first "gpuPeteTNT"). Later cards 

-// (Geforce256) supported texture palettes by an OGL extension, but at some point

-// this support was dropped again by gfx card vendors.

-// Well, at least there is a certain advatage, if no texture palettes extension can

-// be used: it is possible to modify the textures in any way, allowing "hi-res" 

-// textures and other tweaks.

-//

-// My main texture caching is kinda complex: the plugin is allocating "n" 256x256 textures,

-// and it places small psx texture parts inside them. The plugin keeps track what 

-// part (with what palette) it had placed in which texture, so it can re-use this 

-// part again. The more ogl textures it can use, the better (of course the managing/

-// searching will be slower, but everything is faster than uploading textures again

-// and again to a gfx card). My first card (TNT1) had 16 MB Vram, and it worked

-// well with many games, but I recommend nowadays 64 MB Vram to get a good speed.

-//

-// Sadly, there is also a second kind of texture cache needed, for "psx texture windows".

-// Those are "repeated" textures, so a psx "texture window" needs to be put in 

-// a whole texture to use the GL_TEXTURE_WRAP_ features. This cache can get full very

-// fast in games which are having an heavy "texture window" usage, like RRT4. As an 

-// alternative, this plugin can use the OGL "palette" extension on texture windows, 

-// if available. Nowadays also a fragment shader can easily be used to emulate

-// texture wrapping in a texture atlas, so the main cache could hold the texture

-// windows as well (that's what I am doing in the OGL2 plugin). But currently the

-// OGL1 plugin is a "shader-free" zone, so heavy "texture window" games will cause

-// much texture uploads.

-//

-// Some final advice: take care if you change things in here. I've removed my ASM

-// handlers (they didn't cause much speed gain anyway) for readability/portability,

-// but still the functions/data structures used here are easy to mess up. I guess it

-// can be a pain in the ass to port the plugin to another byte order :)

-//

-////////////////////////////////////////////////////////////////////////////////////

+//
+// The texture handling is heart and soul of this gpu. The plugin was developed
+// 1999, by this time no shaders were available. Since the psx gpu is making
+// heavy use of CLUT (="color lookup tables", aka palettized textures), it was 
+// an interesting task to get those emulated at good speed on NV TNT cards 
+// (which was my major goal when I created the first "gpuPeteTNT"). Later cards 
+// (Geforce256) supported texture palettes by an OGL extension, but at some point
+// this support was dropped again by gfx card vendors.
+// Well, at least there is a certain advatage, if no texture palettes extension can
+// be used: it is possible to modify the textures in any way, allowing "hi-res" 
+// textures and other tweaks.
+//
+// My main texture caching is kinda complex: the plugin is allocating "n" 256x256 textures,
+// and it places small psx texture parts inside them. The plugin keeps track what 
+// part (with what palette) it had placed in which texture, so it can re-use this 
+// part again. The more ogl textures it can use, the better (of course the managing/
+// searching will be slower, but everything is faster than uploading textures again
+// and again to a gfx card). My first card (TNT1) had 16 MB Vram, and it worked
+// well with many games, but I recommend nowadays 64 MB Vram to get a good speed.
+//
+// Sadly, there is also a second kind of texture cache needed, for "psx texture windows".
+// Those are "repeated" textures, so a psx "texture window" needs to be put in 
+// a whole texture to use the GL_TEXTURE_WRAP_ features. This cache can get full very
+// fast in games which are having an heavy "texture window" usage, like RRT4. As an 
+// alternative, this plugin can use the OGL "palette" extension on texture windows, 
+// if available. Nowadays also a fragment shader can easily be used to emulate
+// texture wrapping in a texture atlas, so the main cache could hold the texture
+// windows as well (that's what I am doing in the OGL2 plugin). But currently the
+// OGL1 plugin is a "shader-free" zone, so heavy "texture window" games will cause
+// much texture uploads.
+//
+// Some final advice: take care if you change things in here. I've removed my ASM
+// handlers (they didn't cause much speed gain anyway) for readability/portability,
+// but still the functions/data structures used here are easy to mess up. I guess it
+// can be a pain in the ass to port the plugin to another byte order :)
+//
+////////////////////////////////////////////////////////////////////////////////////
  
 #define _IN_TEXTURE
 
@@ -80,9 +80,9 @@ GLuint        gTexFrameName=0;
 int           iTexGarbageCollection=1;
 uint32_t      dwTexPageComp=0;
 int           iVRamSize=0;
-int           iClampType=GL_CLAMP;

+int           iClampType=GL_CLAMP;
 
-void               (*LoadSubTexFn) (int,int,short,short);

+void               (*LoadSubTexFn) (int,int,short,short);
 uint32_t           (*PalTexturedColourFn)  (uint32_t);
 
 ////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,7 @@ uint32_t           (*PalTexturedColourFn)  (uint32_t);
 #define SOFFD 3072
 
 #define MAXWNDTEXCACHE 128
-

+
 #define XCHECK(pos1,pos2) ((pos1.c[0]>=pos2.c[1])&&(pos1.c[1]<=pos2.c[0])&&(pos1.c[2]>=pos2.c[3])&&(pos1.c[3]<=pos2.c[2]))
 #define INCHECK(pos2,pos1) ((pos1.c[0]<=pos2.c[0]) && (pos1.c[1]>=pos2.c[1]) && (pos1.c[2]<=pos2.c[2]) && (pos1.c[3]>=pos2.c[3]))
 
@@ -145,13 +145,13 @@ unsigned short (*PTCF[2]) (unsigned short);
 
 ////////////////////////////////////////////////////////////////////////
 // texture cache implementation
-////////////////////////////////////////////////////////////////////////

+////////////////////////////////////////////////////////////////////////
 
-#ifdef _WINDOWS

-#pragma pack(1)

-#endif

-

-// "texture window" cache entry

+#ifdef _WINDOWS
+#pragma pack(1)
+#endif
+
+// "texture window" cache entry
 
 typedef struct textureWndCacheEntryTag
 {
@@ -163,8 +163,8 @@ typedef struct textureWndCacheEntryTag
  EXLong         pos;
  GLuint         texname;
 } textureWndCacheEntry;
-

-// "standard texture" cache entry (12 byte per entry, as small as possible... we need lots of them)

+
+// "standard texture" cache entry (12 byte per entry, as small as possible... we need lots of them)
 
 typedef struct textureSubCacheEntryTagS 
 {
@@ -175,18 +175,18 @@ typedef struct textureSubCacheEntryTagS
  unsigned char   cTexID;
  unsigned char   Opaque;
 } textureSubCacheEntryS;
-

-#ifdef _WINDOWS

-#pragma pack()

-#endif

-
-//---------------------------------------------

-

-#define MAXTPAGES_MAX  64

-#define MAXSORTTEX_MAX 196

-

-//---------------------------------------------

-

+
+#ifdef _WINDOWS
+#pragma pack()
+#endif
+
+//---------------------------------------------
+
+#define MAXTPAGES_MAX  64
+#define MAXSORTTEX_MAX 196
+
+//---------------------------------------------
+
 textureWndCacheEntry     wcWndtexStore[MAXWNDTEXCACHE];
 textureSubCacheEntryS *  pscSubtexStore[3][MAXTPAGES_MAX];
 EXLong *                 pxSsubtexLeft [MAXSORTTEX_MAX];
@@ -202,14 +202,14 @@ GLubyte *                texturepart = NULL;
 GLubyte *                texturebuffer = NULL;
 uint32_t                 g_x1,g_y1,g_x2,g_y2;
 unsigned char            ubOpaqueDraw = 0;
-

-unsigned short MAXTPAGES     = 32;

-unsigned short CLUTMASK      = 0x7fff;

-unsigned short CLUTYMASK     = 0x1ff;

-unsigned short MAXSORTTEX    = 196;

-

+
+unsigned short MAXTPAGES     = 32;
+unsigned short CLUTMASK      = 0x7fff;
+unsigned short CLUTYMASK     = 0x1ff;
+unsigned short MAXSORTTEX    = 196;
+
 ////////////////////////////////////////////////////////////////////////
-// Texture color conversions... all my ASM funcs are removed for easier

+// Texture color conversions... all my ASM funcs are removed for easier
 // porting... and honestly: nowadays the speed gain would be pointless 
 ////////////////////////////////////////////////////////////////////////
 
@@ -526,7 +526,7 @@ void CheckTextureMemory(void)
  glBindTexture(GL_TEXTURE_2D,0);
 
  free(p);
-

+
  bDetail=malloc(MAXSORTTEX*sizeof(GLboolean));
  memset(bDetail,0,MAXSORTTEX*sizeof(GLboolean));
  b=glAreTexturesResident(MAXSORTTEX,uiStexturePage,bDetail);
@@ -537,9 +537,9 @@ void CheckTextureMemory(void)
   {
    if(bDetail[i]) iCnt++;
    uiStexturePage[i]=0;
-  }

-

- free(bDetail);

+  }
+
+ free(bDetail);
 
  if(b) iSortTexCnt=MAXSORTTEX-min(1,iHiResTextures);
  else  iSortTexCnt=iCnt-3+min(1,iHiResTextures);       // place for menu&texwnd
@@ -552,24 +552,24 @@ void CheckTextureMemory(void)
 ////////////////////////////////////////////////////////////////////////
 
 void InitializeTextureStore() 
-{

- int i,j;

-

- if(iGPUHeight==1024)

-  {

-   MAXTPAGES     = 64;

-   CLUTMASK      = 0xffff;

-   CLUTYMASK     = 0x3ff;

-   MAXSORTTEX    = 128;

-   iTexGarbageCollection=0;

-  }

- else

-  {

-   MAXTPAGES     = 32;

-   CLUTMASK      = 0x7fff;

-   CLUTYMASK     = 0x1ff;

-   MAXSORTTEX    = 196;

-  }

+{
+ int i,j;
+
+ if(iGPUHeight==1024)
+  {
+   MAXTPAGES     = 64;
+   CLUTMASK      = 0xffff;
+   CLUTYMASK     = 0x3ff;
+   MAXSORTTEX    = 128;
+   iTexGarbageCollection=0;
+  }
+ else
+  {
+   MAXTPAGES     = 32;
+   CLUTMASK      = 0x7fff;
+   CLUTYMASK     = 0x1ff;
+   MAXSORTTEX    = 196;
+  }
 
  memset(vertex,0,4*sizeof(OGLVertex));                 // init vertices
 
@@ -707,7 +707,7 @@ void ResetTextureArea(BOOL bDelTex)
 // Invalidate tex windows
 ////////////////////////////////////////////////////////////////////////
 
-void InvalidateWndTextureArea(int X, int Y, int W, int H)
+static void InvalidateWndTextureArea(int X, int Y, int W, int H)
 {
  int i,px1,px2,py1,py2,iYM=1;
  textureWndCacheEntry * tsw=wcWndtexStore;
@@ -715,15 +715,15 @@ void InvalidateWndTextureArea(int X, int Y, int W, int H)
  W+=X-1;      
  H+=Y-1;
  if(X<0) X=0;if(X>1023) X=1023;
- if(W<0) W=0;if(W>1023) W=1023;

- if(Y<0) Y=0;if(Y>iGPUHeightMask)  Y=iGPUHeightMask;

- if(H<0) H=0;if(H>iGPUHeightMask)  H=iGPUHeightMask;

+ if(W<0) W=0;if(W>1023) W=1023;
+ if(Y<0) Y=0;if(Y>iGPUHeightMask)  Y=iGPUHeightMask;
+ if(H<0) H=0;if(H>iGPUHeightMask)  H=iGPUHeightMask;
  W++;H++;
-

- if(iGPUHeight==1024) iYM=3;

-

- py1=min(iYM,Y>>8);

- py2=min(iYM,H>>8);                                    // y: 0 or 1

+
+ if(iGPUHeight==1024) iYM=3;
+
+ py1=min(iYM,Y>>8);
+ py2=min(iYM,H>>8);                                    // y: 0 or 1
 
  px1=max(0,(X>>6));
  px2=min(15,(W>>6));
@@ -769,7 +769,7 @@ void InvalidateWndTextureArea(int X, int Y, int W, int H)
 // same for sort textures
 ////////////////////////////////////////////////////////////////////////
 
-void MarkFree(textureSubCacheEntryS * tsx)
+static void MarkFree(textureSubCacheEntryS * tsx)
 {
  EXLong * ul, * uls;
  int j,iMax;unsigned char x1,y1,dx,dy;
@@ -798,7 +798,7 @@ void MarkFree(textureSubCacheEntryS * tsx)
   }
 }
 
-void InvalidateSubSTextureArea(int X, int Y, int W, int H)
+static void InvalidateSubSTextureArea(int X, int Y, int W, int H)
 {
  int i,j,k,iMax,px,py,px1,px2,py1,py2,iYM = 1;
  EXLong npos;
@@ -808,16 +808,16 @@ void InvalidateSubSTextureArea(int X, int Y, int W, int H)
  W+=X-1;      
  H+=Y-1;
  if(X<0) X=0;if(X>1023) X=1023;
- if(W<0) W=0;if(W>1023) W=1023;

- if(Y<0) Y=0;if(Y>iGPUHeightMask)  Y=iGPUHeightMask;

- if(H<0) H=0;if(H>iGPUHeightMask)  H=iGPUHeightMask;

+ if(W<0) W=0;if(W>1023) W=1023;
+ if(Y<0) Y=0;if(Y>iGPUHeightMask)  Y=iGPUHeightMask;
+ if(H<0) H=0;if(H>iGPUHeightMask)  H=iGPUHeightMask;
  W++;H++;
-

- if(iGPUHeight==1024) iYM=3;

 
- py1=min(iYM,Y>>8);

- py2=min(iYM,H>>8);                                    // y: 0 or 1

- px1=max(0,(X>>6)-3);                                   

+ if(iGPUHeight==1024) iYM=3;
+
+ py1=min(iYM,Y>>8);
+ py2=min(iYM,H>>8);                                    // y: 0 or 1
+ px1=max(0,(X>>6)-3);                                   
  px2=min(15,(W>>6)+3);                                 // x: 0-15
 
  for(py=py1;py<=py2;py++)
@@ -847,10 +847,10 @@ void InvalidateSubSTextureArea(int X, int Y, int W, int H)
        if(X>x1)  x1=X;
        if(W<x2)  x2=W;
        if(x2<x1) {sw=x1;x1=x2;x2=sw;}
-

-       if (dwGPUVersion == 2)

-        npos.l=0x00ff00ff;

-       else

+
+       if (dwGPUVersion == 2)
+        npos.l=0x00ff00ff;
+       else
         npos.l=((x1-xa)<<(26-k))|((x2-xa)<<(18-k))|y1|y2;
 
         {
@@ -917,7 +917,7 @@ void InvalidateTextureArea(int X, int Y, int W, int H)
 // tex window: define
 ////////////////////////////////////////////////////////////////////////
 
-void DefineTextureWnd(void)
+static void DefineTextureWnd(void)
 {
  if (gTexName == 0)
   glGenTextures(1, &gTexName);
@@ -948,7 +948,7 @@ void DefineTextureWnd(void)
 // tex window: load packed stretch
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t        start, row, column, j, sxh, sxm, ldx, ldy, ldxo;
  unsigned int    palstart;
@@ -975,41 +975,41 @@ void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-      for(row=0;row<16;row++)

-       *px++=LPTCOL(*wSRCPtr++);

-

-      column=g_y2-ldy;

-      for(TXV=g_y1;TXV<=column;TXV++)

-       {

-        ldx=ldxo;

-        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-          *ta++=s;

-

-          if(ldx) {*ta++=s;ldx--;}

-         }

-

-        if(ldy) 

-         {ldy--;

-          for(TXU=g_x1;TXU<=g_x2;TXU++)

-           *ta++=*(ta-(g_x2-g_x1));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

+   case 0:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+      for(row=0;row<16;row++)
+       *px++=LPTCOL(*wSRCPtr++);
+
+      column=g_y2-ldy;
+      for(TXV=g_y1;TXV<=column;TXV++)
+       {
+        ldx=ldxo;
+        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+          *ta++=s;
+
+          if(ldx) {*ta++=s;ldx--;}
+         }
+
+        if(ldy) 
+         {ldy--;
+          for(TXU=g_x1;TXU<=g_x2;TXU++,ta++)
+           *ta=*(ta-(g_x2-g_x1));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
 
 
     start=((pageid-16*pmult)*128)+256*2048*pmult;
@@ -1052,45 +1052,45 @@ void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-      for(row=0;row<256;row++)

-       *px++=LPTCOL(*wSRCPtr++);

-

-      column=g_y2-ldy;

-      for(TXV=g_y1;TXV<=column;TXV++)

-       {

-        ldx=ldxo;

-        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-

-          *ta++=s;

-          if(ldx) {*ta++=s;ldx--;}

-         }

-

-        if(ldy) 

-         {ldy--;

-          for(TXU=g_x1;TXU<=g_x2;TXU++)

-           *ta++=*(ta-(g_x2-g_x1));

-         }

-

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

-

+   case 1:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+      for(row=0;row<256;row++)
+       *px++=LPTCOL(*wSRCPtr++);
+
+      column=g_y2-ldy;
+      for(TXV=g_y1;TXV<=column;TXV++)
+       {
+        ldx=ldxo;
+        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+
+          *ta++=s;
+          if(ldx) {*ta++=s;ldx--;}
+         }
+
+        if(ldy) 
+         {ldy--;
+          for(TXU=g_x1;TXU<=g_x2;TXU++,ta++)
+           *ta=*(ta-(g_x2-g_x1));
+         }
+
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
+
     start=((pageid-16*pmult)*128)+256*2048*pmult;
-

+
     // not using a lookup table here... speeds up smaller texture areas
     cSRCPtr = psxVub + start + (2048*g_y1) + g_x1;
     LineOffset = 2048 - (g_x2-g_x1+1) +ldxo; 
@@ -1141,7 +1141,7 @@ void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
 // tex window: load stretched
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t       start,row,column,j,sxh,sxm,ldx,ldy,ldxo,s;
  unsigned int   palstart;
@@ -1167,53 +1167,53 @@ void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    //------------------- ZN STUFF

-

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=4;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      column=g_y2-ldy;

-      for(TXV=g_y1;TXV<=column;TXV++)

-       {

-        ldx=ldxo;

-        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-          *ta++=s;

-

-          if(ldx) {*ta++=s;ldx--;}

-         }

-

-        if(ldy) 

-         {ldy--;

-          for(TXU=g_x1;TXU<=g_x2;TXU++)

-           *ta++=*(ta-(g_x2-g_x1));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

-

-    //-------------------

+   case 0:
+    //------------------- ZN STUFF
+
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=4;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      column=g_y2-ldy;
+      for(TXV=g_y1;TXV<=column;TXV++)
+       {
+        ldx=ldxo;
+        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+          *ta++=s;
+
+          if(ldx) {*ta++=s;ldx--;}
+         }
+
+        if(ldy) 
+         {ldy--;
+          for(TXU=g_x1;TXU<=g_x2;TXU++,ta++)
+           *ta=*(ta-(g_x2-g_x1));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
+
+    //-------------------
 
     start=((pageid-16*pmult)*128)+256*2048*pmult;
     // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -1253,51 +1253,51 @@ void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------//
    // 8bit texture load ..
-   case 1:

-    //------------ ZN STUFF

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=64;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      column=g_y2-ldy;

-      for(TXV=g_y1;TXV<=column;TXV++)

-       {

-        ldx=ldxo;

-        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-          *ta++=s;

-          if(ldx) {*ta++=s;ldx--;}

-         }

-

-        if(ldy) 

-         {ldy--;

-          for(TXU=g_x1;TXU<=g_x2;TXU++)

-           *ta++=*(ta-(g_x2-g_x1));

-         }

-

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

-    //------------

+   case 1:
+    //------------ ZN STUFF
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=64;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      column=g_y2-ldy;
+      for(TXV=g_y1;TXV<=column;TXV++)
+       {
+        ldx=ldxo;
+        for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+          *ta++=s;
+          if(ldx) {*ta++=s;ldx--;}
+         }
+
+        if(ldy) 
+         {ldy--;
+          for(TXU=g_x1;TXU<=g_x2;TXU++,ta++)
+           *ta=*(ta-(g_x2-g_x1));
+         }
+
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
+    //------------
 
     start=((pageid-16*pmult)*128)+256*2048*pmult;    
 
@@ -1352,7 +1352,7 @@ void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
 // tex window: load packed simple
 ////////////////////////////////////////////////////////////////////////
 
-void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t       start,row,column,j,sxh,sxm;
  unsigned int   palstart;
@@ -1375,30 +1375,30 @@ void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-      for(row=0;row<16;row++)

-       *px++=LPTCOL(*wSRCPtr++);

-

-      for(TXV=g_y1;TXV<=g_y2;TXV++)

-       {

-        for(TXU=g_x1;TXU<=g_x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

+   case 0:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+      for(row=0;row<16;row++)
+       *px++=LPTCOL(*wSRCPtr++);
+
+      for(TXV=g_y1;TXV<=g_y2;TXV++)
+       {
+        for(TXU=g_x1;TXU<=g_x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
 
     start=((pageid-16*pmult)*128)+256*2048*pmult;
 
@@ -1429,30 +1429,30 @@ void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-      for(row=0;row<256;row++)

-       *px++=LPTCOL(*wSRCPtr++);

-

-      for(TXV=g_y1;TXV<=g_y2;TXV++)

-       {

-        for(TXU=g_x1;TXU<=g_x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

+   case 1:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+      for(row=0;row<256;row++)
+       *px++=LPTCOL(*wSRCPtr++);
+
+      for(TXV=g_y1;TXV<=g_y2;TXV++)
+       {
+        for(TXU=g_x1;TXU<=g_x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
 
     start=((pageid-16*pmult)*128)+256*2048*pmult;
 
@@ -1494,7 +1494,7 @@ void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
 // tex window: load simple
 ////////////////////////////////////////////////////////////////////////
 
-void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t       start,row,column,j,sxh,sxm;
  unsigned int   palstart;
@@ -1517,39 +1517,39 @@ void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=4;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=g_y1;TXV<=g_y2;TXV++)

-       {

-        for(TXU=g_x1;TXU<=g_x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

-

+   case 0:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=4;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=g_y1;TXV<=g_y2;TXV++)
+       {
+        for(TXU=g_x1;TXU<=g_x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
+
     start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -1579,39 +1579,39 @@ void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------//
    // 8bit texture load ..
-   case 1:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=64;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=g_y1;TXV<=g_y2;TXV++)

-       {

-        for(TXU=g_x1;TXU<=g_x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-         }

-       }

-

-      DefineTextureWnd();

-

-      break;

-     }

-

+   case 1:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=64;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=g_y1;TXV<=g_y2;TXV++)
+       {
+        for(TXU=g_x1;TXU<=g_x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+         }
+       }
+
+      DefineTextureWnd();
+
+      break;
+     }
+
     start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     // not using a lookup table here... speeds up smaller texture areas
@@ -1654,7 +1654,7 @@ void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-void UploadTexWndPal(int mode,short cx,short cy)
+static void UploadTexWndPal(int mode,short cx,short cy)
 {
  unsigned int i,iSize;
  unsigned short *wSrcPtr;
@@ -1681,7 +1681,7 @@ void UploadTexWndPal(int mode,short cx,short cy)
 
 ////////////////////////////////////////////////////////////////////////
 
-void DefinePalTextureWnd(void)
+static void DefinePalTextureWnd(void)
 {
  if(gTexName==0)
   glGenTextures(1, &gTexName);
@@ -1710,12 +1710,12 @@ void DefinePalTextureWnd(void)
 
 ///////////////////////////////////////////////////////
 
-void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t       start,row,column,j,sxh,sxm;
  unsigned char  *ta;
  unsigned char  *cSRCPtr;
- uint32_t       LineOffset;

+ uint32_t       LineOffset;
  int            pmult = pageid / 16;
 
  ta = (unsigned char *)texturepart;
@@ -1724,8 +1724,8 @@ void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    start=((pageid-16*pmult)*128)+256*2048*pmult;

+   case 0:
+    start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     sxm=g_x1&1;sxh=g_x1>>1;
     if(sxm) j=g_x1+1; else j=g_x1;
@@ -1748,7 +1748,7 @@ void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

+   case 1:
     start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     // not using a lookup table here... speeds up smaller texture areas
@@ -1770,13 +1770,13 @@ void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
 
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)
+static void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)
 {
  uint32_t       start,row,column,j,sxh,sxm,ldx,ldy,ldxo;
  unsigned char  *ta,s;
  unsigned char  *cSRCPtr,*cOSRCPtr;
  uint32_t       LineOffset;
- int            pmult = pageid / 16;

+ int            pmult = pageid / 16;
 
  ldxo = TWin.Position.x1-TWin.OPosition.x1;
  ldy  = TWin.Position.y1-TWin.OPosition.y1;
@@ -1788,7 +1788,7 @@ void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)
    //--------------------------------------------------// 
    // 4bit texture load ..
    case 0:
-    start=((pageid-16*pmult)*128)+256*2048*pmult;

+    start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     sxm=g_x1&1;sxh=g_x1>>1;
     if(sxm) j=g_x1+1; else j=g_x1;
@@ -1821,8 +1821,8 @@ void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

-    start=((pageid-16*pmult)*128)+256*2048*pmult;

+   case 1:
+    start=((pageid-16*pmult)*128)+256*2048*pmult;
 
     cSRCPtr = psxVub + start + (2048*g_y1) + g_x1;
     LineOffset = 2048 - (g_x2-g_x1+1) +ldxo; 
@@ -1871,7 +1871,7 @@ GLuint LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId)
    cx = ((GivenClutId << 4) & 0x3F0);
    cy = ((GivenClutId >> 6) & CLUTYMASK);
    GivenClutId = (GivenClutId & CLUTMASK) | (DrawSemiTrans << 30);
-

+
    // palette check sum
     {
      uint32_t l = 0,row;
@@ -1974,7 +1974,7 @@ GLuint LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId)
 // movie texture: define
 ////////////////////////////////////////////////////////////////////////
 
-void DefinePackedTextureMovie(void)
+static void DefinePackedTextureMovie(void)
 {
  if(gTexMovieName==0)
   {
@@ -2015,7 +2015,7 @@ void DefinePackedTextureMovie(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-void DefineTextureMovie(void)
+static void DefineTextureMovie(void)
 {
  if(gTexMovieName==0)
   {
@@ -2110,7 +2110,7 @@ unsigned char * LoadDirectMovieFast(void)
 
 ////////////////////////////////////////////////////////////////////////
 
-GLuint LoadTextureMovieFast(void)
+static GLuint LoadTextureMovieFast(void)
 {
  int row,column;
  unsigned int start,startxy;
@@ -2130,7 +2130,7 @@ GLuint LoadTextureMovieFast(void)
       {
        pD=(unsigned char *)&psxVuw[startxy];
        startxy+=1024;
-

+
        for(row=xrMovieArea.x0;row<sx0;row+=2)
         {
          lu1=*((uint32_t *)pD);pD+=3;
@@ -2145,7 +2145,7 @@ GLuint LoadTextureMovieFast(void)
         {
          lu1=*((uint32_t *)pD);
          *ta++=XMBLUE(lu1)|XMGREEN(lu1)|XMRED(lu1)|1;
-        }

+        }
       }
     }
    else
@@ -2247,14 +2247,16 @@ GLuint LoadTextureMovie(void)
            lu=*((uint32_t *)pD);pD+=3;
            *ta++=XMBLUE(lu)|XMGREEN(lu)|XMRED(lu)|1;
          }
-         *ta++=*(ta-1);
+         *ta=*(ta-1);
+	 ta++;
         }
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
-         *ta++=*(ta-1);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
+         *ta=*(ta-1);
+	 ta++;
         }
       }
      else
@@ -2272,8 +2274,8 @@ GLuint LoadTextureMovie(void)
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
         }
       }
     }
@@ -2296,14 +2298,16 @@ GLuint LoadTextureMovie(void)
            *ta++=((c&0x1f)<<11)|((c&0x3e0)<<1)|((c&0x7c00)>>9)|1;
           }
 
-         *ta++=*(ta-1);
+         *ta=*(ta-1);
+	 ta++;
         }
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
-         *ta++=*(ta-1);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
+         *ta=*(ta-1);
+	 ta++;
         }
       }
      else
@@ -2320,8 +2324,8 @@ GLuint LoadTextureMovie(void)
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
         }
       }
     }
@@ -2347,14 +2351,16 @@ GLuint LoadTextureMovie(void)
            *ta++=*((uint32_t *)pD)|0xff000000;
            pD+=3;
           }
-         *ta++=*(ta-1);
+         *ta=*(ta-1);
+	 ta++;
         }
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
-         *ta++=*(ta-1);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
+         *ta=*(ta-1);
+	 ta++;
         }
       }
      else
@@ -2372,8 +2378,8 @@ GLuint LoadTextureMovie(void)
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
         }
       }
     }
@@ -2392,17 +2398,19 @@ GLuint LoadTextureMovie(void)
        for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)
         {
          startxy=((1024)*column)+xrMovieArea.x0;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=LTCOL(psxVuw[startxy++]|0x8000);
-         *ta++=*(ta-1);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=LTCOL(psxVuw[startxy++]|0x8000);
+         *ta=*(ta-1);
+	 ta++;
         }
 
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
-         *ta++=*(ta-1);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
+         *ta=*(ta-1);
+	 ta++;
         }
       }
      else
@@ -2417,8 +2425,8 @@ GLuint LoadTextureMovie(void)
        if(b_Y)
         {
          dx=xrMovieArea.x1-xrMovieArea.x0;
-         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-          *ta++=*(ta-dx);
+         for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++,ta++)
+          *ta=*(ta-dx);
         }
       }
     }
@@ -2434,7 +2442,7 @@ GLuint LoadTextureMovie(void)
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
-GLuint BlackFake15BitTexture(void)
+static GLuint BlackFake15BitTexture(void)
 {
  int pmult;short x1,x2,y1,y2;
 
@@ -2511,7 +2519,7 @@ BOOL bIgnoreNextTile =FALSE;
 
 int iFTex=512;
 
-GLuint Fake15BitTexture(void)
+static GLuint Fake15BitTexture(void)
 {
  int pmult;short x1,x2,y1,y2;int iYAdjust;
  float ScaleX,ScaleY;RECT rSrc;
@@ -2539,7 +2547,7 @@ GLuint Fake15BitTexture(void)
    if(bFakeFrontBuffer) bIgnoreNextTile=TRUE;
    CheckVRamReadEx(x1,y1,x1+x2,y1+y2);
    return 0;
-  }

+  }
 
  /////////////////////////
 
@@ -2731,36 +2739,36 @@ void LoadSubTexturePageSort(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=4;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=y1;TXV<=y2;TXV++)

-       {

-        for(TXU=x1;TXU<=x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-         }

-        ta+=xalign;

-       }

-      break;

-     }

+   case 0:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=4;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=y1;TXV<=y2;TXV++)
+       {
+        for(TXU=x1;TXU<=x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+         }
+        ta+=xalign;
+       }
+      break;
+     }
 
     start=((pageid-16*pmult)<<7)+524288*pmult;
     // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -2805,37 +2813,37 @@ void LoadSubTexturePageSort(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=64;do

-       {

-        *px    =LTCOL(*wSRCPtr);

-        *(px+1)=LTCOL(*(wSRCPtr+1));

-        *(px+2)=LTCOL(*(wSRCPtr+2));

-        *(px+3)=LTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=y1;TXV<=y2;TXV++)

-       {

-        for(TXU=x1;TXU<=x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-         }

-        ta+=xalign;

-       }

-

-      break;

-     }

+   case 1:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=64;do
+       {
+        *px    =LTCOL(*wSRCPtr);
+        *(px+1)=LTCOL(*(wSRCPtr+1));
+        *(px+2)=LTCOL(*(wSRCPtr+2));
+        *(px+3)=LTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=y1;TXV<=y2;TXV++)
+       {
+        for(TXU=x1;TXU<=x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+         }
+        ta+=xalign;
+       }
+
+      break;
+     }
 
     start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3057,9 +3065,9 @@ void LoadSubTexturePageSort(int pageid, int mode, short cx, short cy)
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-//

-// load texture part (packed)

-//

+//
+// load texture part (packed)
+//
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -3099,35 +3107,35 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
   {
    //--------------------------------------------------// 
    // 4bit texture load ..
-   case 0:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-      row=4;do

-       {

-        *px    =LPTCOL(*wSRCPtr);

-        *(px+1)=LPTCOL(*(wSRCPtr+1));

-        *(px+2)=LPTCOL(*(wSRCPtr+2));

-        *(px+3)=LPTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=y1;TXV<=y2;TXV++)

-       {

-        for(TXU=x1;TXU<=x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );

-		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));

-         }

-        ta+=xalign;

-       }

-      break;

-     }

+   case 0:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+      row=4;do
+       {
+        *px    =LPTCOL(*wSRCPtr);
+        *(px+1)=LPTCOL(*(wSRCPtr+1));
+        *(px+2)=LPTCOL(*(wSRCPtr+2));
+        *(px+3)=LPTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=y1;TXV<=y2;TXV++)
+       {
+        for(TXU=x1;TXU<=x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		  n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+         }
+        ta+=xalign;
+       }
+      break;
+     }
 
     start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3170,37 +3178,37 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
     break;
    //--------------------------------------------------// 
    // 8bit texture load ..
-   case 1:

-    if(GlobalTextIL)

-     {

-      unsigned int TXV,TXU,n_xi,n_yi;

-

-      wSRCPtr=psxVuw+palstart;

-

-      row=64;do

-       {

-        *px    =LPTCOL(*wSRCPtr);

-        *(px+1)=LPTCOL(*(wSRCPtr+1));

-        *(px+2)=LPTCOL(*(wSRCPtr+2));

-        *(px+3)=LPTCOL(*(wSRCPtr+3));

-        row--;px+=4;wSRCPtr+=4;

-       }

-      while (row);

-

-      for(TXV=y1;TXV<=y2;TXV++)

-       {

-        for(TXU=x1;TXU<=x2;TXU++)

-         {

-  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );

-		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );

-

-          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));

-         }

-        ta+=xalign;

-       }

-

-      break;

-     }

+   case 1:
+    if(GlobalTextIL)
+     {
+      unsigned int TXV,TXU,n_xi,n_yi;
+
+      wSRCPtr=psxVuw+palstart;
+
+      row=64;do
+       {
+        *px    =LPTCOL(*wSRCPtr);
+        *(px+1)=LPTCOL(*(wSRCPtr+1));
+        *(px+2)=LPTCOL(*(wSRCPtr+2));
+        *(px+3)=LPTCOL(*(wSRCPtr+3));
+        row--;px+=4;wSRCPtr+=4;
+       }
+      while (row);
+
+      for(TXV=y1;TXV<=y2;TXV++)
+       {
+        for(TXU=x1;TXU<=x2;TXU++)
+         {
+  		  n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		  n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+          *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+         }
+        ta+=xalign;
+       }
+
+      break;
+     }
 
     start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3433,17 +3441,17 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
 }
 
 /////////////////////////////////////////////////////////////////////////////
-

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// hires texture funcs

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-

+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// hires texture funcs
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
 
 #define GET_RESULT(A, B, C, D) ((A != C || A != D) - (B != C || B != D))
 
@@ -3463,7 +3471,7 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
 
 #define Q_INTERPOLATE8(A, B, C, D) (((((A & qcolorMask8) >> 2) + ((B & qcolorMask8) >> 2) + ((C & qcolorMask8) >> 2) + ((D & qcolorMask8) >> 2) + ((((A & qlowpixelMask8) + (B & qlowpixelMask8) + (C & qlowpixelMask8) + (D & qlowpixelMask8)) >> 2) & qlowpixelMask8))|((((A&0xFF000000)==0x50000000)?0x50000000:(((B&0xFF000000)==0x50000000)?0x50000000:(((C&0xFF000000)==0x50000000)?0x50000000:(((D&0xFF000000)==0x50000000)?0x50000000:(((A&0xFF000000)==0x00000000)?0x00000000:(((B&0xFF000000)==0x00000000)?0x00000000:(((C&0xFF000000)==0x00000000)?0x00000000:(((D&0xFF000000)==0x00000000)?0x00000000:0xFF000000)))))))))))
 
-void Super2xSaI_ex8_Ex(unsigned char *srcPtr, DWORD srcPitch,
+static void Super2xSaI_ex8_Ex(unsigned char *srcPtr, DWORD srcPitch,
 	            unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch = srcPitch * 2;
@@ -3608,7 +3616,7 @@ void Super2xSaI_ex8_Ex(unsigned char *srcPtr, DWORD srcPitch,
 }
 
 
-void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
+static void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
 	            unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch = srcPitch * 2;
@@ -3762,7 +3770,7 @@ void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
 
 #define Q_INTERPOLATE4(A, B, C, D) ((((A & qcolorMask4) >> 2) + ((B & qcolorMask4) >> 2) + ((C & qcolorMask4) >> 2) + ((D & qcolorMask4) >> 2) + ((((A & qlowpixelMask4) + (B & qlowpixelMask4) + (C & qlowpixelMask4) + (D & qlowpixelMask4)) >> 2) & qlowpixelMask4))| ((((A&0x0000000F)==0x00000006)?0x00000006:(((B&0x0000000F)==0x00000006)?0x00000006:(((C&0x0000000F)==0x00000006)?0x00000006:(((D&0x0000000F)==0x00000006)?0x00000006:(((A&0x0000000F)==0x00000000)?0x00000000:(((B&0x0000000F)==0x00000000)?0x00000000:(((C&0x0000000F)==0x00000000)?0x00000000:(((D&0x0000000F)==0x00000000)?0x00000000:0x0000000F))))))))))
 
-void Super2xSaI_ex4(unsigned char *srcPtr, DWORD srcPitch,
+static void Super2xSaI_ex4(unsigned char *srcPtr, DWORD srcPitch,
 	            unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch = srcPitch * 2;
@@ -3917,7 +3925,7 @@ void Super2xSaI_ex4(unsigned char *srcPtr, DWORD srcPitch,
 
 #define Q_INTERPOLATE5(A, B, C, D) ((((A & qcolorMask5) >> 2) + ((B & qcolorMask5) >> 2) + ((C & qcolorMask5) >> 2) + ((D & qcolorMask5) >> 2) + ((((A & qlowpixelMask5) + (B & qlowpixelMask5) + (C & qlowpixelMask5) + (D & qlowpixelMask5)) >> 2) & qlowpixelMask5))| ((((A&0x00000001)==0x00000000)?0x00000000:(((B&0x00000001)==0x00000000)?0x00000000:(((C&0x00000001)==0x00000000)?0x00000000:(((D&0x00000001)==0x00000000)?0x00000000:0x00000001))))))
 
-void Super2xSaI_ex5(unsigned char *srcPtr, DWORD srcPitch,
+static void Super2xSaI_ex5(unsigned char *srcPtr, DWORD srcPitch,
 	            unsigned char  *dstBitmap, int width, int height)
 {
  DWORD dstPitch = srcPitch * 2;
@@ -4064,14 +4072,14 @@ void Super2xSaI_ex5(unsigned char *srcPtr, DWORD srcPitch,
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-//

-// ogl texture defines

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-
-void DefineSubTextureSortHiRes(void)
+//
+// ogl texture defines
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+static void DefineSubTextureSortHiRes(void)
 {
  int x,y,dx2;
 
@@ -4201,18 +4209,18 @@ void DefineSubTextureSort(void)
 }
 
 /////////////////////////////////////////////////////////////////////////////
-

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// texture cache garbage collection

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-
-void DoTexGarbageCollection(void)
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// texture cache garbage collection
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+static void DoTexGarbageCollection(void)
 {
  static unsigned short LRUCleaned=0;
  unsigned short iC,iC1,iC2;
@@ -4248,15 +4256,15 @@ void DoTexGarbageCollection(void)
  usLRUTexPage=LRUCleaned;
 }
 
-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// search cache for existing (already used) parts

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// search cache for existing (already used) parts
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 unsigned char * CheckTextureInSubSCache(int TextureMode, uint32_t GivenClutId, unsigned short * pCache)
 {
@@ -4480,7 +4488,7 @@ ENDLOOP:
  if(ul)
   {
    //////////////////////////////////////////////////////
-

+
     {
      dwTexPageComp=0;
 
@@ -4556,17 +4564,17 @@ ENDLOOP:
  return &tsx->Opaque;
 }
                    
-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// search cache for free place (on compress)

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-
-BOOL GetCompressTexturePlace(textureSubCacheEntryS * tsx)
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// search cache for free place (on compress)
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+static BOOL GetCompressTexturePlace(textureSubCacheEntryS * tsx)
 {
  int i,j,k,iMax,iC;uint32_t rx,ry,mx,my;
  EXLong * ul=0, * uls, rfree;
@@ -4627,7 +4635,7 @@ BOOL GetCompressTexturePlace(textureSubCacheEntryS * tsx)
        rfree=*ul;
        mx=ul->c[2]-2;
        my=ul->c[0]-2;
-

+
        if(rx<mx && ry<my)
         {
          ul->c[3]+=rx;
@@ -4691,17 +4699,17 @@ TENDLOOP:
  return TRUE;
 }
 
-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// compress texture cache (to make place for new texture part, if needed)

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-
-void CompressTextureSpace(void)
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// compress texture cache (to make place for new texture part, if needed)
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+static void CompressTextureSpace(void)
 {
  textureSubCacheEntryS * tsx, * tsg, * tsb;
  int i,j,k,m,n,iMax;EXLong * ul, r,opos;
@@ -4754,14 +4762,14 @@ void CompressTextureSpace(void)
                tsb->ClutID=0;
               }
             }
-

+
 //           if(r.l!=tsx->pos.l)
             {
              cx=((tsx->ClutID << 4) & 0x3F0);          
              cy=((tsx->ClutID >> 6) & CLUTYMASK);
 
              if(j!=2)
-              {

+              {
                // palette check sum
                l=0;lSRCPtr=(uint32_t *)(psxVuw+cx+(cy*1024));
                if(j==1) for(row=1;row<129;row++) l+=((*lSRCPtr++)-1)*row;
@@ -4774,9 +4782,9 @@ void CompressTextureSpace(void)
               }
 
              tsx->pos.l=r.l;
-             if(!GetCompressTexturePlace(tsx))         // no place?

+             if(!GetCompressTexturePlace(tsx))         // no place?
               {
-               for(i=0;i<3;i++)                        // -> clean up everything

+               for(i=0;i<3;i++)                        // -> clean up everything
                 for(j=0;j<MAXTPAGES;j++)
                  {
                   tsb=pscSubtexStore[i][j];
@@ -4826,21 +4834,21 @@ void CompressTextureSpace(void)
  DrawSemiTrans=sOldDST;
 }
 
-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-//

-// main entry for searching/creating textures, called from prim.c

-//

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

-/////////////////////////////////////////////////////////////////////////////

+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// main entry for searching/creating textures, called from prim.c
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 GLuint SelectSubTextureS(int TextureMode, uint32_t GivenClutId) 
 {
  unsigned char * OPtr;unsigned short iCache;short cx,cy;
-

- // sort sow/tow infos for fast access

+
+ // sort sow/tow infos for fast access
 
  unsigned char ma1,ma2,mi1,mi2;
  if(gl_ux[0]>gl_ux[1]) {mi1=gl_ux[1];ma1=gl_ux[0];}
@@ -4860,10 +4868,10 @@ GLuint SelectSubTextureS(int TextureMode, uint32_t GivenClutId)
  else        gl_ux[5]=mi1;
  if(ma1>ma2) gl_ux[4]=ma1; 
  else        gl_ux[4]=ma2;
-

- // get clut infos in one 32 bit val

 
- if(TextureMode==2)                                    // no clut here

+ // get clut infos in one 32 bit val
+
+ if(TextureMode==2)                                    // no clut here
   {
    GivenClutId=CLUTUSED|(DrawSemiTrans<<30);cx=cy=0;
  
@@ -4875,7 +4883,7 @@ GLuint SelectSubTextureS(int TextureMode, uint32_t GivenClutId)
    cx=((GivenClutId << 4) & 0x3F0);                    // but here
    cy=((GivenClutId >> 6) & CLUTYMASK);
    GivenClutId=(GivenClutId&CLUTMASK)|(DrawSemiTrans<<30)|CLUTUSED;
-

+
    // palette check sum.. removed MMX asm, this easy func works as well
     {
      uint32_t l=0,row;
@@ -4888,22 +4896,22 @@ GLuint SelectSubTextureS(int TextureMode, uint32_t GivenClutId)
     }
 
   }
-

+
  // search cache
  iCache=0;
- OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);

-

+ OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);
+
  // cache full? compress and try again
  if(iCache==0xffff)
   {
    CompressTextureSpace();
    OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);
-  }

-

+  }
+
  // found? fine
  usLRUTexPage=iCache;
- if(!OPtr) return uiStexturePage[iCache];

-

+ if(!OPtr) return uiStexturePage[iCache];
+
  // not found? upload texture and store infos in cache
  gTexName=uiStexturePage[iCache];
  LoadSubTexFn(GlobalTexturePage,TextureMode,cx,cy);
diff --git a/plugins/peopsxgl/texture.h b/plugins/peopsxgl/texture.h
index b646af7c..b4a69049 100644
--- a/plugins/peopsxgl/texture.h
+++ b/plugins/peopsxgl/texture.h
@@ -1,68 +1,69 @@
-/***************************************************************************

-                          texture.h  -  description

-                             -------------------

-    begin                : Sun Mar 08 2009

-    copyright            : (C) 1999-2009 by Pete Bernert

-    web                  : www.pbernert.com   

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#ifndef _GPU_TEXTURE_H_

-#define _GPU_TEXTURE_H_

-

-#define TEXTUREPAGESIZE 256 * 256

-

-void           InitializeTextureStore();

-void           CleanupTextureStore();

-GLuint         LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId);

-GLuint         LoadTextureMovie(void);

-void           InvalidateTextureArea(int imageX0, int imageY0, int imageX1, int imageY1);

-void           InvalidateTextureAreaEx(void);

-void           LoadTexturePage(int pageid, int mode, short cx, short cy);

-void           ResetTextureArea(BOOL bDelTex);

-GLuint         SelectSubTextureS(int TextureMode, uint32_t GivenClutId);

-void           CheckTextureMemory(void);

-

-void           LoadSubTexturePage(int pageid, int mode, short cx, short cy);

-void           LoadSubTexturePageSort(int pageid, int mode, short cx, short cy);

-void           LoadPackedSubTexturePage(int pageid, int mode, short cx, short cy);

-void           LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy);

-uint32_t       XP8RGBA(uint32_t BGR);

-uint32_t       XP8RGBAEx(uint32_t BGR);

-uint32_t       XP8RGBA_0(uint32_t BGR);

-uint32_t       XP8RGBAEx_0(uint32_t BGR);

-uint32_t       XP8BGRA_0(uint32_t BGR);

-uint32_t       XP8BGRAEx_0(uint32_t BGR);

-uint32_t       XP8RGBA_1(uint32_t BGR);

-uint32_t       XP8RGBAEx_1(uint32_t BGR);

-uint32_t       XP8BGRA_1(uint32_t BGR);

-uint32_t       XP8BGRAEx_1(uint32_t BGR);

-uint32_t       P8RGBA(uint32_t BGR);

-uint32_t       P8BGRA(uint32_t BGR);

-uint32_t       CP8RGBA_0(uint32_t BGR);

-uint32_t       CP8RGBAEx_0(uint32_t BGR);

-uint32_t       CP8BGRA_0(uint32_t BGR);

-uint32_t       CP8BGRAEx_0(uint32_t BGR);

-uint32_t       CP8RGBA(uint32_t BGR);

-uint32_t       CP8RGBAEx(uint32_t BGR);

-unsigned short XP5RGBA (unsigned short BGR);

-unsigned short XP5RGBA_0 (unsigned short BGR);

-unsigned short XP5RGBA_1 (unsigned short BGR);

-unsigned short P5RGBA (unsigned short BGR);

-unsigned short CP5RGBA_0 (unsigned short BGR);

-unsigned short XP4RGBA (unsigned short BGR);

-unsigned short XP4RGBA_0 (unsigned short BGR);

-unsigned short XP4RGBA_1 (unsigned short BGR);

-unsigned short P4RGBA (unsigned short BGR);

-unsigned short CP4RGBA_0 (unsigned short BGR);

-

-#endif // _TEXTURE_H_

+/***************************************************************************
+                          texture.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _GPU_TEXTURE_H_
+#define _GPU_TEXTURE_H_
+
+#define TEXTUREPAGESIZE 256 * 256
+
+void           InitializeTextureStore();
+void           CleanupTextureStore();
+GLuint         LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId);
+GLuint         LoadTextureMovie(void);
+void           InvalidateTextureArea(int imageX0, int imageY0, int imageX1, int imageY1);
+void           InvalidateTextureAreaEx(void);
+void           LoadTexturePage(int pageid, int mode, short cx, short cy);
+void           ResetTextureArea(BOOL bDelTex);
+GLuint         SelectSubTextureS(int TextureMode, uint32_t GivenClutId);
+void           CheckTextureMemory(void);
+
+void           LoadSubTexturePage(int pageid, int mode, short cx, short cy);
+void           LoadSubTexturePageSort(int pageid, int mode, short cx, short cy);
+void           LoadPackedSubTexturePage(int pageid, int mode, short cx, short cy);
+void           LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy);
+uint32_t       XP8RGBA(uint32_t BGR);
+uint32_t       XP8RGBAEx(uint32_t BGR);
+uint32_t       XP8RGBA_0(uint32_t BGR);
+uint32_t       XP8RGBAEx_0(uint32_t BGR);
+uint32_t       XP8BGRA_0(uint32_t BGR);
+uint32_t       XP8BGRAEx_0(uint32_t BGR);
+uint32_t       XP8RGBA_1(uint32_t BGR);
+uint32_t       XP8RGBAEx_1(uint32_t BGR);
+uint32_t       XP8BGRA_1(uint32_t BGR);
+uint32_t       XP8BGRAEx_1(uint32_t BGR);
+uint32_t       P8RGBA(uint32_t BGR);
+uint32_t       P8BGRA(uint32_t BGR);
+uint32_t       CP8RGBA_0(uint32_t BGR);
+uint32_t       CP8RGBAEx_0(uint32_t BGR);
+uint32_t       CP8BGRA_0(uint32_t BGR);
+uint32_t       CP8BGRAEx_0(uint32_t BGR);
+uint32_t       CP8RGBA(uint32_t BGR);
+uint32_t       CP8RGBAEx(uint32_t BGR);
+unsigned short XP5RGBA (unsigned short BGR);
+unsigned short XP5RGBA_0 (unsigned short BGR);
+unsigned short XP5RGBA_1 (unsigned short BGR);
+unsigned short P5RGBA (unsigned short BGR);
+unsigned short CP5RGBA_0 (unsigned short BGR);
+unsigned short XP4RGBA (unsigned short BGR);
+unsigned short XP4RGBA_0 (unsigned short BGR);
+unsigned short XP4RGBA_1 (unsigned short BGR);
+unsigned short P4RGBA (unsigned short BGR);
+unsigned short CP4RGBA_0 (unsigned short BGR);
+unsigned char * LoadDirectMovieFast(void);
+
+#endif // _TEXTURE_H_