From 0f69c325ade3412be325325df96caa4c3468a163 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 8 Apr 2016 10:30:18 +0200
Subject: [PATCH] Revert "Fix SDL compile on linux. Took the opportunity to
 remove a number of"

Partial revert only, some changes still in
This reverts commit 632b10cd0ec304c0367321a5be62164d00b18ff1.
---
 src/osd/modules/render/bgfx/chainentry.cpp       | 3 +--
 src/osd/modules/render/bgfx/chainentryreader.cpp | 2 ++
 src/osd/modules/render/bgfx/chainmanager.cpp     | 7 ++++---
 src/osd/modules/render/bgfx/chainreader.cpp      | 1 +
 src/osd/modules/render/bgfx/effectmanager.cpp    | 9 ++-------
 src/osd/modules/render/bgfx/effectreader.cpp     | 2 ++
 src/osd/modules/render/bgfx/shadermanager.cpp    | 8 +-------
 src/osd/modules/render/bgfx/slider.cpp           | 2 ++
 src/osd/modules/render/bgfx/sliderreader.cpp     | 1 +
 src/osd/modules/render/bgfx/statereader.h        | 4 ++--
 src/osd/modules/render/bgfx/targetreader.cpp     | 1 +
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index 6e69968ab07..b8e47eea624 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -9,14 +9,13 @@
 //
 //============================================================
 
+#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 057e2279eee..0aa7085cb7f 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.cpp
+++ b/src/osd/modules/render/bgfx/chainentryreader.cpp
@@ -8,6 +8,8 @@
 
 #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 7a013fdd4d8..08ea0d901b3 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -9,11 +9,12 @@
 //
 //============================================================
 
+#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>
 
@@ -283,4 +284,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 4250421ac16..204e7f1b6ce 100644
--- a/src/osd/modules/render/bgfx/chainreader.cpp
+++ b/src/osd/modules/render/bgfx/chainreader.cpp
@@ -10,6 +10,7 @@
 #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 0fa76762836..082ec10793c 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -9,18 +9,13 @@
 //
 //============================================================
 
+#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 c01da19b868..f8e21974ead 100644
--- a/src/osd/modules/render/bgfx/effectreader.cpp
+++ b/src/osd/modules/render/bgfx/effectreader.cpp
@@ -10,6 +10,8 @@
 
 #include <bgfx/bgfx.h>
 
+#include "emu.h"
+
 #include "effect.h"
 #include "blendreader.h"
 #include "depthreader.h"
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index de005b15630..12dfd15910b 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -9,17 +9,11 @@
 //
 //============================================================
 
+#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 9e59722408b..cd27c973451 100644
--- a/src/osd/modules/render/bgfx/slider.cpp
+++ b/src/osd/modules/render/bgfx/slider.cpp
@@ -6,6 +6,8 @@
 //
 //============================================================
 
+#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 0c6636286c5..66d99df8f6d 100644
--- a/src/osd/modules/render/bgfx/sliderreader.cpp
+++ b/src/osd/modules/render/bgfx/sliderreader.cpp
@@ -8,6 +8,7 @@
 
 #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.h b/src/osd/modules/render/bgfx/statereader.h
index 11c8331a46e..4881120fb3b 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/targetreader.cpp b/src/osd/modules/render/bgfx/targetreader.cpp
index edab7b4f3ba..26a2e21bfc3 100644
--- a/src/osd/modules/render/bgfx/targetreader.cpp
+++ b/src/osd/modules/render/bgfx/targetreader.cpp
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "emu.h"
 #include <modules/lib/osdobj_common.h>
 
 #include "targetreader.h"