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

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
This commit is contained in:
arcum42 2009-02-14 13:48:02 +00:00
parent a8706a94ce
commit a8ea2caabf
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/zerogs/opengl/configure vendored
View File

@ -4409,7 +4409,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
CFLAGS+="-g " CFLAGS+="-g "
CPPFLAGS+="-g -fpermissive " CPPFLAGS+="-g "
CXXFLAGS+="-g -fpermissive " CXXFLAGS+="-g -fpermissive "
else else
@ -4419,7 +4419,7 @@ _ACEOF
CFLAGS+="-O3 -fomit-frame-pointer " CFLAGS+="-O3 -fomit-frame-pointer "
CPPFLAGS+="-O3 -fomit-frame-pointer " CPPFLAGS+="-O3 -fomit-frame-pointer "
CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive " CXXFLAGS+="-O3 -fomit-frame-pointer "
fi fi
{ $as_echo "$as_me:$LINENO: result: $debug" >&5 { $as_echo "$as_me:$LINENO: result: $debug" >&5
$as_echo "$debug" >&6; } $as_echo "$debug" >&6; }

4
plugins/zerogs/opengl/configure.ac
View File

@ -37,13 +37,13 @@ if test "x$debug" == xyes
then then
AC_DEFINE(_DEBUG,1,[_DEBUG]) AC_DEFINE(_DEBUG,1,[_DEBUG])
CFLAGS+="-g " CFLAGS+="-g "
CPPFLAGS+="-g -fpermissive " CPPFLAGS+="-g "
CXXFLAGS+="-g -fpermissive " CXXFLAGS+="-g -fpermissive "
else else
AC_DEFINE(NDEBUG,1,[NDEBUG]) AC_DEFINE(NDEBUG,1,[NDEBUG])
CFLAGS+="-O3 -fomit-frame-pointer " CFLAGS+="-O3 -fomit-frame-pointer "
CPPFLAGS+="-O3 -fomit-frame-pointer " CPPFLAGS+="-O3 -fomit-frame-pointer "
CXXFLAGS+="-O3 -fomit-frame-pointer -fpermissive " CXXFLAGS+="-O3 -fomit-frame-pointer "
fi fi
AC_MSG_RESULT($debug) AC_MSG_RESULT($debug)

4
plugins/zerogs/opengl/ps2hw.fx
View File

@ -292,7 +292,7 @@ decl_ps2shade_##num(_tex16to8h) \
// nearest // nearest
#define decl_ps2shade_0(bit) \ #define decl_ps2shade_0(bit) \
half4 ps2shade0##bit( TEX_DECL tex) \ float4 ps2shade0##bit( TEX_DECL tex) \
{ \ { \
return tex2DPS##bit( ps2addr(TEX_XY)); \ 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; float finter = texRECT(g_sInterlace, ointerpos.yy).x;
clip(finter * g_fOneColor.z + g_fOneColor.w); 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; c.w = g_fc0.w*c.w * g_fOneColor.x + g_fOneColor.y;
return c; return c;
} }

5
plugins/zerogs/opengl/zerogs.cpp
View File

@ -1339,12 +1339,12 @@ bool ZeroGS::Create(int _width, int _height)
char curwd[255]; char curwd[255];
getcwd(curwd, ARRAY_SIZE(curwd)); getcwd(curwd, ARRAY_SIZE(curwd));
strcpy(tempstr, "../plugins/gs/zerogs/opengl/"); strcpy(tempstr, "../plugins/zerogs/opengl/");
sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr); sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
FILE* f = fopen(EFFECT_NAME, "r"); FILE* f = fopen(EFFECT_NAME, "r");
if( f == NULL ) { if( f == NULL ) {
strcpy(tempstr, "../../plugins/gs/zerogs/opengl/"); strcpy(tempstr, "../../plugins/zerogs/opengl/");
sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr); sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
f = fopen(EFFECT_NAME, "r"); f = fopen(EFFECT_NAME, "r");
@ -1353,7 +1353,6 @@ bool ZeroGS::Create(int _width, int _height)
return false; return false;
} }
} }
fclose(f); fclose(f);
sprintf(EFFECT_DIR, "%s/%s", curwd, tempstr); sprintf(EFFECT_DIR, "%s/%s", curwd, tempstr);