Emulation/mupen64plus-video-rice
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-video-rice.git synced 2024-05-31 18:27:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings in win32

Browse source
This commit is contained in:
Richard Goedeken 2019-06-02 23:14:59 -07:00
parent e1eced47b4
commit cc26180a20
2 changed files with 2 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Render.cpp
View file

@ -733,9 +733,9 @@ bool CRender::TexRect(int nX0, int nY0, int nX1, int nY1, float fS0, float fT0,
float depth = (gRDP.otherMode.depth_source == 1 ? gRDP.fPrimitiveDepth : 0 );
// -0.02 : hack here (arbitrary value...). I guess this offset has do be found "somewhere"
if( depth > 0.02 )
if( depth > 0.02f )
{
depth -= 0.02;
depth -= 0.02f;
}
g_texRectTVtx[0].z = g_texRectTVtx[1].z = g_texRectTVtx[2].z = g_texRectTVtx[3].z = depth;

72
src/TextureFilters_hq2x.cpp
View file

@ -301,42 +301,6 @@ static void hq2x_32_def(uint32* dst0, uint32* dst1, const uint32* src0, const ui
if (hq2x_interp_32_diff(c[8], c[4]))
mask |= 1 << 7;
#define P0 dst0[0]
#define P1 dst0[1]
#define P2 dst1[0]
#define P3 dst1[1]
#define HQ2X_MUR hq2x_interp_32_diff(c[1], c[5])
#define HQ2X_MDR hq2x_interp_32_diff(c[5], c[7])
#define HQ2X_MDL hq2x_interp_32_diff(c[7], c[3])
#define HQ2X_MUL hq2x_interp_32_diff(c[3], c[1])
#define IC(p0) c[p0]
switch (mask) {
}
#undef P0
#undef P1
#undef P2
#undef P3
#undef HQ2X_MUR
#undef HQ2X_MDR
#undef HQ2X_MDL
#undef HQ2X_MUL
#undef IC
#undef I11
#undef I211
#undef I31
#undef I332
#undef I431
#undef I521
#undef I53
#undef I611
#undef I71
#undef I772
#undef I97
#undef I1411
#undef I151
src0 += 1;
src1 += 1;
src2 += 1;
@ -507,42 +471,6 @@ static void lq2x_32_def(uint32* dst0, uint32* dst1, const uint32* src0, const ui
if (c[8] != c[4])
mask |= 1 << 7;
#define P0 dst0[0]
#define P1 dst0[1]
#define P2 dst1[0]
#define P3 dst1[1]
#define HQ2X_MUR (c[1] != c[5])
#define HQ2X_MDR (c[5] != c[7])
#define HQ2X_MDL (c[7] != c[3])
#define HQ2X_MUL (c[3] != c[1])
#define IC(p0) c[p0]
switch (mask) {
}
#undef P0
#undef P1
#undef P2
#undef P3
#undef HQ2X_MUR
#undef HQ2X_MDR
#undef HQ2X_MDL
#undef HQ2X_MUL
#undef IC
#undef I11
#undef I211
#undef I31
#undef I332
#undef I431
#undef I521
#undef I53
#undef I611
#undef I71
#undef I772
#undef I97
#undef I1411
#undef I151
src0 += 1;
src1 += 1;
src2 += 1;