Added D3D12 enum.

This commit is contained in:
Branimir Karadžić 2015-02-15 18:27:54 -08:00
parent 694ce002f0
commit a57634cd09
2 changed files with 5 additions and 2 deletions

View file

@ -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

View file

@ -1391,11 +1391,13 @@ 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) )
{ {
first = RendererType::Direct3D11; first = RendererType::Direct3D11;