AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Full spelling of 'OpenGL' for enum consistency

This commit is contained in:
Jack Andersen 2016-08-23 18:33:20 -10:00
parent dbf7b9bcf8
commit e92e6d7c4c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -82,7 +82,9 @@ elseif(APPLE)
find_library(APPKIT_LIBRARY AppKit) find_library(APPKIT_LIBRARY AppKit)
find_library(IOKIT_LIBRARY IOKit) find_library(IOKIT_LIBRARY IOKit)
find_library(OPENGL_LIBRARY OpenGL) find_library(OPENGL_LIBRARY OpenGL)
unset(BOO_HAS_METAL CACHE)
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.10) if (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.10)
set(BOO_HAS_METAL ON CACHE BOOL "Metal is available in this OS X version" FORCE)
find_library(METAL_LIBRARY Metal) find_library(METAL_LIBRARY Metal)
list(APPEND _BOO_SYS_DEFINES -DBOO_HAS_METAL=1) list(APPEND _BOO_SYS_DEFINES -DBOO_HAS_METAL=1)
else() else()

8
include/boo/graphicsdev/GL.hpp
View File

@ -26,8 +26,8 @@ public:
GLDataFactory(IGraphicsContext* parent, uint32_t drawSamples); GLDataFactory(IGraphicsContext* parent, uint32_t drawSamples);
~GLDataFactory() {destroyAllData();} ~GLDataFactory() {destroyAllData();}
Platform platform() const {return Platform::OGL;} Platform platform() const {return Platform::OpenGL;}
const SystemChar* platformName() const {return _S("OGL");} const SystemChar* platformName() const {return _S("OpenGL");}
class Context : public IGraphicsDataFactory::Context class Context : public IGraphicsDataFactory::Context
{ {
@ -35,8 +35,8 @@ public:
GLDataFactory& m_parent; GLDataFactory& m_parent;
Context(GLDataFactory& parent) : m_parent(parent) {} Context(GLDataFactory& parent) : m_parent(parent) {}
public: public:
Platform platform() const {return Platform::OGL;} Platform platform() const {return Platform::OpenGL;}
const SystemChar* platformName() const {return _S("OGL");} const SystemChar* platformName() const {return _S("OpenGL");}
IGraphicsBufferS* newStaticBuffer(BufferUse use, const void* data, size_t stride, size_t count); IGraphicsBufferS* newStaticBuffer(BufferUse use, const void* data, size_t stride, size_t count);
IGraphicsBufferD* newDynamicBuffer(BufferUse use, size_t stride, size_t count); IGraphicsBufferD* newDynamicBuffer(BufferUse use, size_t stride, size_t count);

2
include/boo/graphicsdev/IGraphicsDataFactory.hpp
View File

@ -191,7 +191,7 @@ struct IGraphicsDataFactory
enum class Platform enum class Platform
{ {
Null, Null,
OGL, OpenGL,
D3D11, D3D11,
D3D12, D3D12,
Metal, Metal,

4
lib/graphicsdev/GL.cpp
View File

@ -753,8 +753,8 @@ static const GLenum SEMANTIC_TYPE_TABLE[] =
struct GLCommandQueue : IGraphicsCommandQueue struct GLCommandQueue : IGraphicsCommandQueue
{ {
Platform platform() const {return IGraphicsDataFactory::Platform::OGL;} Platform platform() const {return IGraphicsDataFactory::Platform::OpenGL;}
const SystemChar* platformName() const {return _S("OGL");} const SystemChar* platformName() const {return _S("OpenGL");}
IGraphicsContext* m_parent = nullptr; IGraphicsContext* m_parent = nullptr;
struct Command struct Command

2
test/main.cpp
View File

@ -277,7 +277,7 @@ struct TestApplicationCallback : IApplicationCallback
/* Make shader pipeline */ /* Make shader pipeline */
IShaderPipeline* pipeline = nullptr; IShaderPipeline* pipeline = nullptr;
auto plat = ctx.platform(); auto plat = ctx.platform();
if (plat == IGraphicsDataFactory::Platform::OGL) if (plat == IGraphicsDataFactory::Platform::OpenGL)
{ {
GLDataFactory::Context& glF = dynamic_cast<GLDataFactory::Context&>(ctx); GLDataFactory::Context& glF = dynamic_cast<GLDataFactory::Context&>(ctx);