From c13089a065523ee1a302b95bcf111ac8264e8444 Mon Sep 17 00:00:00 2001
From: "therealmogminer@gmail.com" <therealmogminer@gmail.com>
Date: Sun, 21 Feb 2016 03:52:22 +0100
Subject: [PATCH] Fix some compile errors, not sure if all(nw)

---
 src/osd/modules/osdwindow.cpp                 |  2 +
 src/osd/modules/render/bgfx/blendreader.cpp   |  8 +++
 src/osd/modules/render/bgfx/blendreader.h     |  8 +++
 src/osd/modules/render/bgfx/chain.cpp         |  8 +++
 src/osd/modules/render/bgfx/chain.h           |  8 +++
 src/osd/modules/render/bgfx/chainentry.cpp    | 11 ++++
 src/osd/modules/render/bgfx/chainentry.h      | 11 ++++
 .../modules/render/bgfx/chainentryreader.cpp  |  8 +++
 .../modules/render/bgfx/chainentryreader.h    |  8 +++
 src/osd/modules/render/bgfx/chainreader.cpp   |  8 +++
 src/osd/modules/render/bgfx/chainreader.h     |  8 +++
 src/osd/modules/render/bgfx/cullreader.cpp    |  8 +++
 src/osd/modules/render/bgfx/cullreader.h      |  8 +++
 src/osd/modules/render/bgfx/depthreader.cpp   |  8 +++
 src/osd/modules/render/bgfx/depthreader.h     |  8 +++
 src/osd/modules/render/bgfx/effect.cpp        |  8 +++
 src/osd/modules/render/bgfx/effect.h          |  8 +++
 src/osd/modules/render/bgfx/effectmanager.cpp | 11 ++++
 src/osd/modules/render/bgfx/effectmanager.h   | 11 ++++
 src/osd/modules/render/bgfx/effectreader.cpp  |  8 +++
 src/osd/modules/render/bgfx/effectreader.h    |  8 +++
 src/osd/modules/render/bgfx/inputpair.cpp     | 11 ++++
 src/osd/modules/render/bgfx/inputpair.h       | 11 ++++
 src/osd/modules/render/bgfx/parameter.cpp     | 35 +++++++++--
 src/osd/modules/render/bgfx/parameter.h       | 12 ++++
 src/osd/modules/render/bgfx/paramreader.cpp   |  8 +++
 src/osd/modules/render/bgfx/paramreader.h     |  8 +++
 src/osd/modules/render/bgfx/shadermanager.cpp | 11 ++++
 src/osd/modules/render/bgfx/shadermanager.h   | 11 ++++
 src/osd/modules/render/bgfx/slider.cpp        |  8 +++
 src/osd/modules/render/bgfx/slider.h          |  8 +++
 src/osd/modules/render/bgfx/sliderreader.cpp  |  8 +++
 src/osd/modules/render/bgfx/sliderreader.h    |  8 +++
 src/osd/modules/render/bgfx/target.cpp        |  8 +++
 src/osd/modules/render/bgfx/target.h          |  8 +++
 src/osd/modules/render/bgfx/targetmanager.cpp | 11 ++++
 src/osd/modules/render/bgfx/targetmanager.h   | 11 ++++
 src/osd/modules/render/bgfx/texture.cpp       |  8 +++
 src/osd/modules/render/bgfx/texture.h         |  8 +++
 .../modules/render/bgfx/texturemanager.cpp    | 11 ++++
 src/osd/modules/render/bgfx/texturemanager.h  | 11 ++++
 src/osd/modules/render/bgfx/uniform.cpp       |  8 +++
 src/osd/modules/render/bgfx/uniform.h         |  8 +++
 src/osd/modules/render/bgfx/uniformreader.cpp |  8 +++
 src/osd/modules/render/bgfx/uniformreader.h   |  8 +++
 src/osd/modules/render/draw13.cpp             | 58 +++++++++----------
 src/osd/modules/render/draw13.h               |  4 +-
 src/osd/modules/render/drawgdi.cpp            |  2 +-
 src/osd/modules/render/drawgdi.h              |  2 +-
 src/osd/modules/render/drawsdl.h              |  8 +--
 50 files changed, 454 insertions(+), 41 deletions(-)

diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
index 3e17dd623fb..29b77cd52e5 100644
--- a/src/osd/modules/osdwindow.cpp
+++ b/src/osd/modules/osdwindow.cpp
@@ -7,10 +7,12 @@
 //============================================================
 
 // standard windows headers
+#ifdef OSD_WINDOWS
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 #include <mmsystem.h>
+#endif
 
 #include "osdwindow.h"
 
