ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move GLManager from Client.Common to Client.EmuHawk, it is inappropriate to be in Client.Common

This commit is contained in:
adelikat 2015-10-17 19:27:30 -04:00
parent 6ff3215a5f
commit 2895c78be8
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -113,9 +113,6 @@
<Compile Include="CoreFileProvider.cs" /> <Compile Include="CoreFileProvider.cs" />
<Compile Include="ExceptionClasses.cs" /> <Compile Include="ExceptionClasses.cs" />
<Compile Include="FirmwareManager.cs" /> <Compile Include="FirmwareManager.cs" />
<Compile Include="GLManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Global.cs" /> <Compile Include="Global.cs" />
<Compile Include="inputAdapters\AutoPattern.cs" /> <Compile Include="inputAdapters\AutoPattern.cs" />
<Compile Include="inputAdapters\BitwiseAdapters.cs" /> <Compile Include="inputAdapters\BitwiseAdapters.cs" />

1
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -549,6 +549,7 @@
<Compile Include="Extensions\ControlExtensions.cs" /> <Compile Include="Extensions\ControlExtensions.cs" />
<Compile Include="Extensions\CoreExtensions.cs" /> <Compile Include="Extensions\CoreExtensions.cs" />
<Compile Include="Extensions\ToolExtensions.cs" /> <Compile Include="Extensions\ToolExtensions.cs" />
<Compile Include="GLManager.cs" />
<Compile Include="GlobalWin.cs" /> <Compile Include="GlobalWin.cs" />
<Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " /> <Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " />
<Compile Include="Input\GamePad360.cs" /> <Compile Include="Input\GamePad360.cs" />

2
BizHawk.Client.Common/GLManager.cs → BizHawk.Client.EmuHawk/GLManager.cs
View File

@ -2,7 +2,7 @@ using System;
using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL;
namespace BizHawk.Client.Common namespace BizHawk.Client.EmuHawk
{ {
/// <summary> /// <summary>
/// This singleton class manages OpenGL contexts, in an effort to minimize context changes. /// This singleton class manages OpenGL contexts, in an effort to minimize context changes.

1
BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
View File

@ -9,6 +9,7 @@ using System.Drawing;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk;
using BizHawk.Client.EmuHawk.FilterManager; using BizHawk.Client.EmuHawk.FilterManager;
using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL;

1
BizHawk.Client.MultiHawk/EmulatorWindow.cs
View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.BufferExtensions; using BizHawk.Common.BufferExtensions;
using BizHawk.Client.EmuHawk;
using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;

5
BizHawk.Client.MultiHawk/Mainform.cs
View File

@ -13,6 +13,7 @@ using System.Windows.Forms;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.IOExtensions; using BizHawk.Common.IOExtensions;
using BizHawk.Client.EmuHawk;
using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Common.IEmulatorExtensions;
@ -32,7 +33,7 @@ namespace BizHawk.Client.MultiHawk
public Mainform(string[] args) public Mainform(string[] args)
{ {
BizHawk.Client.Common.GLManager.CreateInstance(); GLManager.CreateInstance();
InitializeComponent(); InitializeComponent();
_throttle = new BizHawk.Client.EmuHawk.Throttle(); _throttle = new BizHawk.Client.EmuHawk.Throttle();
@ -319,7 +320,7 @@ namespace BizHawk.Client.MultiHawk
Emulator = loader.LoadedEmulator, Emulator = loader.LoadedEmulator,
GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(), GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(),
GLManager = BizHawk.Client.Common.GLManager.Instance, GLManager = GLManager.Instance,
Game = loader.Game, Game = loader.Game,
CurrentRomPath = loader.CanonicalFullPath CurrentRomPath = loader.CanonicalFullPath
}; };