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

Merge BizwareGL.SlimDX into BizwareGL

This commit is contained in:
YoshiRulz 2020-01-22 07:21:22 +10:00
parent 87833d76d7
commit 165c2a0e2e
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
13 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@
<ItemGroup>
<ProjectReference Include="../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="../Version/svnrev.cs" />

1
BizHawk.Client.Common/Extensions.cs
View File

@ -1,6 +1,5 @@
using System;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
namespace BizHawk.Client.Common
{

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

@ -149,9 +149,6 @@
<ProjectReference Include="../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
Name="BizHawk.Emulation.Cores"
Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj"
Name="BizHawk.Bizware.BizwareGL.SlimDX"
Project="{E6B436B1-A3CD-4C9A-8F76-5D7154726884}" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
Name="BizHawk.Bizware.BizwareGL"
Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />

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

@ -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;

1
BizHawk.Client.EmuHawk/GLManager.cs
View File

@ -1,6 +1,5 @@
using System;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
namespace BizHawk.Client.EmuHawk
{

2
BizHawk.Client.EmuHawk/Program.cs
View File

@ -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)
{

7
BizHawk.sln
View File

@ -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

32
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
View File

@ -1,32 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Common.abs.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<!--<Reference Include="Microsoft.CSharp" />-->
<!--<Reference Include="System" />-->
<!--<Reference Include="System.Core" />-->
<!--<Reference Include="System.Data" />-->
<!--<Reference Include="System.Data.DataSetExtensions" />-->
<!--<Reference Include="System.Drawing" />-->
<Reference Include="System.Windows.Forms" />
<!--<Reference Include="System.Xml" />-->
<!--<Reference Include="System.Xml.Linq" />-->
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<Reference Include="SlimDX"
HintPath="../../References/x64/SlimDX.dll"
Private="true" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="GLControlWrapper_SlimDX9.cs" SubType="Component" />
</ItemGroup>
</Project>

2
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
View File

@ -1,2 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>

4
Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
View File

@ -10,6 +10,9 @@
<Reference Include="System.Windows.Forms" />
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="All" />
<Reference Include="SlimDX"
HintPath="../../References/x64/SlimDX.dll"
Private="true" />
<ProjectReference Include="../../BizHawk.Common/BizHawk.Common.csproj" />
</ItemGroup>
<ItemGroup>
@ -19,6 +22,7 @@
</ItemGroup>
<ItemGroup>
<Compile Update="GLControlWrapper_GdiPlus.cs" SubType="Component" />
<Compile Update="GLControlWrapper_SlimDX9.cs" SubType="Component" />
<Compile Update="GraphicsControl.cs" SubType="UserControl" />
<Compile Update="GraphicsControl_TK.cs" SubType="UserControl" />
<Compile Update="IGuiRenderer.cs" SubType="Code" />

2
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/GLControlWrapper_SlimDX9.cs → Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
View File

@ -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
{

2
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs → Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
View File

@ -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

2
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/Extensions.cs → Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
namespace BizHawk.Bizware.BizwareGL
{
public static class Extensions
{