all repos — mgba @ b230b6e0f64dad1f431a38b7c93f2e6ba89757c3

mGBA Game Boy Advance Emulator

Qt: Clang buildfixes
Vicki Pfau vi@endrift.com
Fri, 31 May 2019 16:30:11 -0700
commit

b230b6e0f64dad1f431a38b7c93f2e6ba89757c3

parent

306139a73c77131fd7d4d76bc3750ffd49717fd9

1 files changed, 5 insertions(+), 4 deletions(-)

jump to
M src/platform/qt/FrameView.cppsrc/platform/qt/FrameView.cpp

@@ -10,6 +10,7 @@ #include <QPainter>

#include <QPalette> #include <array> +#include <cmath> #include "CoreController.h"

@@ -135,10 +136,10 @@ QRgb backdrop = M_RGB5_TO_RGB8(static_cast<GBA*>(m_controller->thread()->core->board)->video.palette[0]);

int mode = GBARegisterDISPCNTGetMode(io[REG_DISPCNT >> 1]); std::array<bool, 4> enabled{ - GBARegisterDISPCNTIsBg0Enable(io[REG_DISPCNT >> 1]), - GBARegisterDISPCNTIsBg1Enable(io[REG_DISPCNT >> 1]), - GBARegisterDISPCNTIsBg2Enable(io[REG_DISPCNT >> 1]), - GBARegisterDISPCNTIsBg3Enable(io[REG_DISPCNT >> 1]), + bool(GBARegisterDISPCNTIsBg0Enable(io[REG_DISPCNT >> 1])), + bool(GBARegisterDISPCNTIsBg1Enable(io[REG_DISPCNT >> 1])), + bool(GBARegisterDISPCNTIsBg2Enable(io[REG_DISPCNT >> 1])), + bool(GBARegisterDISPCNTIsBg3Enable(io[REG_DISPCNT >> 1])), }; for (int priority = 0; priority < 4; ++priority) {