From 3a7aca738e0b375fa49681beaf53b7ad89beeca3 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Sun, 31 Oct 2010 14:19:46 +0000 Subject: [PATCH] GregMiscellaneous: zzogl-pg: * Fix a regression of my commit r3965 (missing draw in god of war) git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3989 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/Regs.cpp | 4 ++-- plugins/zzogl-pg/opengl/ZZoglVB.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/zzogl-pg/opengl/Regs.cpp b/plugins/zzogl-pg/opengl/Regs.cpp index c1810f8c12..acdb9a8d0c 100644 --- a/plugins/zzogl-pg/opengl/Regs.cpp +++ b/plugins/zzogl-pg/opengl/Regs.cpp @@ -93,7 +93,7 @@ void __gifCall GIFPackedRegHandlerXYZF2(const u32* data) GIFPackedXYZF2* r = (GIFPackedXYZF2*)(data); gs.add_vertex(r->X, r->Y,r->Z, r->F); - ZZKick->KickVertex(!!(data[3]>>31)); + ZZKick->KickVertex(!!(data[3]>>15)); } void __gifCall GIFPackedRegHandlerXYZ2(const u32* data) @@ -102,7 +102,7 @@ void __gifCall GIFPackedRegHandlerXYZ2(const u32* data) GIFPackedXYZ2* r = (GIFPackedXYZ2*)(data); gs.add_vertex(r->X, r->Y,r->Z); - ZZKick->KickVertex(!!(data[3]>>31)); + ZZKick->KickVertex(!!(data[3]>>15)); } void __gifCall GIFPackedRegHandlerFOG(const u32* data) diff --git a/plugins/zzogl-pg/opengl/ZZoglVB.h b/plugins/zzogl-pg/opengl/ZZoglVB.h index 0a0678e34f..7b5684177e 100644 --- a/plugins/zzogl-pg/opengl/ZZoglVB.h +++ b/plugins/zzogl-pg/opengl/ZZoglVB.h @@ -86,7 +86,7 @@ class VB // Increase the size of pbuf void IncreaseVertexBuffer() { - assert(pBufferData != NULL && nCount > nNumVertices); + assert(pBufferData != NULL); nNumVertices *= 2; VertexGPU* ptemp = (VertexGPU*)_aligned_malloc(sizeof(VertexGPU) * nNumVertices, 256); memcpy_amd(ptemp, pBufferData, sizeof(VertexGPU) * nCount);