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

zzogl-pg: Fix Linux after my last few commits. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2749 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-03-19 05:46:55 +00:00
parent e80b5c5af5
commit dfeb416833
4 changed files with 24 additions and 33 deletions

4
pcsx2-codeblocks.workspace
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="pcsx2_suite_2008 workspace"> <Workspace title="pcsx2_suite_2008 workspace">
<Project filename="pcsx2/Linux/pcsx2.cbp" active="1"> <Project filename="pcsx2/Linux/pcsx2.cbp">
<Depends filename="common/build/x86emitter/x86emitter.cbp" /> <Depends filename="common/build/x86emitter/x86emitter.cbp" />
<Depends filename="common/build/Utilities/Utilities.cbp" /> <Depends filename="common/build/Utilities/Utilities.cbp" />
<Depends filename="3rdparty/zlib/zlib.cbp" /> <Depends filename="3rdparty/zlib/zlib.cbp" />
@ -30,6 +30,6 @@
<Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp"> <Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp">
<Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" /> <Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" />
</Project> </Project>
<Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" /> <Project filename="plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp" active="1" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

1
plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
View File

@ -57,6 +57,7 @@
<Add library="stdc++" /> <Add library="stdc++" />
<Add library="Cg" /> <Add library="Cg" />
</Linker> </Linker>
<Unit filename="../../GLWin32.cpp" />
<Unit filename="../../GLWinX11.cpp" /> <Unit filename="../../GLWinX11.cpp" />
<Unit filename="../../GS.h" /> <Unit filename="../../GS.h" />
<Unit filename="../../GSmain.cpp" /> <Unit filename="../../GSmain.cpp" />

2
plugins/zzogl-pg/opengl/Makefile.am
View File

@ -1,7 +1,7 @@
# Create a shared library libzzoglpg # Create a shared library libzzoglpg
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libzzoglpg.a noinst_LIBRARIES = libzzoglpg.a
INCLUDES = -I@srcdir@/../../../common/include -I@srcdir@/common INCLUDES = -I@srcdir@/../../../common/include -I@srcdir@/common -I@srcdir@/../../../3rdparty/
libzzoglpg_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0) libzzoglpg_a_CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0)
libzzoglpg_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0) libzzoglpg_a_CXXFLAGS = $(shell pkg-config --cflags gtk+-2.0)

50
plugins/zzogl-pg/opengl/zerogs.cpp
View File

@ -506,11 +506,7 @@ void ZeroGS::RenderCustom(float fAlpha)
ProcessMessages(); ProcessMessages();
#ifdef _WIN32 GLWin.SwapGLBuffers();
SwapBuffers(hDC);
#else
GLWin.SwapBuffers();
#endif
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glEnable(GL_STENCIL_TEST); glEnable(GL_STENCIL_TEST);
@ -596,10 +592,14 @@ __forceinline void SET_VERTEX(VertexGPU *p, int Index, const VB& curvb)
} }
} }
#define OUTPUT_VERT(fn, vert, id) { \ static __forceinline void OUTPUT_VERT(VertexGPU vert, u32 id)
fn("%c%d(%d): xyzf=(%4d,%4d,0x%x,%3d), rgba=0x%8.8x, stq = (%2.5f,%2.5f,%2.5f)\n", id==0?'*':' ', id, prim->prim, vert.x/8, vert.y/8, vert.z, vert.f/128, \ {
vert.rgba, Clamp(vert.s, -10, 10), Clamp(vert.t, -10, 10), Clamp(vert.q, -10, 10)); \ #ifdef PRIM_LOG
} \ PRIM_LOG("%c%d(%d): xyzf=(%4d,%4d,0x%x,%3d), rgba=0x%8.8x, stq = (%2.5f,%2.5f,%2.5f)\n",
id==0?'*':' ', id, prim->prim, vert.x/8, vert.y/8, vert.z, vert.f/128,
vert.rgba, Clamp(vert.s, -10, 10), Clamp(vert.t, -10, 10), Clamp(vert.q, -10, 10));
#endif
}
void ZeroGS::KickPoint() void ZeroGS::KickPoint()
{ {
@ -623,9 +623,7 @@ void ZeroGS::KickPoint()
SET_VERTEX(&p[0], last, curvb); SET_VERTEX(&p[0], last, curvb);
curvb.nCount++; curvb.nCount++;
#ifdef PRIM_LOG OUTPUT_VERT(p[0], 0);
OUTPUT_VERT(PRIM_LOG, p[0], 0);
#endif
} }
void ZeroGS::KickLine() void ZeroGS::KickLine()
@ -653,10 +651,8 @@ void ZeroGS::KickLine()
curvb.nCount += 2; curvb.nCount += 2;
#ifdef PRIM_LOG OUTPUT_VERT(p[0], 0);
OUTPUT_VERT(PRIM_LOG, p[0], 0); OUTPUT_VERT(p[1], 1);
OUTPUT_VERT(PRIM_LOG, p[1], 1);
#endif
} }
void ZeroGS::KickTriangle() void ZeroGS::KickTriangle()
@ -681,11 +677,9 @@ void ZeroGS::KickTriangle()
curvb.nCount += 3; curvb.nCount += 3;
#ifdef PRIM_LOG OUTPUT_VERT(p[0], 0);
OUTPUT_VERT(PRIM_LOG, p[0], 0); OUTPUT_VERT(p[1], 1);
OUTPUT_VERT(PRIM_LOG, p[1], 1); OUTPUT_VERT(p[2], 2);
OUTPUT_VERT(PRIM_LOG, p[2], 2);
#endif
} }
void ZeroGS::KickTriangleFan() void ZeroGS::KickTriangleFan()
@ -714,11 +708,9 @@ void ZeroGS::KickTriangleFan()
if (gs.primIndex == gs.nTriFanVert) if (gs.primIndex == gs.nTriFanVert)
gs.primIndex = (gs.primIndex+1)%ARRAY_SIZE(gs.gsvertex); gs.primIndex = (gs.primIndex+1)%ARRAY_SIZE(gs.gsvertex);
#ifdef PRIM_LOG OUTPUT_VERT(p[0], 0);
OUTPUT_VERT(PRIM_LOG, p[0], 0); OUTPUT_VERT(p[1], 1);
OUTPUT_VERT(PRIM_LOG, p[1], 1); OUTPUT_VERT(p[2], 2);
OUTPUT_VERT(PRIM_LOG, p[2], 2);
#endif
} }
__forceinline void SetKickVertex(VertexGPU *p, Vertex v, int next, const VB& curvb) __forceinline void SetKickVertex(VertexGPU *p, Vertex v, int next, const VB& curvb)
@ -775,10 +767,8 @@ void ZeroGS::KickSprite()
curvb.nCount += 6; curvb.nCount += 6;
#ifdef PRIM_LOG OUTPUT_VERT(p[0], 0);
OUTPUT_VERT(PRIM_LOG, p[0], 0); OUTPUT_VERT(p[1], 1);
OUTPUT_VERT(PRIM_LOG, p[1], 1);
#endif
} }
void ZeroGS::KickDummy() void ZeroGS::KickDummy()