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

Do some minor changes to support compilers running strict C++17 conventions.

This commit is contained in:
rogerman 2021-08-30 12:50:15 -07:00
parent 3b06be0d07
commit 0d51b40479
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/OGLRender.cpp
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2006 yopyop Copyright (C) 2006 yopyop
Copyright (C) 2006-2007 shash Copyright (C) 2006-2007 shash
Copyright (C) 2008-2019 DeSmuME team Copyright (C) 2008-2021 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1300,7 +1300,7 @@ OpenGLRenderer::OpenGLRenderer()
_emulateDepthLEqualPolygonFacing = false; _emulateDepthLEqualPolygonFacing = false;
// Init OpenGL rendering states // Init OpenGL rendering states
ref = new OGLRenderRef; ref = (OGLRenderRef *)malloc(sizeof(OGLRenderRef));
memset(ref, 0, sizeof(OGLRenderRef)); memset(ref, 0, sizeof(OGLRenderRef));
_mappedFramebuffer = NULL; _mappedFramebuffer = NULL;
@ -1324,7 +1324,7 @@ OpenGLRenderer::~OpenGLRenderer()
free_aligned(this->_workingTextureUnpackBuffer); free_aligned(this->_workingTextureUnpackBuffer);
// Destroy OpenGL rendering states // Destroy OpenGL rendering states
delete this->ref; free(this->ref);
this->ref = NULL; this->ref = NULL;
} }

30
desmume/src/filter/2xsai.cpp
View File

@ -117,14 +117,14 @@ static inline u32 INTERPOLATE (u32 A, u32 B)
static inline u32 Q_INTERPOLATE (u32 A, u32 B, u32 C, u32 D) static inline u32 Q_INTERPOLATE (u32 A, u32 B, u32 C, u32 D)
{ {
register u32 x = ((A & qcolorMask) >> 2) + u32 x = ((A & qcolorMask) >> 2) +
((B & qcolorMask) >> 2) + ((B & qcolorMask) >> 2) +
((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2); ((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2);
register u32 y = (A & qlowpixelMask) + u32 y = (A & qlowpixelMask) +
(B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask); (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
y = (y >> 2) & qlowpixelMask; y = (y >> 2) & qlowpixelMask;
return x + y; return x + y;
} }
#define BLUE_MASK565 0x001F001F #define BLUE_MASK565 0x001F001F
@ -189,7 +189,7 @@ void Super2xSaI (u8 *srcPtr, u32 srcPitch,
} else if (color5 == color3 && color2 != color6) { } else if (color5 == color3 && color2 != color6) {
product2b = product1b = color5; product2b = product1b = color5;
} else if (color5 == color3 && color2 == color6) { } else if (color5 == color3 && color2 == color6) {
register int r = 0; int r = 0;
r += GetResult (color6, color5, color1, colorA1); r += GetResult (color6, color5, color1, colorA1);
r += GetResult (color6, color5, color4, colorB1); r += GetResult (color6, color5, color4, colorB1);
@ -321,7 +321,7 @@ void Super2xSaI32 (u8 *srcPtr, u32 srcPitch,
} else if (color5 == color3 && color2 != color6) { } else if (color5 == color3 && color2 != color6) {
product2b = product1b = color5; product2b = product1b = color5;
} else if (color5 == color3 && color2 == color6) { } else if (color5 == color3 && color2 == color6) {
register int r = 0; int r = 0;
r += GetResult (color6, color5, color1, colorA1); r += GetResult (color6, color5, color1, colorA1);
r += GetResult (color6, color5, color4, colorB1); r += GetResult (color6, color5, color4, colorB1);
@ -470,7 +470,7 @@ void SuperEagle (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
} }
} else if (color5 == color3 && color2 == color6) { } else if (color5 == color3 && color2 == color6) {
register int r = 0; int r = 0;
r += GetResult (color6, color5, color1, colorA1); r += GetResult (color6, color5, color1, colorA1);
r += GetResult (color6, color5, color4, colorB1); r += GetResult (color6, color5, color4, colorB1);
@ -605,7 +605,7 @@ void SuperEagle32 (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
} }
} else if (color5 == color3 && color2 == color6) { } else if (color5 == color3 && color2 == color6) {
register int r = 0; int r = 0;
r += GetResult (color6, color5, color1, colorA1); r += GetResult (color6, color5, color1, colorA1);
r += GetResult (color6, color5, color4, colorB1); r += GetResult (color6, color5, color4, colorB1);
@ -675,7 +675,7 @@ void _2xSaI (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
for (u32 finish = width; finish; finish -= inc_bP) { for (u32 finish = width; finish; finish -= inc_bP) {
register u32 colorA, colorB; u32 colorA, colorB;
u32 colorC, colorD, u32 colorC, colorD,
colorE, colorF, colorG, colorH, colorE, colorF, colorG, colorH,
colorI, colorJ, colorK, colorL, colorI, colorJ, colorK, colorL,
@ -748,7 +748,7 @@ void _2xSaI (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
product1 = colorA; product1 = colorA;
product2 = colorA; product2 = colorA;
} else { } else {
register int r = 0; int r = 0;
product1 = INTERPOLATE (colorA, colorC); product1 = INTERPOLATE (colorA, colorC);
product = INTERPOLATE (colorA, colorB); product = INTERPOLATE (colorA, colorB);
@ -825,7 +825,7 @@ void _2xSaI32 (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
dP = (u32 *) dstPtr; dP = (u32 *) dstPtr;
for (u32 finish = width; finish; finish -= inc_bP) { for (u32 finish = width; finish; finish -= inc_bP) {
register u32 colorA, colorB; u32 colorA, colorB;
u32 colorC, colorD, u32 colorC, colorD,
colorE, colorF, colorG, colorH, colorE, colorF, colorG, colorH,
colorI, colorJ, colorK, colorL, colorI, colorJ, colorK, colorL,
@ -898,7 +898,7 @@ void _2xSaI32 (u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
product1 = colorA; product1 = colorA;
product2 = colorA; product2 = colorA;
} else { } else {
register int r = 0; int r = 0;
product1 = INTERPOLATE (colorA, colorC); product1 = INTERPOLATE (colorA, colorC);
product = INTERPOLATE (colorA, colorB); product = INTERPOLATE (colorA, colorB);