diff --git a/src/osd/modules/render/bgfx/blendreader.cpp b/src/osd/modules/render/bgfx/blendreader.cpp
index ce4547879ef..45020a08027 100644
--- a/src/osd/modules/render/bgfx/blendreader.cpp
+++ b/src/osd/modules/render/bgfx/blendreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blendreader.cpp - BGFX blend state JSON reader
+//
+//============================================================
+
 #include <bgfx/bgfx.h>
 
 #include "blendreader.h"
diff --git a/src/osd/modules/render/bgfx/blendreader.h b/src/osd/modules/render/bgfx/blendreader.h
index dac233aba92..6dd16ae5d88 100644
--- a/src/osd/modules/render/bgfx/blendreader.h
+++ b/src/osd/modules/render/bgfx/blendreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blendreader.h - BGFX blend state JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_BLEND_READER__
diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp
index faf72cb5797..271695b56a1 100644
--- a/src/osd/modules/render/bgfx/chain.cpp
+++ b/src/osd/modules/render/bgfx/chain.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chain.cpp - BGFX screen-space post-effect chain
+//
+//============================================================
+
 #include "slider.h"
 #include "parameter.h"
 #include "chainentry.h"
diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h
index b800882a265..c34b1830681 100644
--- a/src/osd/modules/render/bgfx/chain.h
+++ b/src/osd/modules/render/bgfx/chain.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chain.h - BGFX screen-space post-effect chain
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_CHAIN__
diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index 7121d88cbe6..c0b8845cdd3 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainentry.cpp - BGFX shader post-processing node
+//
+//  Represents a single entry in a list of post-processing
+//  passes to be applied to a screen quad or buffer.
+//
+//============================================================
+
 #include "emu.h"
 
 #include <bgfx/bgfx.h>
diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h
index 1428ab8a6b2..d607dd4ec7d 100644
--- a/src/osd/modules/render/bgfx/chainentry.h
+++ b/src/osd/modules/render/bgfx/chainentry.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainentry.h - BGFX shader post-processing node
+//
+//  Represents a single entry in a list of post-processing
+//  passes to be applied to a screen quad or buffer.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_CHAIN_ENTRY__
diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp
index a778e6bdbee..39338359e81 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.cpp
+++ b/src/osd/modules/render/bgfx/chainentryreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainentryreader.cpp - BGFX chain entry JSON reader
+//
+//============================================================
+
 #include <string>
 
 #include "emu.h"
diff --git a/src/osd/modules/render/bgfx/chainentryreader.h b/src/osd/modules/render/bgfx/chainentryreader.h
index 52517365004..8aeb1b402de 100644
--- a/src/osd/modules/render/bgfx/chainentryreader.h
+++ b/src/osd/modules/render/bgfx/chainentryreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainentryreader.h - BGFX chain entry JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_CHAIN_ENTRY_READER__
diff --git a/src/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp
index 7b971141907..8a69e007872 100644
--- a/src/osd/modules/render/bgfx/chainreader.cpp
+++ b/src/osd/modules/render/bgfx/chainreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainreader.cpp - BGFX chain JSON reader
+//
+//============================================================
+
 #include <string>
 #include <vector>
 
diff --git a/src/osd/modules/render/bgfx/chainreader.h b/src/osd/modules/render/bgfx/chainreader.h
index 669bd81247e..6e803516189 100644
--- a/src/osd/modules/render/bgfx/chainreader.h
+++ b/src/osd/modules/render/bgfx/chainreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  chainreader.h - BGFX chain JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_CHAIN_READER__
diff --git a/src/osd/modules/render/bgfx/cullreader.cpp b/src/osd/modules/render/bgfx/cullreader.cpp
index 727474f9e81..0890d731583 100644
--- a/src/osd/modules/render/bgfx/cullreader.cpp
+++ b/src/osd/modules/render/bgfx/cullreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  cullreader.cpp - BGFX cull state JSON reader
+//
+//============================================================
+
 #include <bgfx/bgfx.h>
 
 #include "cullreader.h"
diff --git a/src/osd/modules/render/bgfx/cullreader.h b/src/osd/modules/render/bgfx/cullreader.h
index bf247fb8635..432ed494cf2 100644
--- a/src/osd/modules/render/bgfx/cullreader.h
+++ b/src/osd/modules/render/bgfx/cullreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  cullreader.h - BGFX cull state JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_CULL_READER__
diff --git a/src/osd/modules/render/bgfx/depthreader.cpp b/src/osd/modules/render/bgfx/depthreader.cpp
index 1f2c3abbc9f..077137159fe 100644
--- a/src/osd/modules/render/bgfx/depthreader.cpp
+++ b/src/osd/modules/render/bgfx/depthreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  depthreader.cpp - BGFX depth state JSON reader
+//
+//============================================================
+
 #include <bgfx/bgfx.h>
 
 #include "depthreader.h"
