diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 4396b4b5b5..cb98a626fe 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -34,7 +34,6 @@
-
diff --git a/BizHawk.Client.Common/Extensions.cs b/BizHawk.Client.Common/Extensions.cs
index eeabf8970b..c57c0b54cc 100644
--- a/BizHawk.Client.Common/Extensions.cs
+++ b/BizHawk.Client.Common/Extensions.cs
@@ -1,6 +1,5 @@
using System;
using BizHawk.Bizware.BizwareGL;
-using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
namespace BizHawk.Client.Common
{
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 9a62a71f8c..e867f48a54 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -149,9 +149,6 @@
-
diff --git a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
index 099e12883f..2d69e836f4 100644
--- a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
+++ b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
@@ -9,7 +9,6 @@ using System.Drawing;
using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
-using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.FilterManager;
using BizHawk.Emulation.Common;
diff --git a/BizHawk.Client.EmuHawk/GLManager.cs b/BizHawk.Client.EmuHawk/GLManager.cs
index 4b4dd71302..114a61e1d5 100644
--- a/BizHawk.Client.EmuHawk/GLManager.cs
+++ b/BizHawk.Client.EmuHawk/GLManager.cs
@@ -1,6 +1,5 @@
using System;
using BizHawk.Bizware.BizwareGL;
-using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
namespace BizHawk.Client.EmuHawk
{
diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index f16bbf7eba..6b20962a54 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -146,7 +146,7 @@ namespace BizHawk.Client.EmuHawk
{
try
{
- GlobalWin.GL = new Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9();
+ GlobalWin.GL = new Bizware.BizwareGL.IGL_SlimDX9();
}
catch(Exception ex)
{
diff --git a/BizHawk.sln b/BizHawk.sln
index b8d03274fa..e9a926ed63 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -49,8 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.DBMan", "BizHawk.Client.DBMan\BizHawk.Client.DBMan.csproj", "{2D2890A8-C338-4439-AD8B-CB9EE85A94F9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.SlimDX", "Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj", "{E6B436B1-A3CD-4C9A-8F76-5D7154726884}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}"
EndProject
Global
@@ -99,10 +97,6 @@ Global
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Any CPU.Build.0 = Release|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -120,7 +114,6 @@ Global
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
- {E6B436B1-A3CD-4C9A-8F76-5D7154726884} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
deleted file mode 100644
index e19dd1d8e7..0000000000
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- true
- ../../output/dll
- net48
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
deleted file mode 100644
index b9fd6ee4f5..0000000000
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- CSharp80
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 12bda4b3ad..0189e265fb 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -10,6 +10,9 @@
+
@@ -19,6 +22,7 @@
+
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/GLControlWrapper_SlimDX9.cs b/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
similarity index 91%
rename from Bizware/BizHawk.Bizware.BizwareGL.SlimDX/GLControlWrapper_SlimDX9.cs
rename to Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
index 986f262a18..40cc1f917d 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/GLControlWrapper_SlimDX9.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
using SlimDX.Direct3D9;
-namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
+namespace BizHawk.Bizware.BizwareGL
{
public class GLControlWrapper_SlimDX9 : Control, IGraphicsControl
{
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
similarity index 96%
rename from Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs
rename to Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
index 4a7bd1f4d6..9425667361 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
@@ -21,7 +21,7 @@ using gl=OpenTK.Graphics.OpenGL;
//todo - do a better job selecting shader model? base on caps somehow? try several and catch compilation exceptions (yuck, exceptions)
-namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
+namespace BizHawk.Bizware.BizwareGL
{
public class IGL_SlimDX9 : IGL
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/Extensions.cs b/Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs
similarity index 90%
rename from Bizware/BizHawk.Bizware.BizwareGL.SlimDX/Extensions.cs
rename to Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs
index 260ab3c43e..8e4964c616 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/Extensions.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
+namespace BizHawk.Bizware.BizwareGL
{
public static class Extensions
{