From a57634cd095539f8aebe1ad062d20a726a348dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 15 Feb 2015 18:27:54 -0800 Subject: [PATCH] Added D3D12 enum. --- include/bgfx.h | 3 ++- src/bgfx.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/bgfx.h b/include/bgfx.h index 31bf19a6..4c870c53 100644 --- a/include/bgfx.h +++ b/include/bgfx.h @@ -46,7 +46,8 @@ namespace bgfx Null, //!< No rendering. Direct3D9, //!< Direct3D 9.0 Direct3D11, //!< Direct3D 11.0 - OpenGLES = 4, //!< OpenGL ES 2.0+ + Direct3D12, //!< Direct3D 12.0 + OpenGLES, //!< OpenGL ES 2.0+ OpenGL, //!< OpenGL 2.1+ Count diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 35320e1a..73ddd5fe 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -1391,10 +1391,12 @@ again: if (windowsVersionIs(Condition::GreaterEqual, 0x0602) ) { - first = RendererType::Direct3D11 /* Direct3D12 */; + first = RendererType::Direct3D12; second = RendererType::Direct3D11; if (!s_rendererCreator[second].supported) + { second = RendererType::Direct3D9; + } } else if (windowsVersionIs(Condition::GreaterEqual, 0x0601) ) {