Browse Source

Added D3D12 enum.

Branimir Karadžić 11 years ago
parent
commit
a57634cd09
2 changed files with 5 additions and 2 deletions
  1. 2 1
      include/bgfx.h
  2. 3 1
      src/bgfx.cpp

+ 2 - 1
include/bgfx.h

@@ -46,7 +46,8 @@ namespace bgfx
 			Null,         //!< No rendering.
 			Null,         //!< No rendering.
 			Direct3D9,    //!< Direct3D 9.0
 			Direct3D9,    //!< Direct3D 9.0
 			Direct3D11,   //!< Direct3D 11.0
 			Direct3D11,   //!< Direct3D 11.0
-			OpenGLES = 4, //!< OpenGL ES 2.0+
+			Direct3D12,   //!< Direct3D 12.0
+			OpenGLES,     //!< OpenGL ES 2.0+
 			OpenGL,       //!< OpenGL 2.1+
 			OpenGL,       //!< OpenGL 2.1+
 
 
 			Count
 			Count

+ 3 - 1
src/bgfx.cpp

@@ -1391,10 +1391,12 @@ again:
 
 
 				if (windowsVersionIs(Condition::GreaterEqual, 0x0602) )
 				if (windowsVersionIs(Condition::GreaterEqual, 0x0602) )
 				{
 				{
-					first  = RendererType::Direct3D11 /* Direct3D12 */;
+					first  = RendererType::Direct3D12;
 					second = RendererType::Direct3D11;
 					second = RendererType::Direct3D11;
 					if (!s_rendererCreator[second].supported)
 					if (!s_rendererCreator[second].supported)
+					{
 						second = RendererType::Direct3D9;
 						second = RendererType::Direct3D9;
+					}
 				}
 				}
 				else if (windowsVersionIs(Condition::GreaterEqual, 0x0601) )
 				else if (windowsVersionIs(Condition::GreaterEqual, 0x0601) )
 				{
 				{