diff --git a/src/osd/modules/render/bgfx/depthreader.h b/src/osd/modules/render/bgfx/depthreader.h
index 6dad9d9d7c8..5b2fc4e374c 100644
--- a/src/osd/modules/render/bgfx/depthreader.h
+++ b/src/osd/modules/render/bgfx/depthreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  depthreader.h - BGFX depth state JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_DEPTH_READER__
diff --git a/src/osd/modules/render/bgfx/effect.cpp b/src/osd/modules/render/bgfx/effect.cpp
index 76092fd13f9..bf6ccb963c5 100644
--- a/src/osd/modules/render/bgfx/effect.cpp
+++ b/src/osd/modules/render/bgfx/effect.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effect.cpp - BGFX shader material to be applied to a mesh
+//
+//============================================================
+
 #include "effect.h"
 
 bgfx_effect::bgfx_effect(uint64_t state, bgfx::ShaderHandle vertex_shader, bgfx::ShaderHandle fragment_shader, std::vector<bgfx_uniform*> uniforms)
diff --git a/src/osd/modules/render/bgfx/effect.h b/src/osd/modules/render/bgfx/effect.h
index 440a38252ce..e87f418022e 100644
--- a/src/osd/modules/render/bgfx/effect.h
+++ b/src/osd/modules/render/bgfx/effect.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effect.h - BGFX shader material to be applied to a mesh
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_EFFECT__
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
index 094abb66b5b..ea35020ad85 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effectmanager.cpp - BGFX shader effect manager
+//
+//  Maintains a string-to-entry lookup of BGFX shader
+//  effects, defined by effect.h and read by effectreader.h
+//
+//============================================================
+
 #include "emu.h"
 
 #include <rapidjson/document.h>
diff --git a/src/osd/modules/render/bgfx/effectmanager.h b/src/osd/modules/render/bgfx/effectmanager.h
index f91035b9c87..e86b24669ad 100644
--- a/src/osd/modules/render/bgfx/effectmanager.h
+++ b/src/osd/modules/render/bgfx/effectmanager.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effectmanager.h - BGFX shader effect manager
+//
+//  Maintains a string-to-entry lookup of BGFX shader
+//  effects, defined by effect.h and read by effectreader.h
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_EFFECT_MANAGER__
diff --git a/src/osd/modules/render/bgfx/effectreader.cpp b/src/osd/modules/render/bgfx/effectreader.cpp
index a663b6275cd..978c004337f 100644
--- a/src/osd/modules/render/bgfx/effectreader.cpp
+++ b/src/osd/modules/render/bgfx/effectreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effectreader.cpp - BGFX effect JSON reader
+//
+//============================================================
+
 #include <string>
 
 #include <bgfx/bgfx.h>
diff --git a/src/osd/modules/render/bgfx/effectreader.h b/src/osd/modules/render/bgfx/effectreader.h
index ea353d7256b..cc0c3ea69e5 100644
--- a/src/osd/modules/render/bgfx/effectreader.h
+++ b/src/osd/modules/render/bgfx/effectreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  effectreader.h - BGFX effect JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_EFFECT_READER__
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index 0077180c0de..bcebb755ab6 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  inputpair.h - BGFX sampler-and-texture pair
+//
+//  Keeps track of the texture which is bound to the sampler
+//  which is bound to the specified stage index.
+//
+//============================================================
+
 #include "inputpair.h"
 #include "texture.h"
 #include "effect.h"
diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h
index 74aedc11d0d..2cab7ff2363 100644
--- a/src/osd/modules/render/bgfx/inputpair.h
+++ b/src/osd/modules/render/bgfx/inputpair.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  inputpair.h - BGFX sampler-and-texture pair
+//
+//  Keeps track of the texture which is bound to the sampler
+//  which is bound to the specified stage index.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_INPUT_PAIR__
diff --git a/src/osd/modules/render/bgfx/parameter.cpp b/src/osd/modules/render/bgfx/parameter.cpp
index d7800974089..004d5fd17f8 100644
--- a/src/osd/modules/render/bgfx/parameter.cpp
+++ b/src/osd/modules/render/bgfx/parameter.cpp
@@ -1,5 +1,19 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  parameter.cpp - BGFX shader parameter
+//
+//  A value that represents some form of parametric
+//  operation, which can be fed to the input of a BGFX
+//  shader uniform.
+//
+//============================================================
+
 #include "emu.h"
 
+// NB: NOT FINISHED!
+
 #include "parameter.h"
 
 bgfx_parameter::bgfx_parameter(std::string name, parameter_type type, int period)
