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

zzogl-pg: Get Windows working again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2812 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-04-03 11:17:40 +00:00
parent 176c451008
commit 564f443644
3 changed files with 560 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/zzogl-pg/opengl/GifTransfer.cpp
View File

@ -21,6 +21,10 @@
#include "zerogs.h"
#include "GifTransfer.h"
#ifdef _DEBUG
static int count = 0;
#endif
/*void _GSgifPacket(pathInfo *path, u32 *pMem) // 128bit
{
FUNCLOG
@ -75,9 +79,9 @@ __forceinline void gifTransferLog(int index, u32 *pMem, u32 size)
static int nSaveIndex = 0;
GS_LOG("%d: p:%d %x\n", nSaveIndex++, index + 1, size);
int vals[4] = {0};
for(int i = 0; i < size; i++)
for(u32 i = 0; i < size; i++)
{
for(int j = 0; j < 4; ++j )
for(u32 j = 0; j < 4; ++j )
vals[j] ^= pMem[4*i+j];
}
GS_LOG("%x %x %x %x\n", vals[0], vals[1], vals[2], vals[3]);
@ -185,7 +189,7 @@ template<int index> void _GSgifTransfer(u32 *pMem, u32 size)
case GIF_FLG_IMAGE: // FROM_VFRAM
case GIF_FLG_IMAGE2: // Used in the DirectX version, so we'll use it here too.
{
int len = (int)min(size, path->nloop);
int len = min(size, path->nloop);
//ERROR_LOG("GIF_FLG_IMAGE(%d)=%d\n", gs.imageTransfer, len);
switch(gs.imageTransfer)
@ -503,6 +507,3 @@ void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
_GSgifTransfer<2>(pMem, size);
}
#endif
#ifdef _DEBUG
static int count = 0;
#endif

4
plugins/zzogl-pg/opengl/GifTransfer.h
View File

@ -70,10 +70,10 @@ union GIFTag
typedef struct
{
#ifdef NEW_GIF_TRANSFER
int mode;
u32 mode;
int reg;
u64 regs;
int nloop;
u32 nloop;
int eop;
int nreg;
u32 adonly;

11
plugins/zzogl-pg/opengl/Util.h
View File

@ -108,8 +108,6 @@ static __forceinline void pcsx2_aligned_free(void* pmem)
#define _aligned_malloc pcsx2_aligned_malloc
#define _aligned_free pcsx2_aligned_free
#endif
#include <sys/timeb.h> // ftime(), struct timeb
inline unsigned long timeGetTime()
@ -125,15 +123,18 @@ inline unsigned long timeGetTime()
return (unsigned long)(t.time*1000+t.millitm);
}
#define max(a,b) (((a) > (b)) ? (a) : (b))
#define min(a,b) (((a) < (b)) ? (a) : (b))
struct RECT
{
int left, top;
int right, bottom;
};
#endif
#define max(a,b) (((a) > (b)) ? (a) : (b))
#define min(a,b) (((a) < (b)) ? (a) : (b))
typedef struct {
int x, y, w, h;
} Rect;