summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-10-15 10:52:18 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-10-15 10:52:18 +0200
commit58bf8e3345f40a465009c5ab5fb4a13b1530727d (patch)
treed4b4ace519bde452100f403f5d1a41e85ed24cfe
parent8981faa61fc1e9421805938e6656d84ff61be1f9 (diff)
Disabled DX12 on mingw since it is not working (nw)
-rw-r--r--3rdparty/bgfx/src/bgfx.cpp4
-rw-r--r--scripts/src/3rdparty.lua2
-rw-r--r--src/osd/modules/render/drawbgfx.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/3rdparty/bgfx/src/bgfx.cpp b/3rdparty/bgfx/src/bgfx.cpp
index 34d56ddbc65..dca9c1d9da6 100644
--- a/3rdparty/bgfx/src/bgfx.cpp
+++ b/3rdparty/bgfx/src/bgfx.cpp
@@ -1563,7 +1563,11 @@ again:
if (windowsVersionIs(Condition::GreaterEqual, 0x0602) )
{
+#if defined(__MINGW32__)
+ first = RendererType::Direct3D11;
+#else
first = RendererType::Direct3D12;
+#endif // __MINGW32__
second = RendererType::Direct3D11;
if (!s_rendererCreator[second].supported)
{
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 3fef7c5ea23..bbe07a80b9a 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -645,7 +645,7 @@ project "bgfx"
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp",
- MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
+ --MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
}
diff --git a/src/osd/modules/render/drawbgfx.c b/src/osd/modules/render/drawbgfx.c
index e68b43fdfe7..1920aa94684 100644
--- a/src/osd/modules/render/drawbgfx.c
+++ b/src/osd/modules/render/drawbgfx.c
@@ -28,8 +28,8 @@
#include "emu.h"
#include "window.h"
-#include <bgfxplatform.h>
-#include <bgfx.h>
+#include <bgfx/bgfxplatform.h>
+#include <bgfx/bgfx.h>
//============================================================
// DEBUGGING