From d9ad061e2a626c68379253ed61286c7de8f677ec Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 15 Oct 2015 12:47:00 +0200 Subject: [PATCH] Did this change until proper fix comes (nw) --- 3rdparty/bgfx/src/bgfx.cpp | 4 ++-- 3rdparty/bgfx/src/config.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdparty/bgfx/src/bgfx.cpp b/3rdparty/bgfx/src/bgfx.cpp index dca9c1d9da6..279fd7564c0 100644 --- a/3rdparty/bgfx/src/bgfx.cpp +++ b/3rdparty/bgfx/src/bgfx.cpp @@ -1501,11 +1501,11 @@ namespace bgfx { d3d9::rendererCreate, d3d9::rendererDestroy, BGFX_RENDERER_DIRECT3D9_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D9 }, // Direct3D9 { d3d11::rendererCreate, d3d11::rendererDestroy, BGFX_RENDERER_DIRECT3D11_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D11 }, // Direct3D11 { d3d12::rendererCreate, d3d12::rendererDestroy, BGFX_RENDERER_DIRECT3D12_NAME, !!BGFX_CONFIG_RENDERER_DIRECT3D12 }, // Direct3D12 -#if BX_PLATFORM_OSX || BX_PLATFORM_IOS +#if BGFX_CONFIG_RENDERER_METAL { mtl::rendererCreate, mtl::rendererDestroy, BGFX_RENDERER_METAL_NAME, !!BGFX_CONFIG_RENDERER_METAL }, // Metal #else { noop::rendererCreate, noop::rendererDestroy, BGFX_RENDERER_NULL_NAME, !!BGFX_CONFIG_RENDERER_NULL }, // Noop -#endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS +#endif // BGFX_CONFIG_RENDERER_METAL { gl::rendererCreate, gl::rendererDestroy, BGFX_RENDERER_OPENGL_NAME, !!BGFX_CONFIG_RENDERER_OPENGLES }, // OpenGLES { gl::rendererCreate, gl::rendererDestroy, BGFX_RENDERER_OPENGL_NAME, !!BGFX_CONFIG_RENDERER_OPENGL }, // OpenGL { vk::rendererCreate, vk::rendererDestroy, BGFX_RENDERER_VULKAN_NAME, !!BGFX_CONFIG_RENDERER_VULKAN }, // Vulkan diff --git a/3rdparty/bgfx/src/config.h b/3rdparty/bgfx/src/config.h index 7aecc9b064b..7ed64c04325 100644 --- a/3rdparty/bgfx/src/config.h +++ b/3rdparty/bgfx/src/config.h @@ -44,7 +44,6 @@ # ifndef BGFX_CONFIG_RENDERER_METAL # define BGFX_CONFIG_RENDERER_METAL (0 \ || BX_PLATFORM_IOS \ - || BX_PLATFORM_OSX \ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_METAL