Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-06 13:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ShaderTranslation.cpp/h to Common/GPU.

Browse Source
This commit is contained in:
Henrik Rydgård 2020-11-09 09:00:06 +01:00
parent 669c18a088
commit 766dbc5a9f
17 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -500,6 +500,8 @@ add_library(Common STATIC
Common/GPU/Shader.h
Common/GPU/ShaderWriter.cpp
Common/GPU/ShaderWriter.h
Common/GPU/ShaderTranslation.h
Common/GPU/ShaderTranslation.cpp
Common/GPU/OpenGL/GLCommon.h
Common/GPU/OpenGL/GLDebugLog.cpp
Common/GPU/OpenGL/GLDebugLog.h
@ -1362,8 +1364,6 @@ set(GPU_SOURCES
GPU/Common/ShaderUniforms.h
GPU/Common/ShaderCommon.cpp
GPU/Common/ShaderCommon.h
GPU/Common/ShaderTranslation.cpp
GPU/Common/ShaderTranslation.h
GPU/Common/SplineCommon.cpp
GPU/Common/SplineCommon.h
GPU/Common/StencilCommon.cpp

2
Common/Common.vcxproj
View File

@ -430,6 +430,7 @@
<ClInclude Include="GPU\OpenGL\GLCommon.h" />
<ClInclude Include="GPU\OpenGL\GLDebugLog.h" />
<ClInclude Include="GPU\Shader.h" />
<ClInclude Include="GPU\ShaderTranslation.h" />
<ClInclude Include="GPU\ShaderWriter.h" />
<ClInclude Include="GPU\thin3d.h" />
<ClInclude Include="GPU\thin3d_create.h" />
@ -753,6 +754,7 @@
<ClCompile Include="GPU\OpenGL\GLDebugLog.cpp" />
<ClCompile Include="GPU\OpenGL\thin3d_gl.cpp" />
<ClCompile Include="GPU\Shader.cpp" />
<ClCompile Include="GPU\ShaderTranslation.cpp" />
<ClCompile Include="GPU\ShaderWriter.cpp" />
<ClCompile Include="GPU\thin3d.cpp" />
<ClCompile Include="GPU\Vulkan\thin3d_vulkan.cpp" />

8
Common/Common.vcxproj.filters
View File

@ -384,6 +384,9 @@
<ClInclude Include="Data\Collections\Slice.h">
<Filter>Data\Collections</Filter>
</ClInclude>
<ClInclude Include="GPU\ShaderTranslation.h">
<Filter>GPU</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -738,6 +741,9 @@
<ClCompile Include="GPU\Shader.cpp">
<Filter>GPU</Filter>
</ClCompile>
<ClCompile Include="GPU\ShaderTranslation.cpp">
<Filter>GPU</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@ -853,4 +859,4 @@
<Filter>Math\fast</Filter>
</None>
</ItemGroup>
</Project>
</Project>

2
GPU/Common/ShaderTranslation.cpp → Common/GPU/ShaderTranslation.cpp
View File

@ -38,7 +38,7 @@
#include "Common/StringUtils.h"
#include "Common/GPU/Shader.h"
#include "GPU/Common/ShaderTranslation.h"
#include "Common/GPU/ShaderTranslation.h"
#include "ext/glslang/SPIRV/GlslangToSpv.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/OpenGL/GLFeatures.h"

0
GPU/Common/ShaderTranslation.h → Common/GPU/ShaderTranslation.h
View File

2
GPU/Common/PresentationCommon.cpp
View File

@ -33,7 +33,7 @@
#include "Core/HLE/sceDisplay.h"
#include "GPU/Common/PostShader.h"
#include "GPU/Common/PresentationCommon.h"
#include "GPU/Common/ShaderTranslation.h"
#include "Common/GPU/ShaderTranslation.h"
struct Vertex {
float x, y, z;

2
GPU/D3D11/FramebufferManagerD3D11.cpp
View File

@ -36,7 +36,7 @@
#include "GPU/Debugger/Stepping.h"
#include "GPU/Common/FramebufferManagerCommon.h"
#include "GPU/Common/PresentationCommon.h"
#include "GPU/Common/ShaderTranslation.h"
#include "Common/GPU/ShaderTranslation.h"
#include "GPU/Common/TextureDecoder.h"
#include "GPU/D3D11/FramebufferManagerD3D11.h"
#include "GPU/D3D11/ShaderManagerD3D11.h"

2
GPU/Directx9/FramebufferManagerDX9.cpp
View File

@ -31,7 +31,7 @@
#include "Common/GPU/D3D9/D3D9StateCache.h"
#include "GPU/Common/FramebufferManagerCommon.h"
#include "GPU/Common/PresentationCommon.h"
#include "GPU/Common/ShaderTranslation.h"
#include "Common/GPU/ShaderTranslation.h"
#include "GPU/Common/TextureDecoder.h"
#include "GPU/Directx9/FramebufferManagerDX9.h"
#include "GPU/Directx9/ShaderManagerDX9.h"

2
GPU/GPU.vcxproj
View File

@ -350,7 +350,6 @@
<ClInclude Include="Common\PresentationCommon.h" />
<ClInclude Include="Common\ShaderCommon.h" />
<ClInclude Include="Common\ShaderId.h" />
<ClInclude Include="Common\ShaderTranslation.h" />
<ClInclude Include="Common\ShaderUniforms.h" />
<ClInclude Include="Common\SoftwareTransformCommon.h" />
<ClInclude Include="Common\SplineCommon.h" />
@ -488,7 +487,6 @@
<ClCompile Include="Common\PresentationCommon.cpp" />
<ClCompile Include="Common\ShaderCommon.cpp" />
<ClCompile Include="Common\ShaderId.cpp" />
<ClCompile Include="Common\ShaderTranslation.cpp" />
<ClCompile Include="Common\ShaderUniforms.cpp" />
<ClCompile Include="Common\SplineCommon.cpp" />
<ClCompile Include="Common\StencilCommon.cpp" />

8
GPU/GPU.vcxproj.filters
View File

@ -222,9 +222,6 @@
<ClInclude Include="D3D11\D3D11Util.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="Common\ShaderTranslation.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="Software\Sampler.h">
<Filter>Software</Filter>
</ClInclude>
@ -485,9 +482,6 @@
<ClCompile Include="D3D11\StencilBufferD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="Common\ShaderTranslation.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="Common\ShaderCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
@ -546,4 +540,4 @@
<Filter>Common</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

2
GPU/Software/SoftGpu.cpp
View File

@ -41,7 +41,7 @@
#include "GPU/Software/TransformUnit.h"
#include "GPU/Common/DrawEngineCommon.h"
#include "GPU/Common/PresentationCommon.h"
#include "GPU/Common/ShaderTranslation.h"
#include "Common/GPU/ShaderTranslation.h"
#include "GPU/Common/SplineCommon.h"
#include "GPU/Debugger/Debugger.h"
#include "GPU/Debugger/Record.h"

2
UWP/CommonUWP/CommonUWP.vcxproj
View File

@ -420,6 +420,7 @@
<ClInclude Include="..\..\Common\GPU\DataFormat.h" />
<ClInclude Include="..\..\Common\GPU\OpenGL\GLFeatures.h" />
<ClInclude Include="..\..\Common\GPU\Shader.h" />
<ClInclude Include="..\..\Common\GPU\ShaderTranslation.h" />
<ClInclude Include="..\..\Common\GPU\ShaderWriter.h" />
<ClInclude Include="..\..\Common\GPU\thin3d.h" />
<ClInclude Include="..\..\Common\GPU\thin3d_create.h" />
@ -539,6 +540,7 @@
<ClCompile Include="..\..\Common\GPU\D3D11\thin3d_d3d11.cpp" />
<ClCompile Include="..\..\Common\GPU\OpenGL\GLFeatures.cpp" />
<ClCompile Include="..\..\Common\GPU\Shader.cpp" />
<ClCompile Include="..\..\Common\GPU\ShaderTranslation.cpp" />
<ClCompile Include="..\..\Common\GPU\ShaderWriter.cpp" />
<ClCompile Include="..\..\Common\GPU\thin3d.cpp" />
<ClCompile Include="..\..\Common\Input\GestureDetector.cpp" />

6
UWP/CommonUWP/CommonUWP.vcxproj.filters
View File

@ -369,6 +369,9 @@
<ClCompile Include="..\..\Common\GPU\ShaderWriter.cpp">
<Filter>GPU</Filter>
</ClCompile>
<ClCompile Include="..\..\Common\GPU\ShaderTranslation.cpp">
<Filter>GPU</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="targetver.h" />
@ -674,6 +677,9 @@
<ClInclude Include="..\..\Common\GPU\ShaderWriter.h">
<Filter>GPU</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\GPU\ShaderTranslation.h">
<Filter>GPU</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\ext\libpng17\CMakeLists.txt">

2
UWP/GPU_UWP/GPU_UWP.vcxproj
View File

@ -391,7 +391,6 @@
<ClInclude Include="..\..\GPU\Common\ReinterpretFramebuffer.h" />
<ClInclude Include="..\..\GPU\Common\ShaderCommon.h" />
<ClInclude Include="..\..\GPU\Common\ShaderId.h" />
<ClInclude Include="..\..\GPU\Common\ShaderTranslation.h" />
<ClInclude Include="..\..\GPU\Common\ShaderUniforms.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareLighting.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareTransformCommon.h" />
@ -449,7 +448,6 @@
<ClCompile Include="..\..\GPU\Common\ReinterpretFramebuffer.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderId.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderTranslation.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderUniforms.cpp" />
<ClCompile Include="..\..\GPU\Common\SoftwareTransformCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\SplineCommon.cpp" />

2
UWP/GPU_UWP/GPU_UWP.vcxproj.filters
View File

@ -11,7 +11,6 @@
<ClCompile Include="..\..\GPU\Common\PostShader.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderId.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderTranslation.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderUniforms.cpp" />
<ClCompile Include="..\..\GPU\Common\SoftwareTransformCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\SplineCommon.cpp" />
@ -70,7 +69,6 @@
<ClInclude Include="..\..\GPU\Common\PostShader.h" />
<ClInclude Include="..\..\GPU\Common\ShaderCommon.h" />
<ClInclude Include="..\..\GPU\Common\ShaderId.h" />
<ClInclude Include="..\..\GPU\Common\ShaderTranslation.h" />
<ClInclude Include="..\..\GPU\Common\ShaderUniforms.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareLighting.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareTransformCommon.h" />

2
android/jni/Android.mk
View File

@ -254,6 +254,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Common/GPU/thin3d.cpp \
$(SRC)/Common/GPU/Shader.cpp \
$(SRC)/Common/GPU/ShaderWriter.cpp \
$(SRC)/Common/GPU/ShaderTranslation.cpp \
$(SRC)/Common/Render/DrawBuffer.cpp \
$(SRC)/Common/Render/TextureAtlas.cpp \
$(SRC)/Common/Render/Text/draw_text.cpp \
@ -321,7 +322,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/GPU/Common/TextureCacheCommon.cpp.arm \
$(SRC)/GPU/Common/TextureScalerCommon.cpp.arm \
$(SRC)/GPU/Common/ShaderCommon.cpp \
$(SRC)/GPU/Common/ShaderTranslation.cpp \
$(SRC)/GPU/Common/StencilCommon.cpp \
$(SRC)/GPU/Common/SplineCommon.cpp.arm \
$(SRC)/GPU/Common/DrawEngineCommon.cpp.arm \

2
libretro/Makefile.common
View File

@ -168,6 +168,7 @@ SOURCES_CXX += \
$(COMMONDIR)/GPU/thin3d.cpp \
$(COMMONDIR)/GPU/Shader.cpp \
$(COMMONDIR)/GPU/ShaderWriter.cpp \
$(COMMONDIR)/GPU/ShaderTranslation.cpp \
$(COMMONDIR)/GPU/OpenGL/thin3d_gl.cpp \
$(COMMONDIR)/GPU/OpenGL/GLDebugLog.cpp \
$(COMMONDIR)/GPU/OpenGL/GLSLProgram.cpp \
@ -238,7 +239,6 @@ SOURCES_CXX += \
$(GPUCOMMONDIR)/ShaderId.cpp \
$(GPUCOMMONDIR)/ShaderCommon.cpp \
$(GPUCOMMONDIR)/ShaderUniforms.cpp \
$(GPUCOMMONDIR)/ShaderTranslation.cpp \
$(GPUCOMMONDIR)/GPUDebugInterface.cpp \
$(GPUCOMMONDIR)/DepalettizeShaderCommon.cpp \
$(GPUCOMMONDIR)/TransformCommon.cpp \