Rename the TransformPipeline files to DrawEngine, and GLES_GPU to GPU_GLES

This commit is contained in:
Henrik Rydgard 2016-04-10 10:27:28 +02:00
parent e611915a52
commit 7cb6192005
20 changed files with 38 additions and 38 deletions

View File

@ -1505,8 +1505,8 @@ add_library(GPU OBJECT
GPU/GLES/DepalettizeShader.h GPU/GLES/DepalettizeShader.h
GPU/GLES/FBO.cpp GPU/GLES/FBO.cpp
GPU/GLES/FBO.h GPU/GLES/FBO.h
GPU/GLES/GLES_GPU.cpp GPU/GLES/GPU_GLES.cpp
GPU/GLES/GLES_GPU.h GPU/GLES/GPU_GLES.h
GPU/GLES/GLStateCache.cpp GPU/GLES/GLStateCache.cpp
GPU/GLES/GLStateCache.h GPU/GLES/GLStateCache.h
GPU/GLES/FragmentShaderGenerator.cpp GPU/GLES/FragmentShaderGenerator.cpp
@ -1524,8 +1524,8 @@ add_library(GPU OBJECT
GPU/GLES/TextureCache.h GPU/GLES/TextureCache.h
GPU/GLES/TextureScaler.cpp GPU/GLES/TextureScaler.cpp
GPU/GLES/TextureScaler.h GPU/GLES/TextureScaler.h
GPU/GLES/TransformPipeline.cpp GPU/GLES/DrawEngineGLES.cpp
GPU/GLES/TransformPipeline.h GPU/GLES/DrawEngineGLES.h
GPU/GLES/VertexShaderGenerator.cpp GPU/GLES/VertexShaderGenerator.cpp
GPU/GLES/VertexShaderGenerator.h GPU/GLES/VertexShaderGenerator.h
GPU/GPUInterface.h GPU/GPUInterface.h

View File

@ -30,7 +30,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include "GPU/Directx9/GPU_DX9.h" #include "GPU/Directx9/GPU_DX9.h"
#endif #endif
#include "GPU/GLES/GLES_GPU.h" #include "GPU/GLES/GPU_GLES.h"
#include "GPU/GPUInterface.h" #include "GPU/GPUInterface.h"
#include "GPU/GPUState.h" #include "GPU/GPUState.h"

View File

@ -39,7 +39,7 @@
#include "GPU/Common/SoftwareTransformCommon.h" #include "GPU/Common/SoftwareTransformCommon.h"
#include "GPU/Directx9/StateMappingDX9.h" #include "GPU/Directx9/StateMappingDX9.h"
#include "GPU/Directx9/TextureCacheDX9.h" #include "GPU/Directx9/TextureCacheDX9.h"
#include "GPU/Directx9/TransformPipelineDX9.h" #include "GPU/Directx9/DrawEngineDX9.h"
#include "GPU/Directx9/ShaderManagerDX9.h" #include "GPU/Directx9/ShaderManagerDX9.h"
#include "GPU/Directx9/GPU_DX9.h" #include "GPU/Directx9/GPU_DX9.h"

View File

@ -41,7 +41,7 @@
#include "GPU/Directx9/ShaderManagerDX9.h" #include "GPU/Directx9/ShaderManagerDX9.h"
#include "GPU/Directx9/GPU_DX9.h" #include "GPU/Directx9/GPU_DX9.h"
#include "GPU/Directx9/FramebufferDX9.h" #include "GPU/Directx9/FramebufferDX9.h"
#include "GPU/Directx9/TransformPipelineDX9.h" #include "GPU/Directx9/DrawEngineDX9.h"
#include "GPU/Directx9/TextureCacheDX9.h" #include "GPU/Directx9/TextureCacheDX9.h"
#include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelThread.h"

View File

@ -22,7 +22,7 @@
#include "GPU/GPUCommon.h" #include "GPU/GPUCommon.h"
#include "GPU/Directx9/FramebufferDX9.h" #include "GPU/Directx9/FramebufferDX9.h"
#include "GPU/Directx9/TransformPipelineDX9.h" #include "GPU/Directx9/DrawEngineDX9.h"
#include "GPU/Directx9/TextureCacheDX9.h" #include "GPU/Directx9/TextureCacheDX9.h"
#include "GPU/Directx9/DepalettizeShaderDX9.h" #include "GPU/Directx9/DepalettizeShaderDX9.h"
#include "GPU/Directx9/helper/dx_fbo.h" #include "GPU/Directx9/helper/dx_fbo.h"

View File

@ -86,9 +86,9 @@
#include "GPU/GLES/FragmentTestCache.h" #include "GPU/GLES/FragmentTestCache.h"
#include "GPU/GLES/StateMapping.h" #include "GPU/GLES/StateMapping.h"
#include "GPU/GLES/TextureCache.h" #include "GPU/GLES/TextureCache.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/GLES_GPU.h" #include "GPU/GLES/GPU_GLES.h"
extern const GLuint glprim[8] = { extern const GLuint glprim[8] = {
GL_POINTS, GL_POINTS,

View File

@ -43,7 +43,7 @@
#include "GPU/GLES/FBO.h" #include "GPU/GLES/FBO.h"
#include "GPU/GLES/Framebuffer.h" #include "GPU/GLES/Framebuffer.h"
#include "GPU/GLES/TextureCache.h" #include "GPU/GLES/TextureCache.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "UI/OnScreenDisplay.h" #include "UI/OnScreenDisplay.h"

View File

@ -37,9 +37,9 @@
#include "GPU/GLES/GLStateCache.h" #include "GPU/GLES/GLStateCache.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/GLES_GPU.h" #include "GPU/GLES/GPU_GLES.h"
#include "GPU/GLES/Framebuffer.h" #include "GPU/GLES/Framebuffer.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/GLES/TextureCache.h" #include "GPU/GLES/TextureCache.h"
#include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPS.h"
@ -633,7 +633,7 @@ void GPU_GLES::BuildReportingInfo() {
} }
void GPU_GLES::DeviceLost() { void GPU_GLES::DeviceLost() {
ILOG("GLES_GPU: DeviceLost"); ILOG("GPU_GLES: DeviceLost");
// Should only be executed on the GL thread. // Should only be executed on the GL thread.
// Simply drop all caches and textures. // Simply drop all caches and textures.

View File

@ -23,7 +23,7 @@
#include "GPU/GPUCommon.h" #include "GPU/GPUCommon.h"
#include "GPU/GLES/FBO.h" #include "GPU/GLES/FBO.h"
#include "GPU/GLES/Framebuffer.h" #include "GPU/GLES/Framebuffer.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/GLES/TextureCache.h" #include "GPU/GLES/TextureCache.h"
#include "GPU/GLES/DepalettizeShader.h" #include "GPU/GLES/DepalettizeShader.h"
#include "GPU/GLES/FragmentTestCache.h" #include "GPU/GLES/FragmentTestCache.h"

View File

@ -38,7 +38,7 @@
#include "GPU/ge_constants.h" #include "GPU/ge_constants.h"
#include "GPU/GLES/GLStateCache.h" #include "GPU/GLES/GLStateCache.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "UI/OnScreenDisplay.h" #include "UI/OnScreenDisplay.h"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "i18n/i18n.h" #include "i18n/i18n.h"

View File

@ -29,7 +29,7 @@
#include "Core/System.h" #include "Core/System.h"
#include "Core/Config.h" #include "Core/Config.h"
#include "Core/Reporting.h" #include "Core/Reporting.h"
#include "GPU/GLES/GLES_GPU.h" #include "GPU/GLES/GPU_GLES.h"
#include "GPU/GLES/GLStateCache.h" #include "GPU/GLES/GLStateCache.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/TextureCache.h" #include "GPU/GLES/TextureCache.h"

View File

@ -36,7 +36,7 @@
#include "GPU/GLES/FragmentShaderGenerator.h" #include "GPU/GLES/FragmentShaderGenerator.h"
#include "GPU/GLES/DepalettizeShader.h" #include "GPU/GLES/DepalettizeShader.h"
#include "GPU/GLES/ShaderManager.h" #include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/Common/TextureDecoder.h" #include "GPU/Common/TextureDecoder.h"
#include "UI/OnScreenDisplay.h" #include "UI/OnScreenDisplay.h"

View File

@ -20,7 +20,7 @@
#include "GPU/GPU.h" #include "GPU/GPU.h"
#include "GPU/GPUInterface.h" #include "GPU/GPUInterface.h"
#include "GPU/GLES/GLES_GPU.h" #include "GPU/GLES/GPU_GLES.h"
#ifndef NO_VULKAN #ifndef NO_VULKAN
#include "GPU/Vulkan/GPU_Vulkan.h" #include "GPU/Vulkan/GPU_Vulkan.h"
#endif #endif

View File

@ -215,7 +215,7 @@
<ClInclude Include="Directx9\StateMappingDX9.h" /> <ClInclude Include="Directx9\StateMappingDX9.h" />
<ClInclude Include="Directx9\TextureCacheDX9.h" /> <ClInclude Include="Directx9\TextureCacheDX9.h" />
<ClInclude Include="Directx9\TextureScalerDX9.h" /> <ClInclude Include="Directx9\TextureScalerDX9.h" />
<ClInclude Include="Directx9\TransformPipelineDX9.h" /> <ClInclude Include="Directx9\DrawEngineDX9.h" />
<ClInclude Include="Directx9\VertexShaderGeneratorDX9.h" /> <ClInclude Include="Directx9\VertexShaderGeneratorDX9.h" />
<ClInclude Include="ge_constants.h" /> <ClInclude Include="ge_constants.h" />
<ClInclude Include="GeDisasm.h" /> <ClInclude Include="GeDisasm.h" />
@ -224,13 +224,13 @@
<ClInclude Include="GLES\FragmentShaderGenerator.h" /> <ClInclude Include="GLES\FragmentShaderGenerator.h" />
<ClInclude Include="GLES\FragmentTestCache.h" /> <ClInclude Include="GLES\FragmentTestCache.h" />
<ClInclude Include="GLES\Framebuffer.h" /> <ClInclude Include="GLES\Framebuffer.h" />
<ClInclude Include="GLES\GLES_GPU.h" /> <ClInclude Include="GLES\GPU_GLES.h" />
<ClInclude Include="GLES\GLStateCache.h" /> <ClInclude Include="GLES\GLStateCache.h" />
<ClInclude Include="GLES\ShaderManager.h" /> <ClInclude Include="GLES\ShaderManager.h" />
<ClInclude Include="GLES\StateMapping.h" /> <ClInclude Include="GLES\StateMapping.h" />
<ClInclude Include="GLES\TextureCache.h" /> <ClInclude Include="GLES\TextureCache.h" />
<ClInclude Include="GLES\TextureScaler.h" /> <ClInclude Include="GLES\TextureScaler.h" />
<ClInclude Include="GLES\TransformPipeline.h" /> <ClInclude Include="GLES\DrawEngineGLES.h" />
<ClInclude Include="GLES\VertexShaderGenerator.h" /> <ClInclude Include="GLES\VertexShaderGenerator.h" />
<ClInclude Include="GPU.h" /> <ClInclude Include="GPU.h" />
<ClInclude Include="GPUCommon.h" /> <ClInclude Include="GPUCommon.h" />
@ -306,7 +306,7 @@
<ClCompile Include="Directx9\StencilBufferDX9.cpp" /> <ClCompile Include="Directx9\StencilBufferDX9.cpp" />
<ClCompile Include="Directx9\TextureCacheDX9.cpp" /> <ClCompile Include="Directx9\TextureCacheDX9.cpp" />
<ClCompile Include="Directx9\TextureScalerDX9.cpp" /> <ClCompile Include="Directx9\TextureScalerDX9.cpp" />
<ClCompile Include="Directx9\TransformPipelineDX9.cpp" /> <ClCompile Include="Directx9\DrawEngineDX9.cpp" />
<ClCompile Include="Directx9\VertexShaderGeneratorDX9.cpp" /> <ClCompile Include="Directx9\VertexShaderGeneratorDX9.cpp" />
<ClCompile Include="GeDisasm.cpp" /> <ClCompile Include="GeDisasm.cpp" />
<ClCompile Include="GLES\DepalettizeShader.cpp" /> <ClCompile Include="GLES\DepalettizeShader.cpp" />
@ -314,14 +314,14 @@
<ClCompile Include="GLES\FragmentShaderGenerator.cpp" /> <ClCompile Include="GLES\FragmentShaderGenerator.cpp" />
<ClCompile Include="GLES\FragmentTestCache.cpp" /> <ClCompile Include="GLES\FragmentTestCache.cpp" />
<ClCompile Include="GLES\Framebuffer.cpp" /> <ClCompile Include="GLES\Framebuffer.cpp" />
<ClCompile Include="GLES\GLES_GPU.cpp" /> <ClCompile Include="GLES\GPU_GLES.cpp" />
<ClCompile Include="GLES\GLStateCache.cpp" /> <ClCompile Include="GLES\GLStateCache.cpp" />
<ClCompile Include="GLES\ShaderManager.cpp" /> <ClCompile Include="GLES\ShaderManager.cpp" />
<ClCompile Include="GLES\StateMapping.cpp" /> <ClCompile Include="GLES\StateMapping.cpp" />
<ClCompile Include="GLES\StencilBuffer.cpp" /> <ClCompile Include="GLES\StencilBuffer.cpp" />
<ClCompile Include="GLES\TextureCache.cpp" /> <ClCompile Include="GLES\TextureCache.cpp" />
<ClCompile Include="GLES\TextureScaler.cpp" /> <ClCompile Include="GLES\TextureScaler.cpp" />
<ClCompile Include="GLES\TransformPipeline.cpp" /> <ClCompile Include="GLES\DrawEngineGLES.cpp" />
<ClCompile Include="GLES\VertexShaderGenerator.cpp" /> <ClCompile Include="GLES\VertexShaderGenerator.cpp" />
<ClCompile Include="GPU.cpp" /> <ClCompile Include="GPU.cpp" />
<ClCompile Include="GPUCommon.cpp" /> <ClCompile Include="GPUCommon.cpp" />

View File

@ -75,7 +75,7 @@
<ClInclude Include="GLES\TextureScaler.h"> <ClInclude Include="GLES\TextureScaler.h">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLES\TransformPipeline.h"> <ClInclude Include="GLES\DrawEngineGLES.h">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLES\FragmentShaderGenerator.h"> <ClInclude Include="GLES\FragmentShaderGenerator.h">
@ -93,7 +93,7 @@
<ClInclude Include="Directx9\VertexShaderGeneratorDX9.h"> <ClInclude Include="Directx9\VertexShaderGeneratorDX9.h">
<Filter>DirectX9</Filter> <Filter>DirectX9</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Directx9\TransformPipelineDX9.h"> <ClInclude Include="Directx9\DrawEngineDX9.h">
<Filter>DirectX9</Filter> <Filter>DirectX9</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Directx9\TextureScalerDX9.h"> <ClInclude Include="Directx9\TextureScalerDX9.h">
@ -117,7 +117,7 @@
<ClInclude Include="Common\IndexGenerator.h"> <ClInclude Include="Common\IndexGenerator.h">
<Filter>Common</Filter> <Filter>Common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLES\GLES_GPU.h"> <ClInclude Include="GLES\GPU_GLES.h">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GeDisasm.h"> <ClInclude Include="GeDisasm.h">
@ -275,7 +275,7 @@
<ClCompile Include="GLES\TextureCache.cpp"> <ClCompile Include="GLES\TextureCache.cpp">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GLES\TransformPipeline.cpp"> <ClCompile Include="GLES\DrawEngineGLES.cpp">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GLES\VertexShaderGenerator.cpp"> <ClCompile Include="GLES\VertexShaderGenerator.cpp">
@ -299,7 +299,7 @@
<ClCompile Include="Directx9\VertexShaderGeneratorDX9.cpp"> <ClCompile Include="Directx9\VertexShaderGeneratorDX9.cpp">
<Filter>DirectX9</Filter> <Filter>DirectX9</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Directx9\TransformPipelineDX9.cpp"> <ClCompile Include="Directx9\DrawEngineDX9.cpp">
<Filter>DirectX9</Filter> <Filter>DirectX9</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Directx9\TextureCacheDX9.cpp"> <ClCompile Include="Directx9\TextureCacheDX9.cpp">
@ -326,7 +326,7 @@
<ClCompile Include="Common\IndexGenerator.cpp"> <ClCompile Include="Common\IndexGenerator.cpp">
<Filter>Common</Filter> <Filter>Common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GLES\GLES_GPU.cpp"> <ClCompile Include="GLES\GPU_GLES.cpp">
<Filter>GLES</Filter> <Filter>GLES</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeDisasm.cpp"> <ClCompile Include="GeDisasm.cpp">

View File

@ -19,7 +19,7 @@
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/Config.h" #include "Core/Config.h"
#include "GPU/GPUState.h" #include "GPU/GPUState.h"
#include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/DrawEngineGLES.h"
#include "GPU/Common/VertexDecoderCommon.h" #include "GPU/Common/VertexDecoderCommon.h"
#include "GPU/Common/SplineCommon.h" #include "GPU/Common/SplineCommon.h"

View File

@ -35,13 +35,13 @@ SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
$$P/GPU/GLES/FragmentTestCache.cpp \ $$P/GPU/GLES/FragmentTestCache.cpp \
$$P/GPU/GLES/Framebuffer.cpp \ $$P/GPU/GLES/Framebuffer.cpp \
$$P/GPU/GLES/GLStateCache.cpp \ $$P/GPU/GLES/GLStateCache.cpp \
$$P/GPU/GLES/GLES_GPU.cpp \ $$P/GPU/GLES/GPU_GLES.cpp \
$$P/GPU/GLES/ShaderManager.cpp \ $$P/GPU/GLES/ShaderManager.cpp \
$$P/GPU/GLES/StateMapping.cpp \ $$P/GPU/GLES/StateMapping.cpp \
$$P/GPU/GLES/StencilBuffer.cpp \ $$P/GPU/GLES/StencilBuffer.cpp \
$$P/GPU/GLES/TextureCache.cpp \ $$P/GPU/GLES/TextureCache.cpp \
$$P/GPU/GLES/TextureScaler.cpp \ $$P/GPU/GLES/TextureScaler.cpp \
$$P/GPU/GLES/TransformPipeline.cpp \ $$P/GPU/GLES/DrawEngineGLES.cpp \
$$P/GPU/GLES/VertexShaderGenerator.cpp \ $$P/GPU/GLES/VertexShaderGenerator.cpp \
$$P/GPU/Software/*.cpp \ $$P/GPU/Software/*.cpp \
$$P/GPU/Debugger/*.cpp \ $$P/GPU/Debugger/*.cpp \

View File

@ -217,12 +217,12 @@ EXEC_AND_LIB_FILES := \
$(SRC)/GPU/Debugger/Stepping.cpp \ $(SRC)/GPU/Debugger/Stepping.cpp \
$(SRC)/GPU/GLES/Framebuffer.cpp \ $(SRC)/GPU/GLES/Framebuffer.cpp \
$(SRC)/GPU/GLES/DepalettizeShader.cpp \ $(SRC)/GPU/GLES/DepalettizeShader.cpp \
$(SRC)/GPU/GLES/GLES_GPU.cpp.arm \ $(SRC)/GPU/GLES/GPU_GLES.cpp.arm \
$(SRC)/GPU/GLES/GLStateCache.cpp.arm \ $(SRC)/GPU/GLES/GLStateCache.cpp.arm \
$(SRC)/GPU/GLES/FBO.cpp \ $(SRC)/GPU/GLES/FBO.cpp \
$(SRC)/GPU/GLES/StencilBuffer.cpp.arm \ $(SRC)/GPU/GLES/StencilBuffer.cpp.arm \
$(SRC)/GPU/GLES/TextureCache.cpp.arm \ $(SRC)/GPU/GLES/TextureCache.cpp.arm \
$(SRC)/GPU/GLES/TransformPipeline.cpp.arm \ $(SRC)/GPU/GLES/DrawEngineGLES.cpp.arm \
$(SRC)/GPU/GLES/StateMapping.cpp.arm \ $(SRC)/GPU/GLES/StateMapping.cpp.arm \
$(SRC)/GPU/GLES/ShaderManager.cpp.arm \ $(SRC)/GPU/GLES/ShaderManager.cpp.arm \
$(SRC)/GPU/GLES/VertexShaderGenerator.cpp.arm \ $(SRC)/GPU/GLES/VertexShaderGenerator.cpp.arm \