From 241db19cfba38061b88088b16206862a00b53db3 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 20 Aug 2019 01:06:14 -0700 Subject: [PATCH] Avoid using None in enums, fix compilation --- include/boo/IGraphicsContext.hpp | 4 ++-- include/boo/audiodev/MIDIDecoder.hpp | 1 + include/boo/graphicsdev/Vulkan.hpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/boo/IGraphicsContext.hpp b/include/boo/IGraphicsContext.hpp index 8053a52..334822d 100644 --- a/include/boo/IGraphicsContext.hpp +++ b/include/boo/IGraphicsContext.hpp @@ -14,7 +14,7 @@ class IGraphicsContext { public: enum class EGraphicsAPI { - None = 0, + Invalid = 0, OpenGL3_3 = 1, OpenGL4_2 = 2, Vulkan = 3, @@ -26,7 +26,7 @@ public: }; enum class EPixelFormat { - None = 0, + Invalid = 0, RGBA8 = 1, /* Default */ RGBA16 = 2, RGBA8_Z24 = 3, diff --git a/include/boo/audiodev/MIDIDecoder.hpp b/include/boo/audiodev/MIDIDecoder.hpp index f4f3a99..793c977 100644 --- a/include/boo/audiodev/MIDIDecoder.hpp +++ b/include/boo/audiodev/MIDIDecoder.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include namespace boo { class IMIDIReader; diff --git a/include/boo/graphicsdev/Vulkan.hpp b/include/boo/graphicsdev/Vulkan.hpp index e073051..a5d2600 100644 --- a/include/boo/graphicsdev/Vulkan.hpp +++ b/include/boo/graphicsdev/Vulkan.hpp @@ -9,6 +9,7 @@ #include "boo/BooObject.hpp" #include "boo/IGraphicsContext.hpp" #include "boo/System.hpp" +#include "boo/IWindow.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "boo/graphicsdev/VulkanDispatchTable.hpp"