@@ -16,14 +30,27 @@ bgfx_parameter::~bgfx_parameter()
 
 void bgfx_parameter::frame()
 {
-	m_frame++;
-	if (m_frame == m_period)
+	switch(m_type)
 	{
-		m_frame = 0;
+		case PARAM_FRAME_MASK:
+			m_frame++;
+			if (m_frame == m_period)
+			{
+				m_frame = 0;
+			}
+			break;
+		default:
+			break;
 	}
 }
 
 bool bgfx_parameter::active()
 {
-	return (m_frame % m_period == 0);
+	switch (m_type)
+	{
+		case PARAM_FRAME_MASK:
+			return (m_frame % m_period == 0);
+		default:
+			return false;
+	}
 }
diff --git a/src/osd/modules/render/bgfx/parameter.h b/src/osd/modules/render/bgfx/parameter.h
index c38b80746a7..76defb439c4 100644
--- a/src/osd/modules/render/bgfx/parameter.h
+++ b/src/osd/modules/render/bgfx/parameter.h
@@ -1,3 +1,15 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  parameter.h - BGFX shader parameter
+//
+//  A value that represents some form of parametric
+//  operation, which can be fed to the input of a BGFX
+//  shader uniform.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_PARAMETER__
diff --git a/src/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp
index 7d0dad85697..f1391ec761e 100644
--- a/src/osd/modules/render/bgfx/paramreader.cpp
+++ b/src/osd/modules/render/bgfx/paramreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  paramreader.cpp - BGFX shader parameter JSON reader
+//
+//============================================================
+
 #include <string>
 
 #include "paramreader.h"
diff --git a/src/osd/modules/render/bgfx/paramreader.h b/src/osd/modules/render/bgfx/paramreader.h
index e8543d39c79..12df9185dfc 100644
--- a/src/osd/modules/render/bgfx/paramreader.h
+++ b/src/osd/modules/render/bgfx/paramreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  paramreader.h - BGFX shader parameter JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_PARAM_READER__
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index 0629bd210e3..20821721ea8 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  shadermanager.cpp - BGFX shader manager
+//
+//  Maintains a mapping between strings and BGFX shaders,
+//  either vertex or pixel/fragment.
+//
+//============================================================
+
 #include "emu.h"
 
 #include <bgfx/bgfxplatform.h>
diff --git a/src/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h
index 2697581884d..a3dbb425088 100644
--- a/src/osd/modules/render/bgfx/shadermanager.h
+++ b/src/osd/modules/render/bgfx/shadermanager.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  shadermanager.h - BGFX shader manager
+//
+//  Maintains a mapping between strings and BGFX shaders,
+//  either vertex or pixel/fragment.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_SHADER_MANAGER__
diff --git a/src/osd/modules/render/bgfx/slider.cpp b/src/osd/modules/render/bgfx/slider.cpp
index 60445ffd6cb..76f093580bd 100644
--- a/src/osd/modules/render/bgfx/slider.cpp
+++ b/src/osd/modules/render/bgfx/slider.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  slider.cpp - BGFX shader parameter slider
+//
+//============================================================
+
 #include "emu.h"
 
 #include "slider.h"
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index ab570e7724a..6c3054d7cc2 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/src/osd/modules/render/bgfx/slider.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  slider.h - BGFX shader parameter slider
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_SLIDER__
diff --git a/src/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp
index 55b352b8f54..7bd2d8c59fa 100644
--- a/src/osd/modules/render/bgfx/sliderreader.cpp
+++ b/src/osd/modules/render/bgfx/sliderreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//==============================================================
+//
+//  sliderreader.cpp - BGFX shader parameter slider JSON reader
+//
+//==============================================================
+
 #include "emu.h"
 
 #include "sliderreader.h"
diff --git a/src/osd/modules/render/bgfx/sliderreader.h b/src/osd/modules/render/bgfx/sliderreader.h
index 82807c221f8..9253b9b9130 100644
--- a/src/osd/modules/render/bgfx/sliderreader.h
+++ b/src/osd/modules/render/bgfx/sliderreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  sliderreader.h - BGFX shader parameter slider JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_SLIDER_READER__
diff --git a/src/osd/modules/render/bgfx/target.cpp b/src/osd/modules/render/bgfx/target.cpp
index 3b732d6628b..b8026060b04 100644
--- a/src/osd/modules/render/bgfx/target.cpp
+++ b/src/osd/modules/render/bgfx/target.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  target.cpp - Render target abstraction for BGFX layer
+//
+//============================================================
+
 #include "target.h"
 
 bgfx_target::bgfx_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter)
