Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move dx_state into gfx/d3d9_state

Browse source
This commit is contained in:
Henrik Rydgard 2017-02-05 20:54:24 +01:00
parent ba52ba8714
commit 41f770d815
15 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -823,6 +823,8 @@ add_library(native STATIC
ext/native/gfx/texture_atlas.h
ext/native/gfx/d3d9_shader.cpp
ext/native/gfx/d3d9_shader.h
ext/native/gfx/d3d9_state.cpp
ext/native/gfx/d3d9_state.h
ext/native/gfx_es2/draw_buffer.cpp
ext/native/gfx_es2/draw_buffer.h
ext/native/gfx_es2/draw_text.cpp
@ -1156,8 +1158,6 @@ set(GPU_D3D9
GPU/Directx9/VertexShaderGeneratorDX9.h
GPU/Directx9/helper/dx_fbo.cpp
GPU/Directx9/helper/dx_fbo.h
GPU/Directx9/helper/dx_state.cpp
GPU/Directx9/helper/dx_state.h
)

2
GPU/Directx9/DepalettizeShaderDX9.cpp
View file

@ -24,7 +24,7 @@
#include "GPU/Directx9/DepalettizeShaderDX9.h"
#include "GPU/Common/DepalettizeShaderCommon.h"
#include "gfx/d3d9_shader.h"
#include "GPU/Directx9/helper/dx_state.h"
#include "gfx/d3d9_state.h"
namespace DX9 {

2
GPU/Directx9/DrawEngineDX9.cpp
View file

@ -26,7 +26,7 @@
#include "Core/Config.h"
#include "Core/CoreTiming.h"
#include "helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "GPU/Math3D.h"
#include "GPU/GPUState.h"

2
GPU/Directx9/FramebufferDX9.cpp
View file

@ -27,7 +27,7 @@
#include "GPU/GPUState.h"
#include "GPU/Debugger/Stepping.h"
#include "helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "helper/dx_fbo.h"
#include "GPU/Common/FramebufferCommon.h"

2
GPU/Directx9/GPU_DX9.cpp
View file

@ -30,7 +30,7 @@
#include "Core/Reporting.h"
#include "Core/System.h"
#include "helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "GPU/GPUState.h"
#include "GPU/ge_constants.h"

2
GPU/Directx9/StateMappingDX9.cpp
View file

@ -24,7 +24,7 @@
#include "Core/Reporting.h"
#include "gfx/d3d9_shader.h"
#include "helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "GPU/Directx9/GPU_DX9.h"
#include "GPU/Directx9/ShaderManagerDX9.h"

2
GPU/Directx9/StencilBufferDX9.cpp
View file

@ -17,7 +17,7 @@
#include "base/logging.h"
#include "helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "helper/dx_fbo.h"
#include "Core/Reporting.h"
#include "GPU/Directx9/FramebufferDX9.h"

2
GPU/Directx9/TextureCacheDX9.cpp
View file

@ -29,7 +29,7 @@
#include "GPU/Directx9/FramebufferDX9.h"
#include "GPU/Directx9/ShaderManagerDX9.h"
#include "GPU/Directx9/DepalettizeShaderDX9.h"
#include "GPU/Directx9/helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "GPU/Common/FramebufferCommon.h"
#include "GPU/Common/TextureDecoder.h"
#include "Core/Config.h"

2
GPU/GPU.vcxproj
View file

@ -206,7 +206,6 @@
<ClInclude Include="Debugger\Stepping.h" />
<ClInclude Include="Directx9\DepalettizeShaderDX9.h" />
<ClInclude Include="Directx9\GPU_DX9.h" />
<ClInclude Include="Directx9\helper\dx_state.h" />
<ClInclude Include="Directx9\helper\dx_fbo.h" />
<ClInclude Include="Directx9\PixelShaderGeneratorDX9.h" />
<ClInclude Include="Directx9\FramebufferDX9.h" />
@ -294,7 +293,6 @@
<ClCompile Include="Debugger\Stepping.cpp" />
<ClCompile Include="Directx9\DepalettizeShaderDX9.cpp" />
<ClCompile Include="Directx9\GPU_DX9.cpp" />
<ClCompile Include="Directx9\helper\dx_state.cpp" />
<ClCompile Include="Directx9\helper\dx_fbo.cpp" />
<ClCompile Include="Directx9\PixelShaderGeneratorDX9.cpp" />
<ClCompile Include="Directx9\FramebufferDX9.cpp" />

6
GPU/GPU.vcxproj.filters
View file

@ -102,9 +102,6 @@
<ClInclude Include="..\ext\xbrz\xbrz.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="Directx9\helper\dx_state.h">
<Filter>DirectX9\helper</Filter>
</ClInclude>
<ClInclude Include="Common\TextureDecoder.h">
<Filter>Common</Filter>
</ClInclude>
@ -308,9 +305,6 @@
<ClCompile Include="..\ext\xbrz\xbrz.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="Directx9\helper\dx_state.cpp">
<Filter>DirectX9\helper</Filter>
</ClCompile>
<ClCompile Include="Common\TextureDecoder.cpp">
<Filter>Common</Filter>
</ClCompile>

2
Windows/GPU/D3D9Context.cpp
View file

@ -1,7 +1,7 @@
#include "Common/CommonWindows.h"
#include <d3d9.h>
#include "GPU/Directx9/helper/dx_state.h"
#include "gfx/d3d9_state.h"
#include "GPU/Directx9/helper/dx_fbo.h"
#include "base/logging.h"

6
GPU/Directx9/helper/dx_state.cpp → ext/native/gfx/d3d9_state.cpp
View file

@ -1,4 +1,6 @@
#include "dx_state.h"
#ifdef _MSC_VER
#include "d3d9_state.h"
#include <assert.h>
namespace DX9 {
@ -73,3 +75,5 @@ void DirectXState::SetVSyncInterval(int interval) {
}
} // namespace DX9
#endif // _MSC_VER

0
GPU/Directx9/helper/dx_state.h → ext/native/gfx/d3d9_state.h
View file

2
ext/native/native.vcxproj
View file

@ -230,6 +230,7 @@
<ClInclude Include="file\zip_read.h" />
<ClInclude Include="file\free.h" />
<ClInclude Include="gfx\d3d9_shader.h" />
<ClInclude Include="gfx\d3d9_state.h" />
<ClInclude Include="gfx\gl_common.h" />
<ClInclude Include="gfx\gl_debug_log.h" />
<ClInclude Include="gfx\gl_lost_manager.h" />
@ -682,6 +683,7 @@
<ClCompile Include="file\zip_read.cpp" />
<ClCompile Include="file\free.cpp" />
<ClCompile Include="gfx\d3d9_shader.cpp" />
<ClCompile Include="gfx\d3d9_state.cpp" />
<ClCompile Include="gfx\gl_debug_log.cpp" />
<ClCompile Include="gfx\gl_lost_manager.cpp" />
<ClCompile Include="gfx\texture_atlas.cpp" />

6
ext/native/native.vcxproj.filters
View file

@ -314,6 +314,9 @@
<ClInclude Include="gfx\d3d9_shader.h">
<Filter>gfx</Filter>
</ClInclude>
<ClInclude Include="gfx\d3d9_state.h">
<Filter>gfx</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="gfx\gl_debug_log.cpp">
@ -757,6 +760,9 @@
<ClCompile Include="gfx\d3d9_shader.cpp">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="gfx\d3d9_state.cpp">
<Filter>gfx</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="gfx">