From a8ea2caabf7e01a6c5c6398379cf53f2d6570670 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 14 Feb 2009 13:48:02 +0000
Subject: [PATCH] ZeroGS: fix up the dev build so it works, fix a typo in
 configure.ac that could cause compilation issues, and bring in a fix of
 zedr0n's for newer Cg versions when in dev mode.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@492 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zerogs/opengl/configure    | 6 +++---
 plugins/zerogs/opengl/configure.ac | 6 +++---
 plugins/zerogs/opengl/ps2hw.fx     | 4 ++--
 plugins/zerogs/opengl/zerogs.cpp   | 7 +++----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/zerogs/opengl/configure b/plugins/zerogs/opengl/configure
index 9cbe945630..8275f70213 100644
--- a/plugins/zerogs/opengl/configure
+++ b/plugins/zerogs/opengl/configure
@@ -4409,8 +4409,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
  CFLAGS+="-g "
- CPPFLAGS+="-g -fpermissive "
- CXXFLAGS+="-g- fpermissive "
+ CPPFLAGS+="-g "
+ CXXFLAGS+="-g -fpermissive "
 else
 
 cat >>confdefs.h <<\_ACEOF
@@ -4419,7 +4419,7 @@ _ACEOF
 
  CFLAGS+="-O3 -fomit-frame-pointer "
  CPPFLAGS+="-O3 -fomit-frame-pointer "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive "
+ CXXFLAGS+="-O3 -fomit-frame-pointer "
 fi
 { $as_echo "$as_me:$LINENO: result: $debug" >&5
 $as_echo "$debug" >&6; }
diff --git a/plugins/zerogs/opengl/configure.ac b/plugins/zerogs/opengl/configure.ac
index 32187d7555..e249793a80 100644
--- a/plugins/zerogs/opengl/configure.ac
+++ b/plugins/zerogs/opengl/configure.ac
@@ -37,13 +37,13 @@ if test "x$debug" == xyes
 then
  AC_DEFINE(_DEBUG,1,[_DEBUG])
  CFLAGS+="-g "
- CPPFLAGS+="-g -fpermissive "
- CXXFLAGS+="-g- fpermissive "
+ CPPFLAGS+="-g "
+ CXXFLAGS+="-g -fpermissive "
 else
  AC_DEFINE(NDEBUG,1,[NDEBUG])
  CFLAGS+="-O3 -fomit-frame-pointer "
  CPPFLAGS+="-O3 -fomit-frame-pointer "
- CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive "
+ CXXFLAGS+="-O3 -fomit-frame-pointer "
 fi
 AC_MSG_RESULT($debug)
 
diff --git a/plugins/zerogs/opengl/ps2hw.fx b/plugins/zerogs/opengl/ps2hw.fx
index a4b1ba3474..e73b6366b8 100644
--- a/plugins/zerogs/opengl/ps2hw.fx
+++ b/plugins/zerogs/opengl/ps2hw.fx
@@ -292,7 +292,7 @@ decl_ps2shade_##num(_tex16to8h) \
 
 // nearest
 #define decl_ps2shade_0(bit) \
-half4 ps2shade0##bit( TEX_DECL tex) \
+float4 ps2shade0##bit( TEX_DECL tex) \
 { \
     return tex2DPS##bit( ps2addr(TEX_XY)); \
 } \
@@ -716,7 +716,7 @@ half4 CRTCTargInterPS(in float2 tex0 : TEXCOORD0, in float2 ointerpos : TEXCOORD
 	float finter = texRECT(g_sInterlace, ointerpos.yy).x;
 	clip(finter * g_fOneColor.z + g_fOneColor.w);
 
-	half4 c = BilinearFloat16(tex0);
+	float4 c = BilinearFloat16(tex0);
 	c.w = g_fc0.w*c.w * g_fOneColor.x + g_fOneColor.y;
 	return c;
 }
diff --git a/plugins/zerogs/opengl/zerogs.cpp b/plugins/zerogs/opengl/zerogs.cpp
index 0985509b7a..b85b1bbea3 100644
--- a/plugins/zerogs/opengl/zerogs.cpp
+++ b/plugins/zerogs/opengl/zerogs.cpp
@@ -1338,13 +1338,13 @@ bool ZeroGS::Create(int _width, int _height)
 	char tempstr[255];
 	char curwd[255];
 	getcwd(curwd, ARRAY_SIZE(curwd));
-
-	strcpy(tempstr, "../plugins/gs/zerogs/opengl/");
+	
+	strcpy(tempstr, "../plugins/zerogs/opengl/");
 	sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
 	FILE* f = fopen(EFFECT_NAME, "r");
 	if( f == NULL ) {
 
-		strcpy(tempstr, "../../plugins/gs/zerogs/opengl/");
+		strcpy(tempstr, "../../plugins/zerogs/opengl/");
 		sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
 		f = fopen(EFFECT_NAME, "r");
 
@@ -1353,7 +1353,6 @@ bool ZeroGS::Create(int _width, int _height)
 			return false;
 		}
 	}
-
 	fclose(f);
 
 	sprintf(EFFECT_DIR, "%s/%s", curwd, tempstr);