diff --git a/src/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h
index 75e4152be9e..099288cbec1 100644
--- a/src/osd/modules/render/bgfx/target.h
+++ b/src/osd/modules/render/bgfx/target.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  target.h - Render target abstraction for BGFX layer
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_TARGET__
diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp
index f0f1a6f990d..88bf6a9d96f 100644
--- a/src/osd/modules/render/bgfx/targetmanager.cpp
+++ b/src/osd/modules/render/bgfx/targetmanager.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  targetmanager.cpp - BGFX render target manager
+//
+//  Maintains a string-to-entry mapping for any registered
+//  render targets.
+//
+//============================================================
+
 #include <bgfx/bgfx.h>
 
 #include "targetmanager.h"
diff --git a/src/osd/modules/render/bgfx/targetmanager.h b/src/osd/modules/render/bgfx/targetmanager.h
index cd17c4ccb3c..9cc957d1c38 100644
--- a/src/osd/modules/render/bgfx/targetmanager.h
+++ b/src/osd/modules/render/bgfx/targetmanager.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  targetmanager.h - BGFX render target manager
+//
+//  Maintains a string-to-entry mapping for any registered
+//  render targets.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_TARGET_MANAGER__
diff --git a/src/osd/modules/render/bgfx/texture.cpp b/src/osd/modules/render/bgfx/texture.cpp
index bf2668bc68b..c588fa63b20 100644
--- a/src/osd/modules/render/bgfx/texture.cpp
+++ b/src/osd/modules/render/bgfx/texture.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  texture.cpp - Texture abstraction for BGFX layer
+//
+//============================================================
+
 #include "emu.h"
 
 #include "texture.h"
diff --git a/src/osd/modules/render/bgfx/texture.h b/src/osd/modules/render/bgfx/texture.h
index a612b6e8dbf..833ab230917 100644
--- a/src/osd/modules/render/bgfx/texture.h
+++ b/src/osd/modules/render/bgfx/texture.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  texture.h - Texture abstraction for BGFX layer
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_TEXTURE__
diff --git a/src/osd/modules/render/bgfx/texturemanager.cpp b/src/osd/modules/render/bgfx/texturemanager.cpp
index 8bbfd593cf0..bb8f49494da 100644
--- a/src/osd/modules/render/bgfx/texturemanager.cpp
+++ b/src/osd/modules/render/bgfx/texturemanager.cpp
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  texturemanager.cpp - BGFX texture manager
+//
+//  Maintains a string-to-entry mapping for any registered
+//  textures.
+//
+//============================================================
+
 #include <bgfx/bgfx.h>
 
 #include "texturemanager.h"
diff --git a/src/osd/modules/render/bgfx/texturemanager.h b/src/osd/modules/render/bgfx/texturemanager.h
index ae3ffd9bc97..627e6689fa9 100644
--- a/src/osd/modules/render/bgfx/texturemanager.h
+++ b/src/osd/modules/render/bgfx/texturemanager.h
@@ -1,3 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  texturemanager.h - BGFX texture manager
+//
+//  Maintains a string-to-entry mapping for any registered
+//  textures.
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_TEXTURE_MANAGER__
diff --git a/src/osd/modules/render/bgfx/uniform.cpp b/src/osd/modules/render/bgfx/uniform.cpp
index a0ee1d174da..81fb95273f2 100644
--- a/src/osd/modules/render/bgfx/uniform.cpp
+++ b/src/osd/modules/render/bgfx/uniform.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  uniform.cpp - Shader uniform abstraction for BGFX layer
+//
+//============================================================
+
 #include "uniform.h"
 
 bgfx_uniform::bgfx_uniform(std::string name, bgfx::UniformType::Enum type)
diff --git a/src/osd/modules/render/bgfx/uniform.h b/src/osd/modules/render/bgfx/uniform.h
index 5ff8f6fb3d8..6bb45f50d06 100644
--- a/src/osd/modules/render/bgfx/uniform.h
+++ b/src/osd/modules/render/bgfx/uniform.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  uniform.h - Shader uniform abstraction for BGFX layer
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_UNIFORM__
diff --git a/src/osd/modules/render/bgfx/uniformreader.cpp b/src/osd/modules/render/bgfx/uniformreader.cpp
index f1447be7696..863c20e6e4f 100644
--- a/src/osd/modules/render/bgfx/uniformreader.cpp
+++ b/src/osd/modules/render/bgfx/uniformreader.cpp
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  uniformreader.cpp - BGFX shader uniform JSON reader
+//
+//============================================================
+
 #include "uniformreader.h"
 #include "uniform.h"
 
