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

zzogl-pg: Add a new header. Remove a few includes that didn't seem to be used, or were included from elsewhere. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3376 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-07-03 06:16:28 +00:00
parent c06cb7b121
commit 4eb20d3f47
9 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/zzogl-pg/opengl/CMakeLists.txt
View File

@ -107,6 +107,7 @@ set(zzoglHeaders
zerogsmath.h zerogsmath.h
zpipe.h zpipe.h
ZZoglCRTC.h ZZoglCRTC.h
ZZGl.h
ZZLog.h) ZZLog.h)
# zzogl S sources # zzogl S sources

8
plugins/zzogl-pg/opengl/GSmain.cpp
View File

@ -21,15 +21,7 @@
#include <io.h> #include <io.h>
#endif #endif
#include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <list>
#include <vector>
#include <map>
#include <string> #include <string>
using namespace std; using namespace std;

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

@ -134,6 +134,7 @@
<Option compile="0" /> <Option compile="0" />
<Option link="0" /> <Option link="0" />
</Unit> </Unit>
<Unit filename="../../ZZGl.h" />
<Unit filename="../../ZZKeyboard.cpp" /> <Unit filename="../../ZZKeyboard.cpp" />
<Unit filename="../../ZZLog.cpp" /> <Unit filename="../../ZZLog.cpp" />
<Unit filename="../../ZZLog.h" /> <Unit filename="../../ZZLog.h" />

5
plugins/zzogl-pg/opengl/Regs.cpp
View File

@ -16,11 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include "GS.h" #include "GS.h"
#include "Mem.h" #include "Mem.h"
#include "Regs.h" #include "Regs.h"

1
plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj
View File

@ -201,6 +201,7 @@
<ClInclude Include="..\targets.h" /> <ClInclude Include="..\targets.h" />
<ClInclude Include="Win32.h" /> <ClInclude Include="Win32.h" />
<ClInclude Include="..\x86.h" /> <ClInclude Include="..\x86.h" />
<ClInclude Include="..\ZZGl.h" />
<ClInclude Include="..\ZZLog.h" /> <ClInclude Include="..\ZZLog.h" />
<ClInclude Include="..\zerogs.h" /> <ClInclude Include="..\zerogs.h" />
<ClInclude Include="..\zerogsmath.h" /> <ClInclude Include="..\zerogsmath.h" />

4
plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -461,6 +461,10 @@
RelativePath="..\x86.h" RelativePath="..\x86.h"
> >
</File> </File>
<File
RelativePath="..\ZZGl.h"
>
</File>
<File <File
RelativePath="..\ZZLog.h" RelativePath="..\ZZLog.h"
> >

53
plugins/zzogl-pg/opengl/ZZGl.h Normal file
View File

@ -0,0 +1,53 @@
#ifndef ZZGL_H_INCLUDED
#define ZZGL_H_INCLUDED
#include "PS2Etypes.h"
#include "PS2Edefs.h"
// Need this before gl.h
#ifdef _WIN32
#include <windows.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include "glprocs.h"
#else
// adding glew support instead of glXGetProcAddress (thanks to scaught)
#include <GL/glew.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include <GL/glx.h>
inline void* wglGetProcAddress(const char* x)
{
return (void*)glXGetProcAddress((const GLubyte*)x);
}
#endif
#include <Cg/cg.h>
#include <Cg/cgGL.h>
// GL prototypes
extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
#endif // ZZGL_H_INCLUDED

5
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -20,12 +20,7 @@
#include <Cg/cg.h> #include <Cg/cg.h>
#include <Cg/cgGL.h> #include <Cg/cgGL.h>
#include <stdio.h>
#include <malloc.h>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "Mem.h" #include "Mem.h"
#include "x86.h" #include "x86.h"

70
plugins/zzogl-pg/opengl/zerogs.h
View File

@ -24,42 +24,12 @@
#endif #endif
// ----------------------------- Includes // ----------------------------- Includes
#include "PS2Etypes.h"
#include "PS2Edefs.h"
// Need this before gl.h
#ifdef _WIN32
#include <windows.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include "glprocs.h"
#else
// adding glew support instead of glXGetProcAddress (thanks to scaught)
#include <GL/glew.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include <GL/glx.h>
inline void* wglGetProcAddress(const char* x)
{
return (void*)glXGetProcAddress((const GLubyte*)x);
}
#endif
#include <Cg/cg.h>
#include <Cg/cgGL.h>
//#include <assert.h>
#include <list> #include <list>
#include <vector> #include <vector>
#include <map> #include <map>
#include <string> #include <string>
#include "ZZGl.h"
#include "GS.h" #include "GS.h"
#include "CRC.h" #include "CRC.h"
#include "rasterfont.h" // simple font #include "rasterfont.h" // simple font
@ -840,24 +810,24 @@ inline void CluttingForFlushedTex(tex0Info* tex0, u32 Data, int ictx)
} }
}; };
// GL prototypes //// GL prototypes
extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT; //extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT; //extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT; //extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT; //extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT; //extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT; //extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT; //extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT; //extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT; //extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT; //extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT; //extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT; //extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT; //extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT; //extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT; //extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT; //extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT; //extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
extern PFNGLDRAWBUFFERSPROC glDrawBuffers; //extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
#endif #endif