From a3b4058bf7266f1291cf38c30425d9948250fcd9 Mon Sep 17 00:00:00 2001 From: Branimir Karadžić Date: Sat, 29 Oct 2016 09:11:50 +0200 Subject: Updated BGFX and BX and recompiled shaders (nw) --- 3rdparty/bgfx/examples/common/bgfx_utils.cpp | 32 +++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to '3rdparty/bgfx/examples/common/bgfx_utils.cpp') diff --git a/3rdparty/bgfx/examples/common/bgfx_utils.cpp b/3rdparty/bgfx/examples/common/bgfx_utils.cpp index 6f2d29f0fef..7216b067088 100644 --- a/3rdparty/bgfx/examples/common/bgfx_utils.cpp +++ b/3rdparty/bgfx/examples/common/bgfx_utils.cpp @@ -108,28 +108,22 @@ static bgfx::ShaderHandle loadShader(bx::FileReaderI* _reader, const char* _name { char filePath[512]; - const char* shaderPath = "shaders/dx9/"; + const char* shaderPath = "???"; switch (bgfx::getRendererType() ) { + case bgfx::RendererType::Noop: + case bgfx::RendererType::Direct3D9: shaderPath = "shaders/dx9/"; break; case bgfx::RendererType::Direct3D11: - case bgfx::RendererType::Direct3D12: - shaderPath = "shaders/dx11/"; - break; - - case bgfx::RendererType::OpenGL: - shaderPath = "shaders/glsl/"; - break; - - case bgfx::RendererType::Metal: - shaderPath = "shaders/metal/"; - break; - - case bgfx::RendererType::OpenGLES: - shaderPath = "shaders/gles/"; - break; - - default: + case bgfx::RendererType::Direct3D12: shaderPath = "shaders/dx11/"; break; + case bgfx::RendererType::Gnm: shaderPath = "shaders/pssl/"; break; + case bgfx::RendererType::Metal: shaderPath = "shaders/metal/"; break; + case bgfx::RendererType::OpenGL: shaderPath = "shaders/glsl/"; break; + case bgfx::RendererType::OpenGLES: shaderPath = "shaders/essl/"; break; + case bgfx::RendererType::Vulkan: shaderPath = "shaders/spirv/"; break; + + case bgfx::RendererType::Count: + BX_CHECK(false, "You should not be here!"); break; } @@ -760,7 +754,7 @@ Args::Args(int _argc, char** _argv) } else if (cmdLine.hasArg("noop") ) { - m_type = bgfx::RendererType::Null; + m_type = bgfx::RendererType::Noop; } else if (BX_ENABLED(BX_PLATFORM_WINDOWS) ) { -- cgit v1.2.3-70-g09d2