diff --git a/src/osd/modules/render/bgfx/uniformreader.h b/src/osd/modules/render/bgfx/uniformreader.h
index 850508fa6da..ead4bb0cefe 100644
--- a/src/osd/modules/render/bgfx/uniformreader.h
+++ b/src/osd/modules/render/bgfx/uniformreader.h
@@ -1,3 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  uniformreader.h - BGFX shader uniform JSON reader
+//
+//============================================================
+
 #pragma once
 
 #ifndef __DRAWBGFX_UNIFORM_READER__
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index efecc4bef68..7874cd16ea1 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -62,7 +62,7 @@ static inline bool is_transparent(const float &a)
 
 renderer_sdl1::renderer_sdl1(osd_window *window, int extra_flags)
 	: osd_renderer(window, extra_flags)
-	, m_sdl_renderer(NULL)
+	, m_sdl_renderer(nullptr)
 	, m_blittimer(0)
 	, m_last_hofs(0)
 	, m_last_vofs(0)
@@ -180,7 +180,7 @@ const copy_info_t renderer_sdl1::s_blit_info_default[] =
 { -1 },
 };
 
-copy_info_t* renderer_sdl1::s_blit_info[SDL_TEXFORMAT_LAST+1] = { NULL };
+copy_info_t* renderer_sdl1::s_blit_info[SDL_TEXFORMAT_LAST+1] = { nullptr };
 bool renderer_sdl1::s_blit_info_initialized = false;
 
 //============================================================
@@ -261,9 +261,9 @@ void texture_info::render_quad(const render_primitive *prim, const int x, const
 	set_coloralphamode(m_texture_id, &prim->color);
 	//printf("%d %d %d %d\n", target_rect.x, target_rect.y, target_rect.w, target_rect.h);
 	// Arghhh .. Just another bug. SDL_RenderCopy has severe issues with scaling ...
-	SDL_RenderCopy(m_renderer->m_sdl_renderer,  m_texture_id, NULL, &target_rect);
-	//SDL_RenderCopyEx(m_renderer->m_sdl_renderer,  m_texture_id, NULL, &target_rect, 0, NULL, SDL_FLIP_NONE);
-	//SDL_RenderCopyEx(m_renderer->m_sdl_renderer,  m_texture_id, NULL, NULL, 0, NULL, SDL_FLIP_NONE);
+	SDL_RenderCopy(m_renderer->m_sdl_renderer,  m_texture_id, nullptr, &target_rect);
+	//SDL_RenderCopyEx(m_renderer->m_sdl_renderer,  m_texture_id, nullptr, &target_rect, 0, nullptr, SDL_FLIP_NONE);
+	//SDL_RenderCopyEx(m_renderer->m_sdl_renderer,  m_texture_id, nullptr, nullptr, 0, nullptr, SDL_FLIP_NONE);
 }
 
 void renderer_sdl1::render_quad(texture_info *texture, const render_primitive *prim, const int x, const int y)
@@ -370,13 +370,13 @@ bool renderer_sdl1::init(running_machine &machine)
 	// Load the GL library now - else MT will fail
 	const char *stemp = downcast<sdl_options &>(machine.options()).gl_lib();
 #else
-	const char *stemp = NULL;
+	const char *stemp = nullptr;
 #endif
-	if (stemp != NULL && strcmp(stemp, OSDOPTVAL_AUTO) == 0)
-		stemp = NULL;
+	if (stemp != nullptr && strcmp(stemp, OSDOPTVAL_AUTO) == 0)
+		stemp = nullptr;
 
 	// No fatalerror here since not all video drivers support GL !
-	if (SDL_GL_LoadLibrary(stemp) != 0) // Load library (default for e==NULL
+	if (SDL_GL_LoadLibrary(stemp) != 0) // Load library (default for e==nullptr
 		osd_printf_warning("Warning: Unable to load opengl library: %s\n", stemp ? stemp : "<default>");
 	else
 		osd_printf_verbose("Loaded opengl shared library: %s\n", stemp ? stemp : "<default>");
@@ -408,12 +408,12 @@ static void drawsdl_show_info(struct SDL_RendererInfo *render_info)
 			RF_ENTRY(SDL_RENDERER_PRESENTVSYNC),
 			RF_ENTRY(SDL_RENDERER_ACCELERATED),
 			RF_ENTRY(SDL_RENDERER_TARGETTEXTURE),
-			{-1, NULL}
+			{-1, nullptr}
 		};
 	int i;
 
 	osd_printf_verbose("window: using renderer %s\n", render_info->name ? render_info->name : "<unknown>");
-	for (i = 0; rflist[i].name != NULL; i++)
+	for (i = 0; rflist[i].name != nullptr; i++)
 		if (render_info->flags & rflist[i].flag)
 			osd_printf_verbose("renderer: flag %s\n", rflist[i].name);
 }
@@ -500,7 +500,7 @@ void renderer_sdl1::destroy_all_textures()
 int renderer_sdl1::draw(int update)
 {
 	render_primitive *prim;
-	texture_info *texture=NULL;
+	texture_info *texture=nullptr;
 	float vofs, hofs;
 	int blit_pixels = 0;
 
@@ -516,7 +516,7 @@ int renderer_sdl1::draw(int update)
 		destroy_all_textures();
 		m_width = wdim.width();
 		m_height = wdim.height();
-		SDL_RenderSetViewport(m_sdl_renderer, NULL);
+		SDL_RenderSetViewport(m_sdl_renderer, nullptr);
 		m_blittimer = 3;
 		clear_flags(FI_CHANGED);
 	}
@@ -529,7 +529,7 @@ int renderer_sdl1::draw(int update)
 		SDL_SetRenderDrawBlendMode(m_sdl_renderer, SDL_BLENDMODE_NONE);
 		//SDL_SetRenderDrawColor(0,0,0,255);
 		SDL_SetRenderDrawColor(m_sdl_renderer, 0,0,0,0);
-		SDL_RenderFillRect(m_sdl_renderer, NULL);
+		SDL_RenderFillRect(m_sdl_renderer, nullptr);
 		m_blittimer--;
 	}
 
@@ -559,7 +559,7 @@ int renderer_sdl1::draw(int update)
 	window().m_primlist->acquire_lock();
 
 	// now draw
-	for (prim = window().m_primlist->first(); prim != NULL; prim = prim->next())
+	for (prim = window().m_primlist->first(); prim != nullptr; prim = prim->next())
 	{
 		Uint8 sr, sg, sb, sa;
 
@@ -610,10 +610,10 @@ int renderer_sdl1::draw(int update)
 
 copy_info_t *texture_info::compute_size_type()
 {
-	copy_info_t *result = NULL;
+	copy_info_t *result = nullptr;
 	int maxperf = 0;
 
-	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != NULL; bi = bi->next)
+	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
 	{
 		if ((m_is_rotated == bi->blitter->m_is_rot)
 				&& (m_sdl_blendmode == bi->bm_mask))
@@ -636,7 +636,7 @@ copy_info_t *texture_info::compute_size_type()
 		return result;
 
 	/* try last resort handlers */
-	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != NULL; bi = bi->next)
+	for (copy_info_t *bi = renderer_sdl1::s_blit_info[m_format]; bi != nullptr; bi = bi->next)
 	{
 		if ((m_is_rotated == bi->blitter->m_is_rot)
 			&& (m_sdl_blendmode == bi->bm_mask))
@@ -644,7 +644,7 @@ copy_info_t *texture_info::compute_size_type()
 				return bi;
 	}
 	//FIXME: crash implement a -do nothing handler */
-	return NULL;
+	return nullptr;
 }
 
 // FIXME:
