From a7ff4f4640552da3bfc271d520079b46b1529a95 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Tue, 1 Feb 2022 11:33:52 +0100 Subject: [PATCH] Add missing includes and fix forgotten renamed enums for Apple --- modules/gaia/rendering/renderablegaiastars.cpp | 8 ++++---- modules/sync/syncs/httpsynchronization.cpp | 1 + modules/sync/syncs/urlsynchronization.cpp | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp index 8f99af50e5..92d79c0535 100644 --- a/modules/gaia/rendering/renderablegaiastars.cpp +++ b/modules/gaia/rendering/renderablegaiastars.cpp @@ -500,11 +500,11 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary) #ifdef __APPLE__ switch (_shaderOption) { - case gaia::ShaderOption::Point_SSBO: - case gaia::ShaderOption::Billboard_SSBO: - case gaia::ShaderOption::Billboard_SSBO_noFBO: + case gaia::ShaderOption::PointSSBO: + case gaia::ShaderOption::BillboardSSBO: + case gaia::ShaderOption::BillboardSSBONoFBO: LWARNING("Shader option unsupported, changing to Point VBO"); - _shaderOption = gaia::ShaderOption::Point_VBO; + _shaderOption = gaia::ShaderOption::PointVBO; } #endif // __APPLE__ } diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 9ae45e57e7..5e8e91ae54 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -28,6 +28,7 @@ #include #include #include +#include namespace { constexpr const char* _loggerCat = "HttpSynchronization"; diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 15107957e2..638241ac99 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include namespace {