Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move Windows GPU init code into Windows/GPU

Browse Source
This commit is contained in:
Henrik Rydgard 2015-11-03 23:22:09 +01:00
parent 3386f1e181
commit 44be9f2a50
14 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/ConsoleListener.h
View File

@ -23,8 +23,7 @@
#include "CommonWindows.h"
#endif
class ConsoleListener : public LogListener
{
class ConsoleListener : public LogListener {
public:
ConsoleListener();
~ConsoleListener();

6
Core/Core.cpp
View File

@ -32,10 +32,8 @@
#include "Core/MIPS/MIPS.h"
#ifdef _WIN32
#ifndef _XBOX
#include "Windows/OpenGLBase.h"
#include "Windows/D3D9Base.h"
#endif
#include "Windows/GPU/WindowsGLContext.h"
#include "Windows/GPU/D3D9Context.h"
#include "Windows/InputDevice.h"
#endif

2
GPU/GLES/GLES_GPU.cpp
View File

@ -46,7 +46,7 @@
#include "Core/HLE/sceGe.h"
#ifdef _WIN32
#include "Windows/OpenGLBase.h"
#include "Windows/GPU/WindowsGLContext.h"
#endif
enum {

2
UI/NativeApp.cpp
View File

@ -37,7 +37,7 @@
#if defined(_WIN32)
#include "Windows/DSoundStream.h"
#include "Windows/MainWindow.h"
#include "Windows/D3D9Base.h"
#include "Windows/GPU/D3D9Context.h"
#endif
#include "base/display.h"

2
Windows/D3D9Base.cpp → Windows/GPU/D3D9Context.cpp
View File

@ -11,7 +11,7 @@
#include "Core/Config.h"
#include "Core/Reporting.h"
#include "Windows/D3D9Base.h"
#include "Windows/GPU/D3D9Context.h"
#include "Windows/W32Util/Misc.h"
#include "thin3d/thin3d.h"
#include "thin3d/d3dx9_loader.h"

1
Windows/D3D9Base.h → Windows/GPU/D3D9Context.h
View File

@ -10,4 +10,5 @@ bool D3D9_Init(HWND window, bool windowed, std::string *error_message);
void D3D9_Shutdown();
void D3D9_Resize(HWND window);
void D3D9_SwapBuffers();
Thin3DContext *D3D9_CreateThin3DContext();

2
Windows/OpenGLBase.cpp → Windows/GPU/WindowsGLContext.cpp
View File

@ -29,7 +29,7 @@
#include "UI/OnScreenDisplay.h"
#include "Windows/W32Util/Misc.h"
#include "Windows/OpenGLBase.h"
#include "Windows/GPU/WindowsGLContext.h"
static HDC hDC; // Private GDI Device Context
static HGLRC hRC; // Permanent Rendering Context

0
Windows/OpenGLBase.h → Windows/GPU/WindowsGLContext.h
View File

2
Windows/MainWindow.cpp
View File

@ -43,7 +43,7 @@
#include "Core/Config.h"
#include "Core/Debugger/SymbolMap.h"
#include "Windows/InputBox.h"
#include "Windows/OpenGLBase.h"
#include "Windows/GPU/WindowsGLContext.h"
#include "Windows/Debugger/Debugger_Disasm.h"
#include "Windows/Debugger/Debugger_MemoryDlg.h"
#include "Windows/GEDebugger/GEDebugger.h"

8
Windows/PPSSPP.vcxproj
View File

@ -294,7 +294,7 @@
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="D3D9Base.cpp" />
<ClCompile Include="GPU\D3D9Context.cpp" />
<ClCompile Include="Debugger\BreakpointWindow.cpp" />
<ClCompile Include="Debugger\CtrlDisAsmView.cpp" />
<ClCompile Include="Debugger\CtrlMemView.cpp" />
@ -332,7 +332,7 @@
<ClCompile Include="W32Util\TabControl.cpp" />
<ClCompile Include="MainWindow.cpp" />
<ClCompile Include="DSoundStream.cpp" />
<ClCompile Include="OpenGLBase.cpp" />
<ClCompile Include="GPU\WindowsGLContext.cpp" />
<ClCompile Include="WindowsHost.cpp" />
<ClCompile Include="Globals.cpp" />
<ClCompile Include="main.cpp" />
@ -349,7 +349,7 @@
<ClInclude Include="..\android\jni\Arm64EmitterTest.h" />
<ClInclude Include="..\android\jni\TestRunner.h" />
<ClInclude Include="..\ios\ViewController.h" />
<ClInclude Include="D3D9Base.h" />
<ClInclude Include="GPU\D3D9Context.h" />
<ClInclude Include="Debugger\BreakpointWindow.h" />
<ClInclude Include="Debugger\CtrlDisAsmView.h" />
<ClInclude Include="Debugger\CtrlMemView.h" />
@ -381,7 +381,7 @@
<ClInclude Include="InputBox.h" />
<ClInclude Include="MainWindow.h" />
<ClInclude Include="DSoundStream.h" />
<ClInclude Include="OpenGLBase.h" />
<ClInclude Include="GPU\WindowsGLContext.h" />
<ClInclude Include="WindowsHost.h" />
<ClInclude Include="..\Globals.h" />
<ClInclude Include="main.h" />

24
Windows/PPSSPP.vcxproj.filters
View File

@ -64,12 +64,6 @@
<ClCompile Include="DSoundStream.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
<ClCompile Include="D3D9Base.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
<ClCompile Include="OpenGLBase.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
<ClCompile Include="WindowsHost.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
@ -152,6 +146,12 @@
<ClCompile Include="MainWindow.cpp">
<Filter>Windows\UI</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D9Context.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
<ClCompile Include="GPU\WindowsGLContext.cpp">
<Filter>Windows\System</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Debugger\CtrlDisAsmView.h">
@ -187,12 +187,6 @@
<ClInclude Include="DSoundStream.h">
<Filter>Windows\System</Filter>
</ClInclude>
<ClInclude Include="D3D9Base.h">
<Filter>Windows\System</Filter>
</ClInclude>
<ClInclude Include="OpenGLBase.h">
<Filter>Windows\System</Filter>
</ClInclude>
<ClInclude Include="WindowsHost.h">
<Filter>Windows\System</Filter>
</ClInclude>
@ -275,6 +269,12 @@
<ClInclude Include="MainWindow.h">
<Filter>Windows\UI</Filter>
</ClInclude>
<ClInclude Include="GPU\D3D9Context.h">
<Filter>Windows\System</Filter>
</ClInclude>
<ClInclude Include="GPU\WindowsGLContext.h">
<Filter>Windows\System</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="icon1.ico">

4
Windows/WindowsHost.cpp
View File

@ -42,8 +42,8 @@
#include "Windows/DSoundStream.h"
#include "Windows/WindowsHost.h"
#include "Windows/MainWindow.h"
#include "Windows/OpenGLBase.h"
#include "Windows/D3D9Base.h"
#include "Windows/GPU/WindowsGLContext.h"
#include "Windows/GPU/D3D9Context.h"
#include "Windows/Debugger/DebuggerShared.h"
#include "Windows/Debugger/Debugger_Disasm.h"

2
headless/Headless.cpp
View File

@ -25,7 +25,7 @@
#include "Compare.h"
#include "StubHost.h"
#ifdef _WIN32
#include "Windows/OpenGLBase.h"
#include "Windows/GPU/WindowsGLContext.h"
#include "WindowsHeadlessHost.h"
#include "WindowsHeadlessHostDx9.h"
#endif

2
headless/WindowsHeadlessHost.cpp
View File

@ -26,7 +26,7 @@
#include "Core/System.h"
#include "GPU/Common/GPUDebugInterface.h"
#include "GPU/GPUState.h"
#include "Windows/OpenGLBase.h"
#include "Windows/GPU/WindowsGLContext.h"
#include "base/logging.h"
#include "gfx/gl_common.h"