mirror of https://github.com/PCSX2/pcsx2.git
GregMiscellaneous: zzogl-pg: Get zzogl-pg working in Windows again.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3963 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
d49a34a44f
commit
aa64da2561
|
@ -68,5 +68,7 @@ class GLWindow
|
||||||
|
|
||||||
extern GLWindow GLWin;
|
extern GLWindow GLWin;
|
||||||
extern void ChangeWindowSize(int nNewWidth, int nNewHeight);
|
extern void ChangeWindowSize(int nNewWidth, int nNewHeight);
|
||||||
|
extern void SetChangeDeviceSize(int nNewWidth, int nNewHeight);
|
||||||
|
extern int nBackbufferWidth, nBackbufferHeight;
|
||||||
|
|
||||||
#endif // GLWIN_H_INCLUDED
|
#endif // GLWIN_H_INCLUDED
|
||||||
|
|
|
@ -356,10 +356,18 @@
|
||||||
RelativePath="..\zpipe.cpp"
|
RelativePath="..\zpipe.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZClut.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ZZKeyboard.cpp"
|
RelativePath="..\ZZKeyboard.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZKick.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ZZLog.cpp"
|
RelativePath="..\ZZLog.cpp"
|
||||||
>
|
>
|
||||||
|
@ -413,10 +421,18 @@
|
||||||
RelativePath="..\GifTransfer.h"
|
RelativePath="..\GifTransfer.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\GLWin.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\GS.h"
|
RelativePath="..\GS.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\HostMemory.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\Mem.h"
|
RelativePath="..\Mem.h"
|
||||||
>
|
>
|
||||||
|
@ -481,14 +497,30 @@
|
||||||
RelativePath="..\zerogs.h"
|
RelativePath="..\zerogs.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\zpipe.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZClut.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ZZGl.h"
|
RelativePath="..\ZZGl.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZKick.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ZZLog.h"
|
RelativePath="..\ZZLog.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZoglCRTC.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ZZoglFlushHack.h"
|
RelativePath="..\ZZoglFlushHack.h"
|
||||||
>
|
>
|
||||||
|
@ -501,6 +533,14 @@
|
||||||
RelativePath="..\ZZoglShaders.h"
|
RelativePath="..\ZZoglShaders.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZoglShoots.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\ZZoglVB.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
Name="Resource Files"
|
Name="Resource Files"
|
||||||
|
@ -528,11 +568,11 @@
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\ps2hw.dat"
|
RelativePath=".\ps2hw.dat"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\ps2hw.dat"
|
RelativePath="..\ps2hw.dat"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
|
|
|
@ -372,7 +372,7 @@ __forceinline void GSMem_to_ClutBuffer__T32_I4_CSM1_c(u32* vm, u32 csa)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main GSmem to Clutbuffer function
|
// Main GSmem to Clutbuffer function
|
||||||
__forceinline void GSMem_to_ClutBuffer(tex0Info &tex0)
|
/*__forceinline*/ void GSMem_to_ClutBuffer(tex0Info &tex0)
|
||||||
{
|
{
|
||||||
int entries = PSMT_IS8CLUT(tex0.psm) ? 256 : 16;
|
int entries = PSMT_IS8CLUT(tex0.psm) ? 256 : 16;
|
||||||
|
|
||||||
|
@ -487,17 +487,17 @@ __forceinline void GSMem_to_ClutBuffer(tex0Info &tex0)
|
||||||
* Clut buffer -> local C array (linear)
|
* Clut buffer -> local C array (linear)
|
||||||
* *****************************************************************/
|
* *****************************************************************/
|
||||||
template <class T>
|
template <class T>
|
||||||
__forceinline void ClutBuffer_to_Array(T* dst, u32 csa, u32 clutsize) {}
|
/*__forceinline*/ void ClutBuffer_to_Array(T* dst, u32 csa, u32 clutsize) {}
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline void ClutBuffer_to_Array<u32>(u32* dst, u32 csa, u32 clutsize)
|
/*__forceinline*/ void ClutBuffer_to_Array<u32>(u32* dst, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
u8* clut = (u8*)GetClutBufferAddress<u32>(csa);
|
u8* clut = (u8*)GetClutBufferAddress<u32>(csa);
|
||||||
memcpy_amd((u8*)dst, clut, clutsize);
|
memcpy_amd((u8*)dst, clut, clutsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline void ClutBuffer_to_Array<u16>(u16* dst, u32 csa, u32 clutsize)
|
/*__forceinline*/ void ClutBuffer_to_Array<u16>(u16* dst, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
u16* clut = (u16*)GetClutBufferAddress<u32>(csa); // Keep aligned version for sse2
|
u16* clut = (u16*)GetClutBufferAddress<u32>(csa); // Keep aligned version for sse2
|
||||||
|
|
||||||
|
@ -597,10 +597,10 @@ __forceinline void ClutBuffer_to_Array<u16>(u16* dst, u32 csa, u32 clutsize)
|
||||||
// false -> identical
|
// false -> identical
|
||||||
// true -> different
|
// true -> different
|
||||||
template <class T>
|
template <class T>
|
||||||
__forceinline bool Cmp_ClutBuffer_GSMem(T* GSmem, u32 csa, u32 clutsize);
|
/*__forceinline*/ bool Cmp_ClutBuffer_GSMem(T* GSmem, u32 csa, u32 clutsize);
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline bool Cmp_ClutBuffer_GSMem<u32>(u32* GSmem, u32 csa, u32 clutsize)
|
/*__forceinline*/ bool Cmp_ClutBuffer_GSMem<u32>(u32* GSmem, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
u64* _GSmem = (u64*) GSmem;
|
u64* _GSmem = (u64*) GSmem;
|
||||||
u64* clut = (u64*)GetClutBufferAddress<u32>(csa);
|
u64* clut = (u64*)GetClutBufferAddress<u32>(csa);
|
||||||
|
@ -769,7 +769,7 @@ __forceinline bool Cmp_ClutBuffer_GSMem_core(u16* GSmem, u16* clut)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline bool Cmp_ClutBuffer_GSMem<u16>(u16* GSmem, u32 csa, u32 clutsize)
|
/*__forceinline*/ bool Cmp_ClutBuffer_GSMem<u16>(u16* GSmem, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
#ifdef ZEROGS_SSE2
|
#ifdef ZEROGS_SSE2
|
||||||
u16* clut = (u16*)GetClutBufferAddress<u32>(csa); // Keep aligned version for sse2
|
u16* clut = (u16*)GetClutBufferAddress<u32>(csa); // Keep aligned version for sse2
|
||||||
|
@ -853,17 +853,17 @@ __forceinline bool Cmp_ClutBuffer_GSMem<u16>(u16* GSmem, u32 csa, u32 clutsize)
|
||||||
// false -> identical
|
// false -> identical
|
||||||
// true -> different
|
// true -> different
|
||||||
template <class T>
|
template <class T>
|
||||||
__forceinline bool Cmp_ClutBuffer_SavedClut(T* saved_clut, u32 csa, u32 clutsize);
|
/*__forceinline*/ bool Cmp_ClutBuffer_SavedClut(T* saved_clut, u32 csa, u32 clutsize);
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline bool Cmp_ClutBuffer_SavedClut<u32>(u32* saved_clut, u32 csa, u32 clutsize)
|
/*__forceinline*/ bool Cmp_ClutBuffer_SavedClut<u32>(u32* saved_clut, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
u32* clut = GetClutBufferAddress<u32>(csa);
|
u32* clut = GetClutBufferAddress<u32>(csa);
|
||||||
return memcmp_mmx(saved_clut, clut, clutsize);
|
return !!memcmp_mmx(saved_clut, clut, clutsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
__forceinline bool Cmp_ClutBuffer_SavedClut<u16>(u16* saved_clut, u32 csa, u32 clutsize)
|
/*__forceinline*/ bool Cmp_ClutBuffer_SavedClut<u16>(u16* saved_clut, u32 csa, u32 clutsize)
|
||||||
{
|
{
|
||||||
assert((clutsize&31) == 0);
|
assert((clutsize&31) == 0);
|
||||||
|
|
||||||
|
@ -973,7 +973,7 @@ __forceinline bool Cmp_ClutBuffer_SavedClut<u16>(u16* saved_clut, u32 csa, u32 c
|
||||||
|
|
||||||
// used to build clut textures (note that this is for both 16 and 32 bit cluts)
|
// used to build clut textures (note that this is for both 16 and 32 bit cluts)
|
||||||
template <class T>
|
template <class T>
|
||||||
__forceinline void Build_Clut_Texture(u32 psm, u32 height, T* pclut, u8* psrc, T* pdst)
|
/*__forceinline*/ void Build_Clut_Texture(u32 psm, u32 height, T* pclut, u8* psrc, T* pdst)
|
||||||
{
|
{
|
||||||
switch (psm)
|
switch (psm)
|
||||||
{
|
{
|
||||||
|
|
|
@ -63,7 +63,7 @@ bool __forceinline NoHighlights(int i)
|
||||||
return (!(conf.settings().xenosaga_spec) || !vb[i].zbuf.zmsk || prim->iip) ;
|
return (!(conf.settings().xenosaga_spec) || !vb[i].zbuf.zmsk || prim->iip) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
void __forceinline Kick::KickVERTEX2()
|
void Kick::KickVERTEX2()
|
||||||
{
|
{
|
||||||
FUNCLOG
|
FUNCLOG
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ void __forceinline Kick::KickVERTEX2()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void __forceinline Kick::KickVERTEX3()
|
void Kick::KickVERTEX3()
|
||||||
{
|
{
|
||||||
FUNCLOG
|
FUNCLOG
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue