From cf952906b842e6e99399380291d484fec17bca5a Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Thu, 12 May 2022 11:13:04 -0400
Subject: [PATCH] Windows build fixes

---
 Runtime/Graphics/GX.hpp        | 14 +++++++-------
 Runtime/World/CWorldShadow.cpp |  2 +-
 aurora/lib/input.cpp           |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Runtime/Graphics/GX.hpp b/Runtime/Graphics/GX.hpp
index 99089ad93..749a4d48d 100644
--- a/Runtime/Graphics/GX.hpp
+++ b/Runtime/Graphics/GX.hpp
@@ -809,16 +809,16 @@ void GXInitLightAttnA(GX::LightObj* light, float a0, float a1, float a2);
 void GXInitLightAttnK(GX::LightObj* light, float k0, float k1, float k2);
 void GXInitLightSpot(GX::LightObj* light, float cutoff, GX::SpotFn spotFn);
 void GXInitLightDistAttn(GX::LightObj* light, float refDistance, float refBrightness, GX::DistAttnFn distFunc);
-constexpr void GXInitLightShininess(GX::LightObj* light, float shininess) {
+static inline void GXInitLightShininess(GX::LightObj* light, float shininess) {
   GXInitLightAttn(light, 0.f, 0.f, 1.f, (shininess) / 2.f, 0.f, 1.f - (shininess) / 2.f);
 }
 void GXInitLightPos(GX::LightObj* light, float x, float y, float z);
-constexpr void GXInitLightPosv(GX::LightObj* light, float vec[3]) { GXInitLightPos(light, vec[0], vec[1], vec[2]); }
+static inline void GXInitLightPosv(GX::LightObj* light, float vec[3]) { GXInitLightPos(light, vec[0], vec[1], vec[2]); }
 void GXInitLightDir(GX::LightObj* light, float nx, float ny, float nz);
-constexpr void GXInitLightDirv(GX::LightObj* light, float vec[3]) { GXInitLightDir(light, vec[0], vec[1], vec[2]); }
+static inline void GXInitLightDirv(GX::LightObj* light, float vec[3]) { GXInitLightDir(light, vec[0], vec[1], vec[2]); }
 void GXInitSpecularDir(GX::LightObj* light, float nx, float ny, float nz);
 void GXInitSpecularDirHA(GX::LightObj* light, float nx, float ny, float nz, float hx, float hy, float hz);
-constexpr void GXInitLightSpecularDirHAv(GX::LightObj* light, float vecn[3], float vech[3]) {
+static inline void GXInitLightSpecularDirHAv(GX::LightObj* light, float vecn[3], float vech[3]) {
   GXInitSpecularDirHA(light, vecn[0], vecn[1], vecn[2], vech[0], vech[1], vech[2]);
 }
 void GXInitLightColor(GX::LightObj* light, GX::Color col);
@@ -828,12 +828,12 @@ void GXLoadLightObjIndx(u32 index, GX::LightID);
 void GXGetLightAttnA(const GX::LightObj* light, float* a0, float* a1, float* a2);
 void GXGetLightAttnK(const GX::LightObj* light, float* k0, float* k1, float* k2);
 void GXGetLightPos(const GX::LightObj* light, float* x, float* y, float* z);
-constexpr void GXGetLightPosv(const GX::LightObj* light, float* vec[3]) {
+static inline void GXGetLightPosv(const GX::LightObj* light, float* vec[3]) {
   GXGetLightPos(light, vec[0], vec[1], vec[2]);
 }
 void GXGetLightDir(const GX::LightObj* light, float* nx, float* ny, float* nz);
-constexpr void GXGetLightDirv(const GX::LightObj* light, float* vec[3]) {
+static inline void GXGetLightDirv(const GX::LightObj* light, float* vec[3]) {
   GXGetLightDir(light, vec[0], vec[1], vec[2]);
 }
 
-void GXGetLightColor(const GX::LightObj* light, GX::Color* col);
\ No newline at end of file
+void GXGetLightColor(const GX::LightObj* light, GX::Color* col);
diff --git a/Runtime/World/CWorldShadow.cpp b/Runtime/World/CWorldShadow.cpp
index 5ad6de448..91b97f472 100644
--- a/Runtime/World/CWorldShadow.cpp
+++ b/Runtime/World/CWorldShadow.cpp
@@ -82,7 +82,7 @@ void CWorldShadow::BuildLightShadowTexture(const CStateManager& mgr, TAreaId aid
         CCubeModel::SetDrawingOccluders(true);
         g_Renderer->PrepareDynamicLights({});
         // g_Renderer->UpdateAreaUniforms(aid, EWorldShadowMode::WorldOnActorShadow);
-        g_Renderer->DrawUnsortedGeometry(aid, 0, 0, true);
+        g_Renderer->DrawUnsortedGeometry(aid, 0, 0);
         CCubeModel::SetDrawingOccluders(false);
 
         if (lighten) {
diff --git a/aurora/lib/input.cpp b/aurora/lib/input.cpp
index dd35afc3a..d6624ca5c 100644
--- a/aurora/lib/input.cpp
+++ b/aurora/lib/input.cpp
@@ -826,8 +826,8 @@ void PADSetButtonMapping(u32 port, PADButtonMapping mapping) {
     return;
   }
 
-  auto* iter = std::find_if(controller->m_mapping.begin(), controller->m_mapping.end(),
-                            [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
+  auto iter = std::find_if(controller->m_mapping.begin(), controller->m_mapping.end(),
+                           [mapping](const auto& pair) { return mapping.padButton == pair.padButton; });
   if (iter == controller->m_mapping.end()) {
     return;
   }
@@ -964,4 +964,4 @@ void PADRestoreDefaultMapping(u32 port) {
   controller->m_mapping = mDefaultButtons;
 }
 
-void PADBlockInput(bool block) { gBlockPAD = block; }
\ No newline at end of file
+void PADBlockInput(bool block) { gBlockPAD = block; }