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

software renderer: Silence -Wlogical-not-parentheses warnings

This commit is contained in:
Lioncash 2015-10-14 19:28:48 -04:00 committed by Jeffrey Pfau
parent 865f511f52
commit 5d6802d413
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/renderers/software-bg.c
View File

@ -89,7 +89,7 @@ void GBAVideoSoftwareRendererDrawBackgroundMode3(struct GBAVideoSoftwareRenderer
} }
uint32_t current = *pixel; uint32_t current = *pixel;
if (!objwinSlowPath || !(current & FLAG_OBJWIN) != objwinOnly) { if (!objwinSlowPath || (!(current & FLAG_OBJWIN)) != objwinOnly) {
unsigned mergedFlags = flags; unsigned mergedFlags = flags;
if (current & FLAG_OBJWIN) { if (current & FLAG_OBJWIN) {
mergedFlags = objwinFlags; mergedFlags = objwinFlags;
@ -131,7 +131,7 @@ void GBAVideoSoftwareRendererDrawBackgroundMode4(struct GBAVideoSoftwareRenderer
if (color && IS_WRITABLE(current)) { if (color && IS_WRITABLE(current)) {
if (!objwinSlowPath) { if (!objwinSlowPath) {
_compositeBlendNoObjwin(renderer, pixel, palette[color] | flags, current); _compositeBlendNoObjwin(renderer, pixel, palette[color] | flags, current);
} else if (objwinForceEnable || !(current & FLAG_OBJWIN) == objwinOnly) { } else if (objwinForceEnable || (!(current & FLAG_OBJWIN)) == objwinOnly) {
color_t* currentPalette = (current & FLAG_OBJWIN) ? objwinPalette : palette; color_t* currentPalette = (current & FLAG_OBJWIN) ? objwinPalette : palette;
unsigned mergedFlags = flags; unsigned mergedFlags = flags;
if (current & FLAG_OBJWIN) { if (current & FLAG_OBJWIN) {
@ -178,7 +178,7 @@ void GBAVideoSoftwareRendererDrawBackgroundMode5(struct GBAVideoSoftwareRenderer
} }
uint32_t current = *pixel; uint32_t current = *pixel;
if (!objwinSlowPath || !(current & FLAG_OBJWIN) != objwinOnly) { if (!objwinSlowPath || (!(current & FLAG_OBJWIN)) != objwinOnly) {
unsigned mergedFlags = flags; unsigned mergedFlags = flags;
if (current & FLAG_OBJWIN) { if (current & FLAG_OBJWIN) {
mergedFlags = objwinFlags; mergedFlags = objwinFlags;

4
src/gba/renderers/software-private.h
View File

@ -84,7 +84,7 @@ static inline void _compositeNoBlendNoObjwin(struct GBAVideoSoftwareRenderer* re
} }
#define COMPOSITE_16_OBJWIN(BLEND) \ #define COMPOSITE_16_OBJWIN(BLEND) \
if (objwinForceEnable || !(current & FLAG_OBJWIN) == objwinOnly) { \ if (objwinForceEnable || (!(current & FLAG_OBJWIN)) == objwinOnly) { \
unsigned color = (current & FLAG_OBJWIN) ? objwinPalette[paletteData | pixelData] : palette[pixelData]; \ unsigned color = (current & FLAG_OBJWIN) ? objwinPalette[paletteData | pixelData] : palette[pixelData]; \
unsigned mergedFlags = flags; \ unsigned mergedFlags = flags; \
if (current & FLAG_OBJWIN) { \ if (current & FLAG_OBJWIN) { \
@ -97,7 +97,7 @@ static inline void _compositeNoBlendNoObjwin(struct GBAVideoSoftwareRenderer* re
_composite ## BLEND ## NoObjwin(renderer, pixel, palette[pixelData] | flags, current); _composite ## BLEND ## NoObjwin(renderer, pixel, palette[pixelData] | flags, current);
#define COMPOSITE_256_OBJWIN(BLEND) \ #define COMPOSITE_256_OBJWIN(BLEND) \
if (objwinForceEnable || !(current & FLAG_OBJWIN) == objwinOnly) { \ if (objwinForceEnable || (!(current & FLAG_OBJWIN)) == objwinOnly) { \
unsigned color = (current & FLAG_OBJWIN) ? objwinPalette[pixelData] : palette[pixelData]; \ unsigned color = (current & FLAG_OBJWIN) ? objwinPalette[pixelData] : palette[pixelData]; \
unsigned mergedFlags = flags; \ unsigned mergedFlags = flags; \
if (current & FLAG_OBJWIN) { \ if (current & FLAG_OBJWIN) { \