AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-17 17:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS X enum refactor fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-11-20 16:16:15 -10:00
parent c9edf8dd85
commit d040e20096
8 changed files with 112 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boo/IWindow.hpp
View File

@@ -173,18 +173,7 @@ enum class EWindowStyle
Default = Titlebar | Resize | Close
};
inline EWindowStyle operator|(EWindowStyle a, EWindowStyle b)
{
using T = std::underlying_type_t<EWindowStyle>;
return EWindowStyle(static_cast<T>(a) | static_cast<T>(b));
}
inline EWindowStyle operator&(EWindowStyle a, EWindowStyle b)
{
using T = std::underlying_type_t<EWindowStyle>;
return EWindowStyle(static_cast<T>(a) & static_cast<T>(b));
}
ENABLE_BITWISE_ENUM(EWindowStyle)
class IWindow
{

13
include/boo/graphicsdev/Metal.hpp
View File

@@ -1,5 +1,11 @@
#ifndef GDEV_METAL_HPP
#define GDEV_METAL_HPP
#ifdef __APPLE__
#include <Availability.h>
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
#define BOO_HAS_METAL 1
#include "IGraphicsDataFactory.hpp"
#include "IGraphicsCommandQueue.hpp"
@@ -22,7 +28,7 @@ public:
MetalDataFactory(IGraphicsContext* parent, MetalContext* ctx);
~MetalDataFactory() {}
Platform platform() const {return PlatformMetal;}
Platform platform() const {return Platform::Metal;}
const char* platformName() const {return "Metal";}
IGraphicsBufferS* newStaticBuffer(BufferUse use, const void* data, size_t stride, size_t count);
@@ -59,4 +65,9 @@ public:
}
#else
#define BOO_HAS_METAL 0
#endif
#endif // __APPLE__
#endif // GDEV_METAL_HPP