summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/render.h1
-rw-r--r--src/osd/modules/render/bgfx/chain.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainentry.cpp3
-rw-r--r--src/osd/modules/render/bgfx/chainentryreader.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp7
-rw-r--r--src/osd/modules/render/bgfx/chainreader.cpp1
-rw-r--r--src/osd/modules/render/bgfx/effectmanager.cpp9
-rw-r--r--src/osd/modules/render/bgfx/effectreader.cpp2
-rw-r--r--src/osd/modules/render/bgfx/inputpair.cpp2
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.cpp8
-rw-r--r--src/osd/modules/render/bgfx/slider.cpp2
-rw-r--r--src/osd/modules/render/bgfx/sliderreader.cpp1
-rw-r--r--src/osd/modules/render/bgfx/statereader.cpp2
-rw-r--r--src/osd/modules/render/bgfx/statereader.h4
-rw-r--r--src/osd/modules/render/bgfx/target.cpp2
-rw-r--r--src/osd/modules/render/bgfx/targetreader.cpp1
-rw-r--r--src/osd/modules/render/bgfx/texture.cpp2
17 files changed, 27 insertions, 24 deletions
diff --git a/src/emu/render.h b/src/emu/render.h
index a8ae826aa2d..13d17e5aced 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -51,6 +51,7 @@
#include <math.h>
#include <mutex>
+#include "bitmap.h"
//**************************************************************************
// CONSTANTS
diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp
index 64e5d36f5ca..313344717d8 100644
--- a/src/osd/modules/render/bgfx/chain.cpp
+++ b/src/osd/modules/render/bgfx/chain.cpp
@@ -6,8 +6,6 @@
//
//============================================================
-#include "emu.h"
-
#include <bx/timer.h>
#include "slider.h"
diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index b8e47eea624..6e69968ab07 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -9,13 +9,14 @@
//
//============================================================
-#include "emu.h"
#include <bgfx/bgfx.h>
#include <bx/fpumath.h>
#include "chainentry.h"
+#include "emu.h"
+#include "render.h"
#include "effect.h"
#include "texture.h"
#include "target.h"
diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp
index 0aa7085cb7f..057e2279eee 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.cpp
+++ b/src/osd/modules/render/bgfx/chainentryreader.cpp
@@ -8,8 +8,6 @@
#include <string>
-#include "emu.h"
-#include "rendutil.h"
#include <modules/render/copyutil.h>
#include <modules/lib/osdobj_common.h>
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 08ea0d901b3..7a013fdd4d8 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -9,12 +9,11 @@
//
//============================================================
-#include "emu.h"
-#include "window.h"
-
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
+#include "window.h"
+
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
@@ -284,4 +283,4 @@ slider_state* chain_manager::get_slider_list()
(*tailptr)->next = nullptr;
}
return listhead;
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp
index 204e7f1b6ce..4250421ac16 100644
--- a/src/osd/modules/render/bgfx/chainreader.cpp
+++ b/src/osd/modules/render/bgfx/chainreader.cpp
@@ -10,7 +10,6 @@
#include <vector>
#include <map>
-#include "emu.h"
#include <modules/lib/osdobj_common.h>
#include "chainreader.h"
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
index 082ec10793c..0fa76762836 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -9,13 +9,18 @@
//
//============================================================
-#include "emu.h"
-
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
#include <bgfx/bgfxplatform.h>
#include <bgfx/bgfx.h>
+
+/* FIXME: Including emu.h here will include src/emu/memory.h.
+ * bx/readerwriter.h includes allocator.h which includes a memory.h as well.
+ * This memory.h is part of bgfx. However, src/emu/memory.h will be included.
+ */
+#include "emu.h"
+
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
diff --git a/src/osd/modules/render/bgfx/effectreader.cpp b/src/osd/modules/render/bgfx/effectreader.cpp
index f8e21974ead..c01da19b868 100644
--- a/src/osd/modules/render/bgfx/effectreader.cpp
+++ b/src/osd/modules/render/bgfx/effectreader.cpp
@@ -10,8 +10,6 @@
#include <bgfx/bgfx.h>
-#include "emu.h"
-
#include "effect.h"
#include "blendreader.h"
#include "depthreader.h"
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index 38a55d71939..d8777257187 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -9,7 +9,7 @@
//
//============================================================
-#include "emu.h"
+#include "emucore.h"
#include "inputpair.h"
#include "texture.h"
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index 12dfd15910b..de005b15630 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -9,11 +9,17 @@
//
//============================================================
-#include "emu.h"
#include <bgfx/bgfxplatform.h>
#include <bgfx/bgfx.h>
#include <bx/fpumath.h>
+
+/* FIXME: Including emu.h here will include src/emu/memory.h.
+ * bx/readerwriter.h includes allocator.h which includes a memory.h as well.
+ * This memory.h is part of bgfx. However, src/emu/memory.h will be included.
+ */
+#include "emu.h"
+
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
diff --git a/src/osd/modules/render/bgfx/slider.cpp b/src/osd/modules/render/bgfx/slider.cpp
index cd27c973451..9e59722408b 100644
--- a/src/osd/modules/render/bgfx/slider.cpp
+++ b/src/osd/modules/render/bgfx/slider.cpp
@@ -6,8 +6,6 @@
//
//============================================================
-#include "emu.h"
-
#include "slider.h"
#include "ui/ui.h"
diff --git a/src/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp
index 66d99df8f6d..0c6636286c5 100644
--- a/src/osd/modules/render/bgfx/sliderreader.cpp
+++ b/src/osd/modules/render/bgfx/sliderreader.cpp
@@ -8,7 +8,6 @@
#include "sliderreader.h"
-#include "emu.h"
#include "slider.h"
const slider_reader::string_to_enum slider_reader::TYPE_NAMES[slider_reader::TYPE_COUNT] = {
diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp
index defb4c65296..91f3bd539bd 100644
--- a/src/osd/modules/render/bgfx/statereader.cpp
+++ b/src/osd/modules/render/bgfx/statereader.cpp
@@ -9,6 +9,8 @@
#include "statereader.h"
+#include <math.h>
+
uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count)
{
if (value.HasMember(name.c_str()))
diff --git a/src/osd/modules/render/bgfx/statereader.h b/src/osd/modules/render/bgfx/statereader.h
index 4881120fb3b..11c8331a46e 100644
--- a/src/osd/modules/render/bgfx/statereader.h
+++ b/src/osd/modules/render/bgfx/statereader.h
@@ -12,11 +12,11 @@
#ifndef __DRAWBGFX_STATE_READER__
#define __DRAWBGFX_STATE_READER__
-#include "emu.h"
-
#include <string>
#include "rapidjson/document.h"
+#include "osdcore.h"
+
using namespace rapidjson;
class state_reader
diff --git a/src/osd/modules/render/bgfx/target.cpp b/src/osd/modules/render/bgfx/target.cpp
index f39a4e3cfdb..4d1d3ea6b2a 100644
--- a/src/osd/modules/render/bgfx/target.cpp
+++ b/src/osd/modules/render/bgfx/target.cpp
@@ -6,7 +6,7 @@
//
//============================================================
-#include "emu.h"
+#include "emucore.h"
#include "target.h"
diff --git a/src/osd/modules/render/bgfx/targetreader.cpp b/src/osd/modules/render/bgfx/targetreader.cpp
index 26a2e21bfc3..edab7b4f3ba 100644
--- a/src/osd/modules/render/bgfx/targetreader.cpp
+++ b/src/osd/modules/render/bgfx/targetreader.cpp
@@ -8,7 +8,6 @@
#include <string>
-#include "emu.h"
#include <modules/lib/osdobj_common.h>
#include "targetreader.h"
diff --git a/src/osd/modules/render/bgfx/texture.cpp b/src/osd/modules/render/bgfx/texture.cpp
index bd69e18e424..c698f7a9ac5 100644
--- a/src/osd/modules/render/bgfx/texture.cpp
+++ b/src/osd/modules/render/bgfx/texture.cpp
@@ -6,7 +6,7 @@
//
//============================================================
-#include "emu.h"
+#include <string.h>
#include "texture.h"