@@ -739,7 +739,7 @@ texture_info::texture_info(renderer_sdl1 *renderer, const render_texinfo &texsou
 	if (m_sdl_access == SDL_TEXTUREACCESS_STATIC)
 	{
 		if (m_copyinfo->blitter->m_is_passthrough)
-			m_pixels = NULL;
+			m_pixels = nullptr;
 		else
 			m_pixels = malloc(m_setup.rotwidth * m_setup.rotheight * m_copyinfo->blitter->m_dest_bpp);
 	}
@@ -749,7 +749,7 @@ texture_info::texture_info(renderer_sdl1 *renderer, const render_texinfo &texsou
 
 texture_info::~texture_info()
 {
-	if ( is_pixels_owned() && (m_pixels != NULL) )
+	if ( is_pixels_owned() && (m_pixels != nullptr) )
 		free(m_pixels);
 	SDL_DestroyTexture(m_texture_id);
 }
@@ -773,11 +773,11 @@ void texture_info::set_data(const render_texinfo &texsource, const UINT32 flags)
 			m_pitch = m_setup.rotwidth * m_copyinfo->blitter->m_dest_bpp;
 			m_copyinfo->blitter->texop(this, &texsource);
 		}
-		SDL_UpdateTexture(m_texture_id, NULL, m_pixels, m_pitch);
+		SDL_UpdateTexture(m_texture_id, nullptr, m_pixels, m_pitch);
 	}
 	else
 	{
-		SDL_LockTexture(m_texture_id, NULL, (void **) &m_pixels, &m_pitch);
+		SDL_LockTexture(m_texture_id, nullptr, (void **) &m_pixels, &m_pitch);
 		if ( m_copyinfo->blitter->m_is_passthrough )
 		{
 			UINT8 *src = (UINT8 *) texsource.base;
@@ -872,7 +872,7 @@ texture_info *renderer_sdl1::texture_find(const render_primitive &prim, const qu
 	osd_ticks_t now = osd_ticks();
 
 	// find a match
-	for (texture = m_texlist.first(); texture != NULL; )
+	for (texture = m_texlist.first(); texture != nullptr; )
 		if (texture->hash() == texhash &&
 			texture->matches(prim, setup))
 		{
@@ -880,7 +880,7 @@ texture_info *renderer_sdl1::texture_find(const render_primitive &prim, const qu
 			if ((texture->m_copyinfo->samples & 0x7f) == 0x7f)
 			{
 				if (texture->m_copyinfo != texture->compute_size_type())
-					return NULL;
+					return nullptr;
 			}
 			texture->m_last_access = now;
 			return texture;
@@ -895,7 +895,7 @@ texture_info *renderer_sdl1::texture_find(const render_primitive &prim, const qu
 		}
 
 	// nothing found
-	return NULL;
+	return nullptr;
 }
 
 //============================================================
@@ -912,16 +912,16 @@ texture_info * renderer_sdl1::texture_update(const render_primitive &prim)
 	texture = texture_find(prim, setup);
 
 	// if we didn't find one, create a new texture
-	if (texture == NULL && prim.texture.base != NULL)
+	if (texture == nullptr && prim.texture.base != nullptr)
 	{
 		texture = global_alloc(texture_info(this, prim.texture, setup, prim.flags));
 		/* add us to the texture list */
 		m_texlist.prepend(*texture);
 	}
 
-	if (texture != NULL)
+	if (texture != nullptr)
 	{
-		if (prim.texture.base != NULL && texture->texinfo().seqid != prim.texture.seqid)
+		if (prim.texture.base != nullptr && texture->texinfo().seqid != prim.texture.seqid)
 		{
 			texture->texinfo().seqid = prim.texture.seqid;
 			// if we found it, but with a different seqid, copy the data
diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h
index f5010bd8e3e..7335bd5be81 100644
--- a/src/osd/modules/render/draw13.h
+++ b/src/osd/modules/render/draw13.h
@@ -161,7 +161,7 @@ public:
 		{
 			for (int i = 0; i <= SDL_TEXFORMAT_LAST; i++)
 			{
-				for (copy_info_t *bi = s_blit_info[i]; bi != NULL; )
+				for (copy_info_t *bi = s_blit_info[i]; bi != nullptr; )
 				{
 					if (bi->pixel_count)
 						osd_printf_verbose("%s -> %s %s blendmode 0x%02x, %d samples: %d KPixel/sec\n", bi->srcname, bi->dstname,
@@ -171,7 +171,7 @@ public:
 					bi = bi->next;
 					global_free(freeme);
 				}
-				s_blit_info[i] = NULL;
+				s_blit_info[i] = nullptr;
 			}
 			s_blit_info_initialized = false;
 		}
diff --git a/src/osd/modules/render/drawgdi.cpp b/src/osd/modules/render/drawgdi.cpp
index bd305a6e7e7..354d6950e30 100644
--- a/src/osd/modules/render/drawgdi.cpp
+++ b/src/osd/modules/render/drawgdi.cpp
@@ -16,7 +16,7 @@
 renderer_gdi::~renderer_gdi()
 {
 	// free the bitmap memory
-	if (m_bmdata != NULL)
+	if (m_bmdata != nullptr)
 		global_free_array(m_bmdata);
 }
 
diff --git a/src/osd/modules/render/drawgdi.h b/src/osd/modules/render/drawgdi.h
index f6f3d328dfc..af52eac1e77 100644
--- a/src/osd/modules/render/drawgdi.h
+++ b/src/osd/modules/render/drawgdi.h
@@ -31,7 +31,7 @@ class renderer_gdi : public osd_renderer
 public:
 	renderer_gdi(osd_window *window)
 		: osd_renderer(window, FLAG_NONE)
-		, m_bmdata(NULL)
+		, m_bmdata(nullptr)
 		, m_bmsize(0)
 	{
 	}
diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h
index e98e1835df2..28ddd7ebc36 100644
--- a/src/osd/modules/render/drawsdl.h
+++ b/src/osd/modules/render/drawsdl.h
@@ -22,10 +22,10 @@ public:
 
 	renderer_sdl2(osd_window *w, int extra_flags)
 		: osd_renderer(w, extra_flags)
-		, m_sdl_renderer(NULL)
-		, m_texture_id(NULL)
-		, m_yuv_lookup(NULL)
-		, m_yuv_bitmap(NULL)
+		, m_sdl_renderer(nullptr)
+		, m_texture_id(nullptr)
+		, m_yuv_lookup(nullptr)
+		, m_yuv_bitmap(nullptr)
 		//, m_hw_scale_width(0)
 		//, m_hw_scale_height(0)
 		, m_last_hofs(0)