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

zzogl: kill a couple of gcc warning

This commit is contained in:
Gregory Hainaut 2014-06-13 22:38:04 +02:00
parent eb947dc325
commit cdba010794
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/zzogl-pg/opengl/GS.h
View File

@ -527,23 +527,23 @@ extern char* NamedSaveTex(tex0Info* ptex, int usevid);
typedef struct typedef struct
{ {
int lcm; u32 lcm;
int mxl; u32 mxl;
int mmag; u32 mmag;
int mmin; u32 mmin;
int mtba; u32 mtba;
int l; u32 l;
int k; u32 k;
} tex1Info; } tex1Info;
typedef struct typedef struct
{ {
int wms; u32 wms;
int wmt; u32 wmt;
int minu; u32 minu;
int maxu; u32 maxu;
int minv; u32 minv;
int maxv; u32 maxv;
} clampInfo; } clampInfo;
typedef struct typedef struct

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

@ -487,8 +487,12 @@ inline void FlushSetContextTarget(VB& curvb, int context)
{ {
if (!curvb.zbuf.zmsk) if (!curvb.zbuf.zmsk)
{ {
#ifdef NDEBUG
s_DepthRTs.Promote(GetFrameKey(curvb.pdepth));
#else
CRenderTarget* ptemp = s_DepthRTs.Promote(GetFrameKey(curvb.pdepth)); CRenderTarget* ptemp = s_DepthRTs.Promote(GetFrameKey(curvb.pdepth));
assert(ptemp == curvb.pdepth); assert(ptemp == curvb.pdepth);
#endif
} }
else else
{ {
@ -1668,8 +1672,12 @@ void SetContextTarget(int context)
if (!curvb.zbuf.zmsk) if (!curvb.zbuf.zmsk)
{ {
#ifdef NDEBUG
s_DepthRTs.Promote(curvb.pdepth->fbp | (curvb.pdepth->fbw << 16));
#else
CRenderTarget* ptemp = s_DepthRTs.Promote(curvb.pdepth->fbp | (curvb.pdepth->fbw << 16)); CRenderTarget* ptemp = s_DepthRTs.Promote(curvb.pdepth->fbp | (curvb.pdepth->fbw << 16));
assert(ptemp == curvb.pdepth); assert(ptemp == curvb.pdepth);
#endif
} }
else else
{ {