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

Merge pull request #13508 from hrydgard/move-gpu-stuff-to-common

Browse source 
Move GPU stuff to common
This commit is contained in:
Henrik Rydgård 2020-10-05 11:22:21 +02:00 • committed by GitHub
commit dd5a459e00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
235 changed files with 984 additions and 2284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
CMakeLists.txt
View file

@ -164,11 +164,12 @@ else()
set(CoreLinkType STATIC)
endif()
include_directories(ext/native)
# Work around for some misfeature of the current glslang build system
include_directories(ext/glslang)
# Not sure if this is the best way - what about system glew?
# Anyway, glew will be going away anyway.
include_directories(ext/glew)
if(NOT OPENGL_LIBRARIES AND USING_GLES2)
set(OPENGL_LIBRARIES GLESv2 EGL)
@ -299,12 +300,7 @@ if(NOT MSVC)
if(IOS)
elseif(APPLE AND NOT CMAKE_CROSSCOMPILING)
# We want C++11, so target 10.7+
if(USING_QT_UI)
set(MACOSX_VERSION_MIN "10.8")
else()
set(MACOSX_VERSION_MIN "10.7")
endif()
set(MACOSX_VERSION_MIN "10.8")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN} -stdlib=libc++ -U__STRICT_ANSI__")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
@ -354,6 +350,14 @@ macro(setup_target_project TargetName ProjectDir)
endforeach()
endmacro()
add_subdirectory(ext)
if(WIN32)
include_directories(dx9sdk/Include)
include_directories(dx9sdk/Include/DX11)
endif()
set(CommonX86
Common/ABI.cpp
Common/ABI.h
@ -400,18 +404,19 @@ if(NOT (X86 OR ARM OR MIPS))
source_group(Fake FILES ${CommonFake})
endif()
set(CommonVulkan ${CommonExtra}
Common/Vulkan/VulkanDebug.cpp
Common/Vulkan/VulkanDebug.h
Common/Vulkan/VulkanContext.cpp
Common/Vulkan/VulkanContext.h
Common/Vulkan/VulkanImage.cpp
Common/Vulkan/VulkanImage.h
Common/Vulkan/VulkanLoader.cpp
Common/Vulkan/VulkanLoader.h
Common/Vulkan/VulkanMemory.cpp
Common/Vulkan/VulkanMemory.h
)
if(WIN32)
set(CommonD3D
Common/GPU/D3D9/D3D9ShaderCompiler.cpp
Common/GPU/D3D9/D3D9ShaderCompiler.h
Common/GPU/D3D9/D3D9StateCache.cpp
Common/GPU/D3D9/D3D9StateCache.h
Common/GPU/D3D9/thin3d_d3d9.cpp
Common/GPU/D3D9/D3DCompilerLoader.cpp
Common/GPU/D3D11/thin3d_d3d11.cpp
Common/GPU/D3D11/D3D11Loader.cpp
Common/GPU/D3D11/D3D11Loader.h
)
endif()
add_library(Common STATIC
${CommonX86}
@ -419,7 +424,7 @@ add_library(Common STATIC
${CommonARM64}
${CommonMIPS}
${CommonFake}
${CommonVulkan}
${CommonD3D}
Common/Serialize/Serializer.cpp
Common/Serialize/Serializer.h
Common/Serialize/SerializeDeque.h
@ -484,6 +489,41 @@ add_library(Common STATIC
Common/File/DirListing.h
Common/File/FileDescriptor.cpp
Common/File/FileDescriptor.h
Common/GPU/DataFormat.h
Common/GPU/thin3d.cpp
Common/GPU/thin3d.h
Common/GPU/thin3d_create.h
Common/GPU/OpenGL/GLCommon.h
Common/GPU/OpenGL/GLDebugLog.cpp
Common/GPU/OpenGL/GLDebugLog.h
Common/GPU/OpenGL/GLSLProgram.cpp
Common/GPU/OpenGL/GLSLProgram.h
Common/GPU/OpenGL/gl3stub.c
Common/GPU/OpenGL/gl3stub.h
Common/GPU/OpenGL/GLFeatures.cpp
Common/GPU/OpenGL/GLFeatures.h
Common/GPU/OpenGL/thin3d_gl.cpp
Common/GPU/OpenGL/GLRenderManager.cpp
Common/GPU/OpenGL/GLRenderManager.h
Common/GPU/OpenGL/GLQueueRunner.cpp
Common/GPU/OpenGL/GLQueueRunner.h
Common/GPU/OpenGL/DataFormatGL.cpp
Common/GPU/OpenGL/DataFormatGL.h
Common/GPU/Vulkan/VulkanDebug.cpp
Common/GPU/Vulkan/VulkanDebug.h
Common/GPU/Vulkan/VulkanContext.cpp
Common/GPU/Vulkan/VulkanContext.h
Common/GPU/Vulkan/VulkanImage.cpp
Common/GPU/Vulkan/VulkanImage.h
Common/GPU/Vulkan/VulkanLoader.cpp
Common/GPU/Vulkan/VulkanLoader.h
Common/GPU/Vulkan/VulkanMemory.cpp
Common/GPU/Vulkan/VulkanMemory.h
Common/GPU/Vulkan/thin3d_vulkan.cpp
Common/GPU/Vulkan/VulkanRenderManager.cpp
Common/GPU/Vulkan/VulkanRenderManager.h
Common/GPU/Vulkan/VulkanQueueRunner.cpp
Common/GPU/Vulkan/VulkanQueueRunner.h
Common/Input/GestureDetector.cpp
Common/Input/GestureDetector.h
Common/Input/KeyCodes.h
@ -519,6 +559,18 @@ add_library(Common STATIC
Common/Net/WebsocketServer.h
Common/Profiler/Profiler.cpp
Common/Profiler/Profiler.h
Common/Render/TextureAtlas.cpp
Common/Render/TextureAtlas.h
Common/Render/DrawBuffer.cpp
Common/Render/DrawBuffer.h
Common/Render/Text/draw_text.cpp
Common/Render/Text/draw_text.h
Common/Render/Text/draw_text_android.cpp
Common/Render/Text/draw_text_android.h
Common/Render/Text/draw_text_win.cpp
Common/Render/Text/draw_text_win.h
Common/Render/Text/draw_text_uwp.cpp
Common/Render/Text/draw_text_uwp.h
Common/System/Display.cpp
Common/System/Display.h
Common/Thread/Executor.cpp
@ -590,39 +642,21 @@ add_library(Common STATIC
Common/TimeUtil.h
)
add_subdirectory(ext)
include_directories(Common)
setup_target_project(Common Common)
target_link_libraries(Common Ext::Snappy)
if(WIN32)
include_directories(dx9sdk/Include)
include_directories(dx9sdk/Include/DX11)
if(MINGW)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <INCLUDES> <SOURCE> <OBJECT>")
# required when using the dx9sdk include paths
add_definitions(-include ${CMAKE_CURRENT_SOURCE_DIR}/Windows/mingw_defines.h)
else()
target_link_libraries(Common dxguid)
endif()
target_link_libraries(Common winmm d3d9 dsound)
endif()
if(TARGET SDL2::SDL2)
target_link_libraries(Common SDL2::SDL2)
endif()
if(USING_GLES2 OR (USING_EGL AND NOT USING_FBDEV))
find_package(X11)
endif()
add_library(gason STATIC
ext/gason/gason.cpp
ext/gason/gason.h
ext/gason/gason.cpp
ext/gason/gason.h
)
if(USE_FFMPEG)
if(NOT FFMPEG_DIR)
if(NOT USE_SYSTEM_FFMPEG)
@ -927,11 +961,13 @@ elseif(USING_QT_UI)
if(USING_GLES2)
add_definitions(-DQT_OPENGL_ES -DQT_OPENGL_ES_2)
endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt)
include_directories(Qt)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core Qt5::Multimedia)
set(TargetBin PPSSPPQt)
# Enable SDL if found
# Enable SDL joystick if SDL is found
if(SDL2_FOUND)
add_definitions(-DSDL)
set(nativeExtra ${nativeExtra}
@ -972,6 +1008,22 @@ elseif(NOT LIBRETRO)
message(FATAL_ERROR "Could not find SDL2. Failing.")
endif()
if(WIN32)
if(MINGW)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <INCLUDES> <SOURCE> <OBJECT>")
# required when using the dx9sdk include paths
add_definitions(-include ${CMAKE_CURRENT_SOURCE_DIR}/Windows/mingw_defines.h)
else()
target_link_libraries(Common dxguid)
endif()
target_link_libraries(Common winmm d3d9 dsound)
endif()
if(TARGET SDL2::SDL2)
target_link_libraries(Common SDL2::SDL2)
endif()
list(APPEND NativeAppSource
android/jni/TestRunner.cpp
UI/DiscordIntegration.cpp
@ -1019,73 +1071,15 @@ if(ANDROID)
endif()
endif()
set(THIN3D_PLATFORMS ext/native/thin3d/thin3d_gl.cpp
ext/native/thin3d/GLRenderManager.cpp
ext/native/thin3d/GLRenderManager.h
ext/native/thin3d/GLQueueRunner.cpp
ext/native/thin3d/GLQueueRunner.h
ext/native/thin3d/DataFormatGL.cpp
ext/native/thin3d/DataFormatGL.h
)
set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
ext/native/thin3d/thin3d_vulkan.cpp
ext/native/thin3d/VulkanRenderManager.cpp
ext/native/thin3d/VulkanRenderManager.h
ext/native/thin3d/VulkanQueueRunner.cpp
ext/native/thin3d/VulkanQueueRunner.h
ext/native/thin3d/DataFormat.h
)
if(WIN32)
set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
ext/native/thin3d/thin3d_d3d9.cpp
ext/native/thin3d/thin3d_d3d11.cpp
ext/native/thin3d/d3d9_d3dcompiler_loader.cpp
ext/native/thin3d/d3dx9_loader.cpp
ext/native/thin3d/d3dx9_loader.h
ext/native/thin3d/d3d11_loader.cpp
ext/native/thin3d/d3d11_loader.h
)
endif()
add_library(native STATIC
${nativeExtra}
ext/native/gfx/gl_common.h
ext/native/gfx/gl_debug_log.cpp
ext/native/gfx/gl_debug_log.h
ext/native/gfx/texture_atlas.cpp
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
ext/native/gfx_es2/draw_text.h
ext/native/gfx_es2/draw_text_win.cpp
ext/native/gfx_es2/draw_text_win.h
ext/native/gfx_es2/draw_text_qt.cpp
ext/native/gfx_es2/draw_text_qt.h
ext/native/gfx_es2/draw_text_android.cpp
ext/native/gfx_es2/draw_text_android.h
ext/native/gfx_es2/gpu_features.cpp
ext/native/gfx_es2/gpu_features.h
ext/native/gfx_es2/glsl_program.cpp
ext/native/gfx_es2/glsl_program.h
ext/native/gfx_es2/gl3stub.c
ext/native/gfx_es2/gl3stub.h
ext/native/thin3d/thin3d.cpp
ext/native/thin3d/thin3d.h
ext/native/thin3d/thin3d_create.h
${THIN3D_PLATFORMS}
Common/Render/Text/draw_text_qt.cpp
Common/Render/Text/draw_text_qt.h
ext/jpge/jpgd.cpp
ext/jpge/jpgd.h
ext/jpge/jpge.cpp
ext/jpge/jpge.h
)
include_directories(ext/native)
if(LINUX AND NOT ANDROID)
set(RT_LIB rt)
@ -1108,7 +1102,6 @@ elseif(WIN32)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$")
target_link_libraries(native execinfo)
endif()
setup_target_project(native native)
add_library(kirk STATIC
ext/libkirk/AES.c
@ -1814,7 +1807,6 @@ set(CoreExtraLibs ${CoreExtraLibs} armips)
# target_link_libraries(native X11-xcb X11)
#endif()
set(GlslangLibs glslang OGLCompiler OSDependent SPIRV SPVRemapper spirv-cross-glsl)
if(WIN32)

125
Common/Common.vcxproj
View file

@ -136,7 +136,7 @@
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -148,8 +148,11 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -158,7 +161,7 @@
<ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<OmitFramePointers>false</OmitFramePointers>
@ -171,8 +174,11 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@ -181,7 +187,7 @@
<ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<OmitFramePointers>false</OmitFramePointers>
@ -194,8 +200,11 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@ -205,7 +214,7 @@
</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<OmitFramePointers>false</OmitFramePointers>
@ -218,8 +227,11 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -234,7 +246,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@ -247,8 +259,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -260,7 +275,7 @@
<PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -278,8 +293,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@ -291,7 +309,7 @@
<PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -309,8 +327,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@ -322,7 +343,7 @@
<PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ext/glew;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -340,8 +361,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib />
<Lib>
<AdditionalLibraryDirectories>Winmm.lib</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
@ -388,6 +412,28 @@
<ClInclude Include="File\PathBrowser.h" />
<ClInclude Include="File\VFS\VFS.h" />
<ClInclude Include="File\VFS\AssetReader.h" />
<ClInclude Include="GPU\D3D11\D3D11Loader.h" />
<ClInclude Include="GPU\D3D9\D3DCompilerLoader.h" />
<ClInclude Include="GPU\D3D9\D3D9ShaderCompiler.h" />
<ClInclude Include="GPU\D3D9\D3D9StateCache.h" />
<ClInclude Include="GPU\DataFormat.h" />
<ClInclude Include="GPU\OpenGL\DataFormatGL.h" />
<ClInclude Include="GPU\OpenGL\gl3stub.h" />
<ClInclude Include="GPU\OpenGL\GLFeatures.h" />
<ClInclude Include="GPU\OpenGL\GLQueueRunner.h" />
<ClInclude Include="GPU\OpenGL\GLRenderManager.h" />
<ClInclude Include="GPU\OpenGL\GLSLProgram.h" />
<ClInclude Include="GPU\OpenGL\GLCommon.h" />
<ClInclude Include="GPU\OpenGL\GLDebugLog.h" />
<ClInclude Include="GPU\thin3d.h" />
<ClInclude Include="GPU\thin3d_create.h" />
<ClInclude Include="GPU\Vulkan\VulkanContext.h" />
<ClInclude Include="GPU\Vulkan\VulkanDebug.h" />
<ClInclude Include="GPU\Vulkan\VulkanImage.h" />
<ClInclude Include="GPU\Vulkan\VulkanLoader.h" />
<ClInclude Include="GPU\Vulkan\VulkanMemory.h" />
<ClInclude Include="GPU\Vulkan\VulkanQueueRunner.h" />
<ClInclude Include="GPU\Vulkan\VulkanRenderManager.h" />
<ClInclude Include="Input\GestureDetector.h" />
<ClInclude Include="Input\InputState.h" />
<ClInclude Include="Input\KeyCodes.h" />
@ -407,6 +453,13 @@
<ClInclude Include="Net\URL.h" />
<ClInclude Include="Net\WebsocketServer.h" />
<ClInclude Include="Profiler\Profiler.h" />
<ClInclude Include="Render\DrawBuffer.h" />
<ClInclude Include="Render\TextureAtlas.h" />
<ClInclude Include="Render\Text\draw_text.h" />
<ClInclude Include="Render\Text\draw_text_android.h" />
<ClInclude Include="Render\Text\draw_text_qt.h" />
<ClInclude Include="Render\Text\draw_text_uwp.h" />
<ClInclude Include="Render\Text\draw_text_win.h" />
<ClInclude Include="Serialize\SerializeDeque.h" />
<ClInclude Include="Serialize\SerializeFuncs.h" />
<ClInclude Include="ColorConvNEON.h" />
@ -483,11 +536,6 @@
<ClInclude Include="UI\UIScreen.h" />
<ClInclude Include="UI\View.h" />
<ClInclude Include="UI\ViewGroup.h" />
<ClInclude Include="Vulkan\VulkanContext.h" />
<ClInclude Include="Vulkan\VulkanDebug.h" />
<ClInclude Include="Vulkan\VulkanImage.h" />
<ClInclude Include="Vulkan\VulkanLoader.h" />
<ClInclude Include="Vulkan\VulkanMemory.h" />
<ClInclude Include="x64Analyzer.h" />
<ClInclude Include="x64Emitter.h" />
</ItemGroup>
@ -690,6 +738,29 @@
<ClCompile Include="File\PathBrowser.cpp" />
<ClCompile Include="File\VFS\VFS.cpp" />
<ClCompile Include="File\VFS\AssetReader.cpp" />
<ClCompile Include="GPU\D3D11\D3D11Loader.cpp" />
<ClCompile Include="GPU\D3D11\thin3d_d3d11.cpp" />
<ClCompile Include="GPU\D3D9\D3DCompilerLoader.cpp" />
<ClCompile Include="GPU\D3D9\D3D9ShaderCompiler.cpp" />
<ClCompile Include="GPU\D3D9\D3D9StateCache.cpp" />
<ClCompile Include="GPU\D3D9\thin3d_d3d9.cpp" />
<ClCompile Include="GPU\OpenGL\DataFormatGL.cpp" />
<ClCompile Include="GPU\OpenGL\gl3stub.c" />
<ClCompile Include="GPU\OpenGL\GLFeatures.cpp" />
<ClCompile Include="GPU\OpenGL\GLQueueRunner.cpp" />
<ClCompile Include="GPU\OpenGL\GLRenderManager.cpp" />
<ClCompile Include="GPU\OpenGL\GLSLProgram.cpp" />
<ClCompile Include="GPU\OpenGL\GLDebugLog.cpp" />
<ClCompile Include="GPU\OpenGL\thin3d_gl.cpp" />
<ClCompile Include="GPU\thin3d.cpp" />
<ClCompile Include="GPU\Vulkan\thin3d_vulkan.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanContext.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanDebug.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanImage.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanLoader.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanMemory.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanQueueRunner.cpp" />
<ClCompile Include="GPU\Vulkan\VulkanRenderManager.cpp" />
<ClCompile Include="Input\GestureDetector.cpp" />
<ClCompile Include="Input\InputState.cpp" />
<ClCompile Include="Log.cpp" />
@ -709,6 +780,13 @@
<ClCompile Include="Net\URL.cpp" />
<ClCompile Include="Net\WebsocketServer.cpp" />
<ClCompile Include="Profiler\Profiler.cpp" />
<ClCompile Include="Render\DrawBuffer.cpp" />
<ClCompile Include="Render\TextureAtlas.cpp" />
<ClCompile Include="Render\Text\draw_text.cpp" />
<ClCompile Include="Render\Text\draw_text_android.cpp" />
<ClCompile Include="Render\Text\draw_text_qt.cpp" />
<ClCompile Include="Render\Text\draw_text_uwp.cpp" />
<ClCompile Include="Render\Text\draw_text_win.cpp" />
<ClCompile Include="Serialize\Serializer.cpp" />
<ClCompile Include="ColorConv.cpp" />
<ClCompile Include="ConsoleListener.cpp" />
@ -774,11 +852,6 @@
<ClCompile Include="UI\UIScreen.cpp" />
<ClCompile Include="UI\View.cpp" />
<ClCompile Include="UI\ViewGroup.cpp" />
<ClCompile Include="Vulkan\VulkanContext.cpp" />
<ClCompile Include="Vulkan\VulkanDebug.cpp" />
<ClCompile Include="Vulkan\VulkanImage.cpp" />
<ClCompile Include="Vulkan\VulkanLoader.cpp" />
<ClCompile Include="Vulkan\VulkanMemory.cpp" />
<ClCompile Include="x64Analyzer.cpp" />
<ClCompile Include="x64Emitter.cpp" />
</ItemGroup>

231
Common/Common.vcxproj.filters
View file

@ -50,25 +50,10 @@
</ClInclude>
<ClInclude Include="GraphicsContext.h" />
<ClInclude Include="DbgNew.h" />
<ClInclude Include="Vulkan\VulkanLoader.h">
<Filter>Vulkan</Filter>
</ClInclude>
<ClInclude Include="Vulkan\VulkanContext.h">
<Filter>Vulkan</Filter>
</ClInclude>
<ClInclude Include="Vulkan\VulkanImage.h">
<Filter>Vulkan</Filter>
</ClInclude>
<ClInclude Include="Vulkan\VulkanMemory.h">
<Filter>Vulkan</Filter>
</ClInclude>
<ClInclude Include="OSVersion.h" />
<ClInclude Include="Hashmaps.h" />
<ClInclude Include="BitScan.h" />
<ClInclude Include="MakeUnique.h" />
<ClInclude Include="Vulkan\VulkanDebug.h">
<Filter>Vulkan</Filter>
</ClInclude>
<ClInclude Include="ExceptionHandlerSetup.h" />
<ClInclude Include="MachineContext.h" />
<ClInclude Include="Serialize\Serializer.h">
@ -300,6 +285,93 @@
<ClInclude Include="UI\ViewGroup.h">
<Filter>UI</Filter>
</ClInclude>
<ClInclude Include="GPU\D3D9\D3DCompilerLoader.h">
<Filter>GPU\D3D9</Filter>
</ClInclude>
<ClInclude Include="GPU\D3D9\D3D9ShaderCompiler.h">
<Filter>GPU\D3D9</Filter>
</ClInclude>
<ClInclude Include="GPU\D3D9\D3D9StateCache.h">
<Filter>GPU\D3D9</Filter>
</ClInclude>
<ClInclude Include="GPU\D3D11\D3D11Loader.h">
<Filter>GPU\D3D11</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\DataFormatGL.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\gl3stub.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLQueueRunner.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLRenderManager.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\DataFormat.h">
<Filter>GPU</Filter>
</ClInclude>
<ClInclude Include="GPU\thin3d.h">
<Filter>GPU</Filter>
</ClInclude>
<ClInclude Include="GPU\thin3d_create.h">
<Filter>GPU</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanQueueRunner.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanRenderManager.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLCommon.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLDebugLog.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLSLProgram.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="Render\DrawBuffer.h">
<Filter>Render</Filter>
</ClInclude>
<ClInclude Include="Render\TextureAtlas.h">
<Filter>Render</Filter>
</ClInclude>
<ClInclude Include="GPU\OpenGL\GLFeatures.h">
<Filter>GPU\OpenGL</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanContext.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanDebug.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanImage.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanLoader.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="GPU\Vulkan\VulkanMemory.h">
<Filter>GPU\Vulkan</Filter>
</ClInclude>
<ClInclude Include="Render\Text\draw_text.h">
<Filter>Render\Text</Filter>
</ClInclude>
<ClInclude Include="Render\Text\draw_text_android.h">
<Filter>Render\Text</Filter>
</ClInclude>
<ClInclude Include="Render\Text\draw_text_qt.h">
<Filter>Render\Text</Filter>
</ClInclude>
<ClInclude Include="Render\Text\draw_text_uwp.h">
<Filter>Render\Text</Filter>
</ClInclude>
<ClInclude Include="Render\Text\draw_text_win.h">
<Filter>Render\Text</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -337,26 +409,11 @@
<ClCompile Include="GL\GLInterface\GLInterface.cpp">
<Filter>GL\GLInterface</Filter>
</ClCompile>
<ClCompile Include="Vulkan\VulkanLoader.cpp">
<Filter>Vulkan</Filter>
</ClCompile>
<ClCompile Include="Vulkan\VulkanContext.cpp">
<Filter>Vulkan</Filter>
</ClCompile>
<ClCompile Include="Vulkan\VulkanImage.cpp">
<Filter>Vulkan</Filter>
</ClCompile>
<ClCompile Include="Vulkan\VulkanMemory.cpp">
<Filter>Vulkan</Filter>
</ClCompile>
<ClCompile Include="MemArenaPosix.cpp" />
<ClCompile Include="MemArenaWin32.cpp" />
<ClCompile Include="MemArenaAndroid.cpp" />
<ClCompile Include="MemArenaDarwin.cpp" />
<ClCompile Include="OSVersion.cpp" />
<ClCompile Include="Vulkan\VulkanDebug.cpp">
<Filter>Vulkan</Filter>
</ClCompile>
<ClCompile Include="ExceptionHandlerSetup.cpp" />
<ClCompile Include="Serialize\Serializer.cpp">
<Filter>Serialize</Filter>
@ -575,6 +632,96 @@
<ClCompile Include="UI\ViewGroup.cpp">
<Filter>UI</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D9\thin3d_d3d9.cpp">
<Filter>GPU\D3D9</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D11\thin3d_d3d11.cpp">
<Filter>GPU\D3D11</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D9\D3DCompilerLoader.cpp">
<Filter>GPU\D3D9</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D9\D3D9ShaderCompiler.cpp">
<Filter>GPU\D3D9</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D9\D3D9StateCache.cpp">
<Filter>GPU\D3D9</Filter>
</ClCompile>
<ClCompile Include="GPU\D3D11\D3D11Loader.cpp">
<Filter>GPU\D3D11</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\DataFormatGL.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\gl3stub.c">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\GLQueueRunner.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\GLRenderManager.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\thin3d_gl.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\thin3d.cpp">
<Filter>GPU</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\thin3d_vulkan.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanQueueRunner.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanRenderManager.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\GLDebugLog.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\GLSLProgram.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="Render\DrawBuffer.cpp">
<Filter>Render</Filter>
</ClCompile>
<ClCompile Include="Render\TextureAtlas.cpp">
<Filter>Render</Filter>
</ClCompile>
<ClCompile Include="GPU\OpenGL\GLFeatures.cpp">
<Filter>GPU\OpenGL</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanContext.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanDebug.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanImage.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanLoader.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="GPU\Vulkan\VulkanMemory.cpp">
<Filter>GPU\Vulkan</Filter>
</ClCompile>
<ClCompile Include="Render\Text\draw_text.cpp">
<Filter>Render\Text</Filter>
</ClCompile>
<ClCompile Include="Render\Text\draw_text_android.cpp">
<Filter>Render\Text</Filter>
</ClCompile>
<ClCompile Include="Render\Text\draw_text_qt.cpp">
<Filter>Render\Text</Filter>
</ClCompile>
<ClCompile Include="Render\Text\draw_text_uwp.cpp">
<Filter>Render\Text</Filter>
</ClCompile>
<ClCompile Include="Render\Text\draw_text_win.cpp">
<Filter>Render\Text</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@ -586,9 +733,6 @@
<Filter Include="GL\GLInterface">
<UniqueIdentifier>{2c723cf4-75b6-406a-90c0-ebb7a13ba476}</UniqueIdentifier>
</Filter>
<Filter Include="Vulkan">
<UniqueIdentifier>{c14d66ef-5f7c-4565-975a-72774e7ccfb9}</UniqueIdentifier>
</Filter>
<Filter Include="Serialize">
<UniqueIdentifier>{7be79ad5-3520-46a1-a370-dce2a943978c}</UniqueIdentifier>
</Filter>
@ -658,6 +802,27 @@
<Filter Include="UI">
<UniqueIdentifier>{6a61d762-e71c-4428-8cef-c7ddda405ba5}</UniqueIdentifier>
</Filter>
<Filter Include="GPU">
<UniqueIdentifier>{3b448d70-d5c6-4732-96f0-29f3e101bfe8}</UniqueIdentifier>
</Filter>
<Filter Include="GPU\D3D9">
<UniqueIdentifier>{a1745de8-f61a-4f11-b715-705a8812862e}</UniqueIdentifier>
</Filter>
<Filter Include="GPU\D3D11">
<UniqueIdentifier>{8241d0c2-78c8-4fc6-9543-69042ec5eb54}</UniqueIdentifier>
</Filter>
<Filter Include="GPU\Vulkan">
<UniqueIdentifier>{e9d7bdf2-c412-4030-a423-671066c4ea51}</UniqueIdentifier>
</Filter>
<Filter Include="GPU\OpenGL">
<UniqueIdentifier>{19ad2070-4f85-48d3-abab-add446ea3a77}</UniqueIdentifier>
</Filter>
<Filter Include="Render">
<UniqueIdentifier>{c9aba118-5c31-4607-9a69-18eca9f92b44}</UniqueIdentifier>
</Filter>
<Filter Include="Render\Text">
<UniqueIdentifier>{9da96cce-c74a-4669-b755-c95defbe1e93}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">

2
Common/Data/Text/WrapText.cpp
View file

@ -1,5 +1,5 @@
#include <cstring>
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Text/WrapText.h"

2
ext/native/thin3d/d3d11_loader.cpp → Common/GPU/D3D11/D3D11Loader.cpp
View file

@ -1,4 +1,4 @@
#include "thin3d/d3d11_loader.h"
#include "Common/GPU/D3D11/D3D11Loader.h"
#if PPSSPP_PLATFORM(UWP)
#error This file should not be compiled for UWP.

0
ext/native/thin3d/d3d11_loader.h → Common/GPU/D3D11/D3D11Loader.h
View file

4
ext/native/thin3d/thin3d_d3d11.cpp → Common/GPU/D3D11/thin3d_d3d11.cpp
View file

@ -1,10 +1,10 @@
#include "ppsspp_config.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#if PPSSPP_PLATFORM(UWP)
#define ptr_D3DCompile D3DCompile
#else
#include "thin3d/d3d11_loader.h"
#include "Common/GPU/D3D11/D3D11Loader.h"
#endif
#include "Common/System/Display.h"

42
ext/native/gfx/d3d9_shader.cpp → Common/GPU/D3D9/D3D9ShaderCompiler.cpp
View file

@ -1,21 +1,13 @@
#ifdef _WIN32
#include "ppsspp_config.h"
#include "d3d9_shader.h"
#include "Common/CommonWindows.h"
#include "Common/GPU/D3D9/D3DCompilerLoader.h"
#include "Common/GPU/D3D9/D3D9ShaderCompiler.h"
#include "Common/CommonFuncs.h"
#include "Common/SysError.h"
#if PPSSPP_API(D3DX9)
#include "thin3d/d3dx9_loader.h"
// They are the same types, just different names.
#define LPD3D_SHADER_MACRO LPD3DXMACRO
#define LPD3DINCLUDE LPD3DXINCLUDE
#define LPD3DBLOB LPD3DXBUFFER
#elif PPSSPP_API(D3D9_D3DCOMPILER)
#include "thin3d/d3d9_d3dcompiler_loader.h"
#endif
struct ID3DXConstantTable;
namespace DX9 {
@ -25,18 +17,6 @@ bool CompilePixelShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DPI
LPD3DBLOB pErrorMsg = nullptr;
// Compile pixel shader.
#if PPSSPP_API(D3DX9)
HRESULT hr = dyn_D3DXCompileShader(code,
(UINT)strlen(code),
nullptr,
nullptr,
"main",
"ps_2_0",
0,
&pShaderCode,
&pErrorMsg,
pShaderTable);
#elif PPSSPP_API(D3D9_D3DCOMPILER)
HRESULT hr = dyn_D3DCompile(code,
(UINT)strlen(code),
nullptr,
@ -48,7 +28,6 @@ bool CompilePixelShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DPI
0,
&pShaderCode,
&pErrorMsg);
#endif
if (pErrorMsg) {
errorMessage = (CHAR *)pErrorMsg->GetBufferPointer();
@ -79,18 +58,6 @@ bool CompileVertexShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DV
LPD3DBLOB pErrorMsg = nullptr;
// Compile pixel shader.
#if PPSSPP_API(D3DX9)
HRESULT hr = dyn_D3DXCompileShader(code,
(UINT)strlen(code),
nullptr,
nullptr,
"main",
"vs_2_0",
0,
&pShaderCode,
&pErrorMsg,
pShaderTable);
#elif PPSSPP_API(D3D9_D3DCOMPILER)
HRESULT hr = dyn_D3DCompile(code,
(UINT)strlen(code),
nullptr,
@ -102,7 +69,6 @@ bool CompileVertexShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DV
0,
&pShaderCode,
&pErrorMsg);
#endif
if (pErrorMsg) {
errorMessage = (CHAR *)pErrorMsg->GetBufferPointer();

3
ext/native/gfx/d3d9_shader.h → Common/GPU/D3D9/D3D9ShaderCompiler.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "Common/CommonWindows.h"
#include <initguid.h>
#include <string>
#include <d3d9.h>
@ -12,4 +13,4 @@ namespace DX9 {
bool CompilePixelShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DPIXELSHADER9 *pShader, ID3DXConstantTable **pShaderTable, std::string &errorMessage);
bool CompileVertexShader(LPDIRECT3DDEVICE9 device, const char *code, LPDIRECT3DVERTEXSHADER9 *pShader, ID3DXConstantTable **pShaderTable, std::string &errorMessage);
} // namespace
} // namespace DX9

3
ext/native/gfx/d3d9_state.cpp → Common/GPU/D3D9/D3D9StateCache.cpp
View file

@ -1,7 +1,6 @@
#ifdef _WIN32
#include "d3d9_state.h"
#include <assert.h>
#include "Common/GPU/D3D9/D3D9StateCache.h"
namespace DX9 {

5
ext/native/gfx/d3d9_state.h → Common/GPU/D3D9/D3D9StateCache.h
View file

@ -1,9 +1,8 @@
#pragma once
#include <functional>
#include <string.h>
#include <cstring>
#include "gfx/d3d9_shader.h"
#include "Common/GPU/D3D9/D3D9ShaderCompiler.h"
namespace DX9 {

22
ext/native/thin3d/d3d9_d3dcompiler_loader.cpp → Common/GPU/D3D9/D3DCompilerLoader.cpp
View file

@ -1,24 +1,23 @@
#include <assert.h>
#include <Windows.h>
#include "ppsspp_config.h"
#include "Common/CommonWindows.h"
#include <D3Dcompiler.h>
#include "thin3d/d3d9_d3dcompiler_loader.h"
#include "Common/Log.h"
#include "Common/GPU/D3D9/D3DCompilerLoader.h"
static HMODULE g_D3DCompileModule;
extern pD3DCompile ptr_D3DCompile;
int d3dcompiler_version = 47;
#define GB_MAKE_STR(s) # s
#define GB_MAKE_STR2(x) GB_MAKE_STR(x)
#define GB_D3D9_D3DCOMPILER_LOADER_CHECK_ENTRY_NULL_PTR(funcname) assert(false && GB_MAKE_STR2(funcname) );
static int d3dcompiler_version = 47;
bool LoadD3DCompilerDynamic() {
g_D3DCompileModule = LoadLibrary(D3DCOMPILER_DLL);
#if PPSSPP_ARCH(X86)
// Workaround for distributing both 32-bit and 64-bit versions of the DLL.
if (!g_D3DCompileModule)
if (!g_D3DCompileModule) {
g_D3DCompileModule = LoadLibrary(L"D3dcompiler_47.x86.dll");
}
#endif
if (!g_D3DCompileModule) {
g_D3DCompileModule = LoadLibrary(L"D3dcompiler_42.dll");
@ -50,13 +49,10 @@ bool UnloadD3DCompiler() {
return true;
}
HRESULT dyn_D3DCompile(LPCSTR pSrcData, UINT SrcDataSize, LPCSTR pFileName, CONST D3D_SHADER_MACRO* pDefines,
LPD3DINCLUDE pInclude, LPCSTR pEntrypoint, LPCSTR pTarget,
UINT Flags1, UINT Flags2, LPD3DBLOB* ppShader, LPD3DBLOB* ppErrorMsgs)
{
if (!g_D3DCompileModule) {
GB_D3D9_D3DCOMPILER_LOADER_CHECK_ENTRY_NULL_PTR(D3DCompile)
}
_assert_(g_D3DCompileModule != nullptr);
return ptr_D3DCompile(pSrcData, SrcDataSize, pFileName, pDefines, pInclude, pEntrypoint, pTarget, Flags1, Flags2, ppShader, ppErrorMsgs);
}

0
ext/native/thin3d/d3d9_d3dcompiler_loader.h → Common/GPU/D3D9/D3DCompilerLoader.h
View file

33
ext/native/thin3d/thin3d_d3d9.cpp → Common/GPU/D3D9/thin3d_d3d9.cpp
View file

@ -13,29 +13,16 @@
#undef new
#endif
#if PPSSPP_API(D3DX9)
#include <d3dx9.h>
#ifdef USE_CRT_DBG
#define new DBG_NEW
#endif
#include "thin3d/d3dx9_loader.h"
// They are the same types, just different names.
#define LPD3D_SHADER_MACRO LPD3DXMACRO
#define LPD3DINCLUDE LPD3DXINCLUDE
#define LPD3DBLOB LPD3DXBUFFER
#elif PPSSPP_API(D3D9_D3DCOMPILER)
#include <D3Dcompiler.h>
#include "thin3d/d3d9_d3dcompiler_loader.h"
#endif
#include "Common/GPU/D3D9/D3DCompilerLoader.h"
#ifndef D3DXERR_INVALIDDATA
#define D3DXERR_INVALIDDATA 0x88760b59
#endif
#include "Common/Math/lin/matrix4x4.h"
#include "thin3d/thin3d.h"
#include "gfx/d3d9_state.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/D3D9/D3D9StateCache.h"
#include "Common/Log.h"
@ -1045,11 +1032,7 @@ bool D3D9ShaderModule::Compile(LPDIRECT3DDEVICE9 device, const uint8_t *data, si
LPD3DBLOB errorBuffer = nullptr;
const char *source = (const char *)data;
auto compile = [&](const char *profile) -> HRESULT {
#if PPSSPP_API(D3DX9)
return dyn_D3DXCompileShader(source, (UINT)strlen(source), defines, includes, "main", profile, flags, &codeBuffer, &errorBuffer, nullptr);
#elif PPSSPP_API(D3D9_D3DCOMPILER)
return dyn_D3DCompile(source, (UINT)strlen(source), nullptr, defines, includes, "main", profile, 0, 0, &codeBuffer, &errorBuffer);
#endif
};
HRESULT hr = compile(stage_ == ShaderStage::FRAGMENT ? "ps_2_0" : "vs_2_0");
if (FAILED(hr) && hr == D3DXERR_INVALIDDATA) {
@ -1269,19 +1252,11 @@ void D3D9Context::HandleEvent(Event ev, int width, int height, void *param1, voi
}
DrawContext *T3DCreateDX9Context(IDirect3D9 *d3d, IDirect3D9Ex *d3dEx, int adapterId, IDirect3DDevice9 *device, IDirect3DDevice9Ex *deviceEx) {
#if PPSSPP_API(D3DX9)
int d3dx_ver = LoadD3DX9Dynamic();
if (!d3dx_ver) {
ERROR_LOG(G3D, "Failed to load D3DX9!");
return NULL;
}
#elif PPSSPP_API(D3D9_D3DCOMPILER)
bool result = LoadD3DCompilerDynamic();
if (!result) {
ERROR_LOG(G3D, "Failed to load D3DCompiler!");
return NULL;
return nullptr;
}
#endif
return new D3D9Context(d3d, d3dEx, adapterId, device, deviceEx);
}

0
ext/native/thin3d/DataFormat.h → Common/GPU/DataFormat.h
View file

2
ext/native/thin3d/DataFormatGL.cpp → Common/GPU/OpenGL/DataFormatGL.cpp
View file

@ -1,4 +1,4 @@
#include "thin3d/DataFormatGL.h"
#include "Common/GPU/OpenGL/DataFormatGL.h"
#include "Common/Log.h"
namespace Draw {

4
ext/native/thin3d/DataFormatGL.h → Common/GPU/OpenGL/DataFormatGL.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "gfx/gl_common.h"
#include "thin3d/DataFormat.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/DataFormat.h"
namespace Draw {

2
ext/native/gfx/gl_common.h → Common/GPU/OpenGL/GLCommon.h
View file

@ -24,7 +24,7 @@ typedef char GLchar;
#ifdef USING_GLES2
// Support OpenGL ES 3.0
// This uses the "DYNAMIC" approach from the gles3jni NDK sample.
#include "../gfx_es2/gl3stub.h"
#include "Common/GPU/OpenGL/gl3stub.h"
#endif

4
ext/native/gfx/gl_debug_log.cpp → Common/GPU/OpenGL/GLDebugLog.cpp
View file

@ -1,7 +1,7 @@
#include <cstdlib>
#include "gfx/gl_common.h"
#include "gfx/gl_debug_log.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/OpenGL/GLDebugLog.h"
#include "Common/Log.h"

0
ext/native/gfx/gl_debug_log.h → Common/GPU/OpenGL/GLDebugLog.h
View file

4
ext/native/gfx_es2/gpu_features.cpp → Common/GPU/OpenGL/GLFeatures.cpp
View file

@ -6,14 +6,14 @@
#include "Common/StringUtils.h"
#if PPSSPP_API(ANY_GL)
#include "gfx/gl_common.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#if defined(_WIN32)
#include "GL/wglew.h"
#endif
#endif
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/Log.h"

6
ext/native/gfx_es2/gpu_features.h → Common/GPU/OpenGL/GLFeatures.h
View file

@ -11,9 +11,9 @@ enum {
GPU_VENDOR_AMD = 2,
GPU_VENDOR_INTEL = 3,
GPU_VENDOR_ARM = 4, // Mali
GPU_VENDOR_IMGTEC = 5,
GPU_VENDOR_QUALCOMM = 6,
GPU_VENDOR_BROADCOM = 7,
GPU_VENDOR_IMGTEC = 5, // PowerVR
GPU_VENDOR_QUALCOMM = 6, // Adreno
GPU_VENDOR_BROADCOM = 7, // Raspberry PI etc
GPU_VENDOR_VIVANTE = 8,
GPU_VENDOR_UNKNOWN = 0,
};

8
ext/native/thin3d/GLQueueRunner.cpp → Common/GPU/OpenGL/GLQueueRunner.cpp
View file

@ -1,9 +1,9 @@
#include <algorithm>
#include "gfx/gl_common.h"
#include "gfx/gl_debug_log.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/DataFormatGL.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/OpenGL/GLDebugLog.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/GPU/OpenGL/DataFormatGL.h"
#include "Common/Math/math_util.h"
#include "Common/Log.h"

4
ext/native/thin3d/GLQueueRunner.h → Common/GPU/OpenGL/GLQueueRunner.h
View file

@ -4,8 +4,8 @@
#include <vector>
#include <unordered_map>
#include "gfx/gl_common.h"
#include "thin3d/DataFormat.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/DataFormat.h"
#include "Common/Data/Collections/TinySet.h"
struct GLRViewport {

4
ext/native/thin3d/GLRenderManager.cpp → Common/GPU/OpenGL/GLRenderManager.cpp
View file

@ -1,6 +1,6 @@
#include "GLRenderManager.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/GPU/thin3d.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"

2
ext/native/thin3d/GLRenderManager.h → Common/GPU/OpenGL/GLRenderManager.h
View file

@ -9,7 +9,7 @@
#include <mutex>
#include <condition_variable>
#include "gfx/gl_common.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "Common/Log.h"
#include "GLQueueRunner.h"

2
ext/native/gfx_es2/glsl_program.cpp → Common/GPU/OpenGL/GLSLProgram.cpp
View file

@ -6,7 +6,7 @@
#include "Common/File/VFS/VFS.h"
#include "Common/File/FileUtil.h"
#include "glsl_program.h"
#include "Common/GPU/OpenGL/GLSLProgram.h"
#include "Common/Log.h"

2
ext/native/gfx_es2/glsl_program.h → Common/GPU/OpenGL/GLSLProgram.h
View file

@ -7,7 +7,7 @@
#include <string>
#include <time.h>
#include "gfx/gl_common.h"
#include "Common/GPU/OpenGL/GLCommon.h"
// Represent a compiled and linked vshader/fshader pair.
// A just-constructed object is valid but cannot be used as a shader program, meaning that

3
ext/native/gfx_es2/gl3stub.c → Common/GPU/OpenGL/gl3stub.c
View file

@ -15,7 +15,8 @@
*/
#include "ppsspp_config.h"
#include "../gfx/gl_common.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#if defined(USING_GLES2)
#if !PPSSPP_PLATFORM(IOS)

0
ext/native/gfx_es2/gl3stub.h → Common/GPU/OpenGL/gl3stub.h
View file

14
ext/native/thin3d/thin3d_gl.cpp → Common/GPU/OpenGL/thin3d_gl.cpp
View file

@ -1,4 +1,4 @@
#include <stdio.h>
#include <cstdio>
#include <vector>
#include <string>
#include <algorithm>
@ -7,13 +7,13 @@
#include "Common/Data/Convert/SmallDataConvert.h"
#include "Common/Math/math_util.h"
#include "Common/Math/lin/matrix4x4.h"
#include "thin3d/thin3d.h"
#include "thin3d/DataFormatGL.h"
#include "gfx/gl_common.h"
#include "gfx/gl_debug_log.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/OpenGL/DataFormatGL.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/OpenGL/GLDebugLog.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "thin3d/GLRenderManager.h"
#include "Common/GPU/OpenGL/GLRenderManager.h"
// #define DEBUG_READ_PIXELS 1

4
Common/Vulkan/VulkanContext.cpp → Common/GPU/Vulkan/VulkanContext.cpp
View file

@ -7,8 +7,8 @@
#include "Common/System/Display.h"
#include "Common/Log.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/Vulkan/VulkanDebug.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanDebug.h"
#include "GPU/Common/ShaderCommon.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"

4
Common/Vulkan/VulkanContext.h → Common/GPU/Vulkan/VulkanContext.h
View file

@ -6,8 +6,8 @@
#include <utility>
#include "Common/Log.h"
#include "Common/Vulkan/VulkanLoader.h"
#include "Common/Vulkan/VulkanDebug.h"
#include "Common/GPU/Vulkan/VulkanLoader.h"
#include "Common/GPU/Vulkan/VulkanDebug.h"
enum {
VULKAN_FLAG_VALIDATE = 1,

4
Common/Vulkan/VulkanDebug.cpp → Common/GPU/Vulkan/VulkanDebug.cpp
View file

@ -19,8 +19,8 @@
#include <sstream>
#include "Common/Log.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/Vulkan/VulkanDebug.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanDebug.h"
VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDebugUtilsCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,

2
Common/Vulkan/VulkanDebug.h → Common/GPU/Vulkan/VulkanDebug.h
View file

@ -17,7 +17,7 @@
#pragma once
#include "Common/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
struct VulkanLogOptions {
bool breakOnWarning;

4
Common/Vulkan/VulkanImage.cpp → Common/GPU/Vulkan/VulkanImage.cpp
View file

@ -1,5 +1,5 @@
#include "Common/Vulkan/VulkanImage.h"
#include "Common/Vulkan/VulkanMemory.h"
#include "Common/GPU/Vulkan/VulkanImage.h"
#include "Common/GPU/Vulkan/VulkanMemory.h"
#include "Common/Log.h"
void VulkanTexture::Wipe() {

2
Common/Vulkan/VulkanImage.h → Common/GPU/Vulkan/VulkanImage.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Common/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
class VulkanDeviceAllocator;

2
Common/Vulkan/VulkanLoader.cpp → Common/GPU/Vulkan/VulkanLoader.cpp
View file

@ -15,7 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/Vulkan/VulkanLoader.h"
#include "Common/GPU/Vulkan/VulkanLoader.h"
#include <vector>
#include <string>
#include <cstring>

0
Common/Vulkan/VulkanLoader.h → Common/GPU/Vulkan/VulkanLoader.h
View file

2
Common/Vulkan/VulkanMemory.cpp → Common/GPU/Vulkan/VulkanMemory.cpp
View file

@ -22,7 +22,7 @@
#include "Common/Log.h"
#include "Common/TimeUtil.h"
#include "Common/Vulkan/VulkanMemory.h"
#include "Common/GPU/Vulkan/VulkanMemory.h"
VulkanPushBuffer::VulkanPushBuffer(VulkanContext *vulkan, size_t size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memoryPropertyMask)
: vulkan_(vulkan), memoryPropertyMask_(memoryPropertyMask), size_(size), usage_(usage) {

2
Common/Vulkan/VulkanMemory.h → Common/GPU/Vulkan/VulkanMemory.h
View file

@ -4,7 +4,7 @@
#include <unordered_map>
#include "Common/Log.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
// VulkanMemory
//

2
ext/native/thin3d/VulkanQueueRunner.cpp → Common/GPU/Vulkan/VulkanQueueRunner.cpp
View file

@ -1,6 +1,6 @@
#include <unordered_map>
#include "DataFormat.h"
#include "Common/GPU/DataFormat.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"
#include "VulkanQueueRunner.h"

4
ext/native/thin3d/VulkanQueueRunner.h → Common/GPU/Vulkan/VulkanQueueRunner.h
View file

@ -3,10 +3,10 @@
#include <cstdint>
#include "Common/Hashmaps.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "thin3d/DataFormat.h"
#include "Common/Data/Collections/TinySet.h"
#include "Common/GPU/DataFormat.h"
class VKRFramebuffer;
struct VKRImage;

4
ext/native/thin3d/VulkanRenderManager.cpp → Common/GPU/Vulkan/VulkanRenderManager.cpp
View file

@ -6,8 +6,8 @@
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanContext.h"
#include "thin3d/VulkanRenderManager.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
#include "Common/Thread/ThreadUtil.h"
#if 0 // def _DEBUG

6
ext/native/thin3d/VulkanRenderManager.h → Common/GPU/Vulkan/VulkanRenderManager.h
View file

@ -11,11 +11,11 @@
#include <thread>
#include "Common/System/Display.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "Common/Math/math_util.h"
#include "thin3d/DataFormat.h"
#include "thin3d/VulkanQueueRunner.h"
#include "Common/GPU/DataFormat.h"
#include "Common/GPU/Vulkan/VulkanQueueRunner.h"
// Simple independent framebuffer image. Gets its own allocation, we don't have that many framebuffers so it's fine
// to let them have individual non-pooled allocations. Until it's not fine. We'll see.

12
ext/native/thin3d/thin3d_vulkan.cpp → Common/GPU/Vulkan/thin3d_vulkan.cpp
View file

@ -23,14 +23,14 @@
#include "Common/System/Display.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "thin3d/thin3d.h"
#include "thin3d/VulkanRenderManager.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/Vulkan/VulkanImage.h"
#include "Common/Vulkan/VulkanMemory.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/GPU/Vulkan/VulkanImage.h"
#include "Common/GPU/Vulkan/VulkanMemory.h"
#include "Core/Config.h"
@ -41,7 +41,7 @@
//
// Vertex data lives in a separate namespace (location = 0, 1, etc)
#include "Common/Vulkan/VulkanLoader.h"
#include "Common/GPU/Vulkan/VulkanLoader.h"
namespace Draw {

7
ext/native/thin3d/thin3d.cpp → Common/GPU/thin3d.cpp
View file

@ -3,10 +3,9 @@
#include <cstdint>
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Log.h"
#include "Common/ColorConv.h"
#include "Core/Reporting.h"
namespace Draw {
@ -450,7 +449,7 @@ void ConvertFromRGBA8888(uint8_t *dst, const uint8_t *src, uint32_t dstStride, u
case Draw::DataFormat::R8G8B8A8_UNORM:
case Draw::DataFormat::UNDEFINED:
default:
WARN_LOG_REPORT_ONCE(convFromRGBA, G3D, "Unable to convert from format: %d", (int)format);
WARN_LOG(G3D, "Unable to convert from format: %d", (int)format);
break;
}
}
@ -492,7 +491,7 @@ void ConvertFromBGRA8888(uint8_t *dst, const uint8_t *src, uint32_t dstStride, u
dst += dstStride * 3;
}
} else {
WARN_LOG_REPORT_ONCE(convFromBGRA, G3D, "Unable to convert from format to BGRA: %d", (int)format);
WARN_LOG(G3D, "Unable to convert from format to BGRA: %d", (int)format);
}
}

0
ext/native/thin3d/thin3d.h → Common/GPU/thin3d.h
View file

2
ext/native/thin3d/thin3d_create.h → Common/GPU/thin3d_create.h
View file

@ -2,7 +2,7 @@
#include <string>
#include <vector>
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
// Separated this stuff into its own file so we don't get Windows.h included if all we want is the thin3d declarations.

2
Common/GraphicsContext.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
// Init is done differently on each platform, and done close to the creation, so it's
// expected to be implemented by subclasses.

2
Common/Profiler/Profiler.cpp
View file

@ -9,7 +9,7 @@
#include "ppsspp_config.h"
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/TimeUtil.h"
#include "Common/Profiler/Profiler.h"

7
ext/native/gfx_es2/draw_buffer.cpp → Common/Render/DrawBuffer.cpp
View file

@ -5,10 +5,9 @@
#include "Common/System/Display.h"
#include "Common/Math/math_util.h"
#include "gfx/texture_atlas.h"
#include "gfx/gl_debug_log.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx_es2/draw_text.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Text/WrapText.h"

4
ext/native/gfx_es2/draw_buffer.h → Common/Render/DrawBuffer.h
View file

@ -6,10 +6,10 @@
#include <cstdint>
#include "Common/Data/Color/RGBAUtil.h"
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Math/geom2d.h"
#include "Common/Math/lin/matrix4x4.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
struct Atlas;

15
ext/native/gfx_es2/draw_text.cpp → Common/Render/Text/draw_text.cpp
View file

@ -1,13 +1,16 @@
#include "ppsspp_config.h"
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Hash/Hash.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Data/Encoding/Utf8.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/draw_text_win.h"
#include "gfx_es2/draw_text_uwp.h"
#include "gfx_es2/draw_text_qt.h"
#include "gfx_es2/draw_text_android.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Render/Text/draw_text_win.h"
#include "Common/Render/Text/draw_text_uwp.h"
#include "Common/Render/Text/draw_text_qt.h"
#include "Common/Render/Text/draw_text_android.h"
TextDrawer::TextDrawer(Draw::DrawContext *draw) : draw_(draw) {
// These probably shouldn't be state.

2
ext/native/gfx_es2/draw_text.h → Common/Render/Text/draw_text.h
View file

@ -13,8 +13,8 @@
#include <memory>
#include <cstdint>
#include "gfx_es2/draw_buffer.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Render/DrawBuffer.h"
namespace Draw {
class DrawContext;

11
ext/native/gfx_es2/draw_text_android.cpp → Common/Render/Text/draw_text_android.cpp
View file

@ -1,16 +1,15 @@
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Hash/Hash.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Data/Encoding/Utf8.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/draw_text_android.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Render/Text/draw_text_android.h"
#include "android/jni/app-android.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#if PPSSPP_PLATFORM(ANDROID) && !defined(__LIBRETRO__)
#include <jni.h>

2
ext/native/gfx_es2/draw_text_android.h → Common/Render/Text/draw_text_android.h
View file

@ -3,7 +3,7 @@
#include "ppsspp_config.h"
#include <map>
#include "gfx_es2/draw_text.h"
#include "Common/Render/Text/draw_text.h"
#if PPSSPP_PLATFORM(ANDROID)

7
ext/native/gfx_es2/draw_text_qt.cpp → Common/Render/Text/draw_text_qt.cpp
View file

@ -1,15 +1,16 @@
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Hash/Hash.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Data/Encoding/Utf8.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/draw_text_qt.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Render/Text/draw_text_qt.h"
#include "Common/Log.h"
#if defined(USING_QT_UI)
#include <QtGui/QFont>
#include <QtGui/QImage>
#include <QtGui/QPainter>
#include <QtGui/QFontMetrics>

4
ext/native/gfx_es2/draw_text_qt.h → Common/Render/Text/draw_text_qt.h
View file

@ -3,11 +3,11 @@
#include "ppsspp_config.h"
#include <map>
#include "gfx_es2/draw_text.h"
#include "Common/Render/Text/draw_text.h"
#if defined(USING_QT_UI)
#include <QtGui/QFont>
class QFont;
class TextDrawerQt : public TextDrawer {
public:

6
ext/native/gfx_es2/draw_text_uwp.cpp → Common/Render/Text/draw_text_uwp.cpp
View file

@ -1,10 +1,10 @@
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Hash/Hash.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Data/Encoding/Utf8.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/draw_text_uwp.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Render/Text/draw_text_uwp.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"

2
ext/native/gfx_es2/draw_text_uwp.h → Common/Render/Text/draw_text_uwp.h
View file

@ -3,7 +3,7 @@
#include "ppsspp_config.h"
#include <map>
#include "gfx_es2/draw_text.h"
#include "Common/Render/Text/draw_text.h"
#if PPSSPP_PLATFORM(UWP)

6
ext/native/gfx_es2/draw_text_win.cpp → Common/Render/Text/draw_text_win.cpp
View file

@ -1,10 +1,10 @@
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Hash/Hash.h"
#include "Common/Data/Text/WrapText.h"
#include "Common/Data/Encoding/Utf8.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/draw_text_win.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Render/Text/draw_text_win.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"

2
ext/native/gfx_es2/draw_text_win.h → Common/Render/Text/draw_text_win.h
View file

@ -3,7 +3,7 @@
#include "ppsspp_config.h"
#include <map>
#include "gfx_es2/draw_text.h"
#include "Common/Render/Text/draw_text.h"
#if defined(_WIN32) && !defined(USING_QT_UI) && !PPSSPP_PLATFORM(UWP)

2
ext/native/gfx/texture_atlas.cpp → Common/Render/TextureAtlas.cpp
View file

@ -1,7 +1,7 @@
#include <cstring>
#include <cstdint>
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
class ByteReader {
public:

0
ext/native/gfx/texture_atlas.h → Common/Render/TextureAtlas.h
View file

4
Common/UI/Context.cpp
View file

@ -7,8 +7,8 @@
#include "Common/UI/UI.h"
#include "Common/UI/View.h"
#include "Common/UI/Context.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx_es2/draw_text.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Log.h"
#include "UI/TextureUtil.h"

2
Common/UI/Context.h
View file

@ -6,7 +6,7 @@
#include "Common/Math/geom2d.h"
#include "Common/Math/lin/vec3.h"
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
// Everything you need to draw a UI collected into a single unit that can be passed around.
// Everything forward declared so this header is safe everywhere.

4
Common/UI/UI.cpp
View file

@ -8,8 +8,8 @@
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/UI/UI.h"
#include "Common/UI/Context.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Render/DrawBuffer.h"
// TODO: UI should probably not own these.
DrawBuffer ui_draw2d;

2
Common/UI/UI.h
View file

@ -26,7 +26,7 @@
#include <string>
#include <vector>
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Input/InputState.h"
class UIContext;

2
Common/UI/UIScreen.cpp
View file

@ -11,7 +11,7 @@
#include "Common/UI/Screen.h"
#include "Common/UI/Root.h"
#include "Common/Data/Text/I18n.h"
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"

6
Common/UI/View.cpp
View file

@ -3,15 +3,15 @@
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx/texture_atlas.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/UI/UI.h"
#include "Common/UI/View.h"
#include "Common/UI/Context.h"
#include "Common/UI/Tween.h"
#include "Common/UI/Root.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/System/System.h"
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"

2
Common/UI/View.h
View file

@ -15,7 +15,7 @@
#include <string>
#include <vector>
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Math/math_util.h"
#include "Common/Math/geom2d.h"

2
Common/UI/ViewGroup.cpp
View file

@ -10,7 +10,7 @@
#include "Common/UI/Root.h"
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "gfx_es2/draw_buffer.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"

4
Core/Config.cpp
View file

@ -24,7 +24,7 @@
#include "ppsspp_config.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/Net/HTTPClient.h"
#include "Common/Net/URL.h"
@ -40,7 +40,7 @@
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanLoader.h"
#include "Common/GPU/Vulkan/VulkanLoader.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/Loaders.h"

21
Core/Core.vcxproj
View file

@ -138,7 +138,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -161,7 +161,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -185,7 +185,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -209,7 +209,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -237,7 +237,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
@ -268,7 +268,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<BufferSecurityCheck>false</BufferSecurityCheck>
@ -299,7 +299,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<BufferSecurityCheck>false</BufferSecurityCheck>
@ -330,7 +330,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<BufferSecurityCheck>false</BufferSecurityCheck>
@ -1287,9 +1287,6 @@
<ProjectReference Include="..\GPU\GPU.vcxproj">
<Project>{457f45d2-556f-47bc-a31d-aff0d15beaed}</Project>
</ProjectReference>
<ProjectReference Include="..\ext\native\native.vcxproj">
<Project>{C4DF647E-80EA-4111-A0A8-218B1B711E18}</Project>
</ProjectReference>
<ProjectReference Include="..\ext\zlib\zlib.vcxproj">
<Project>{f761046e-6c38-4428-a5f1-38391a37bb34}</Project>
</ProjectReference>
@ -1301,4 +1298,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
Core/Dialog/PSPDialog.h
View file

@ -17,7 +17,7 @@
#pragma once
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"

5
Core/HLE/sceDisplay.cpp
View file

@ -26,8 +26,6 @@
#include <sys/time.h>
#endif
#include "gfx_es2/gpu_features.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Profiler/Profiler.h"
#include "Common/System/System.h"
@ -315,7 +313,8 @@ void __DisplayDoState(PointerWrap &p) {
if (s < 2) {
// This shouldn't have been savestated anyway, but it was.
// It's unlikely to overlap with the first value in gpuStats.
p.ExpectVoid(&gl_extensions.gpuVendor, sizeof(gl_extensions.gpuVendor));
int gpuVendorTemp = 0;
p.ExpectVoid(&gpuVendorTemp, sizeof(gpuVendorTemp));
}
if (s < 6) {
GPUStatistics_v0 oldStats;

4
Core/Util/PPGeDraw.cpp
View file

@ -17,8 +17,8 @@
#include <algorithm>
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_text.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/File/VFS/VFS.h"

2
Core/Util/PPGeDraw.h
View file

@ -20,7 +20,7 @@
#include <vector>
#include <string>
#include "gfx/texture_atlas.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/CommonTypes.h"

2
GPU/Common/DepalettizeShaderCommon.cpp
View file

@ -17,7 +17,7 @@
#include <cstdio>
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "GPU/Common/ShaderId.h"
#include "GPU/Common/ShaderCommon.h"

5
GPU/Common/FramebufferManagerCommon.cpp
View file

@ -19,9 +19,8 @@
#include <sstream>
#include <cmath>
#include "ext/native/thin3d/thin3d.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/Data/Text/I18n.h"
#include "Common/ColorConv.h"
#include "Common/Common.h"

2
GPU/Common/FramebufferManagerCommon.h
View file

@ -27,7 +27,7 @@
#include "GPU/GPU.h"
#include "GPU/ge_constants.h"
#include "GPU/GPUInterface.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
enum {
FB_USAGE_DISPLAYED_FRAMEBUFFER = 1,

2
GPU/Common/PostShader.cpp
View file

@ -26,7 +26,7 @@
#include "Common/File/FileUtil.h"
#include "Common/File/DirListing.h"
#include "Common/File/VFS/VFS.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"

2
GPU/Common/PresentationCommon.cpp
View file

@ -19,7 +19,7 @@
#include <set>
#include <cstdint>
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"

2
GPU/Common/ShaderId.cpp
View file

@ -1,7 +1,7 @@
#include <string>
#include <sstream>
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"

4
GPU/Common/ShaderTranslation.cpp
View file

@ -39,8 +39,8 @@
#include "GPU/Common/ShaderTranslation.h"
#include "ext/glslang/SPIRV/GlslangToSpv.h"
#include "thin3d/thin3d.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/thin3d.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "ext/SPIRV-Cross/spirv.hpp"
#include "ext/SPIRV-Cross/spirv_common.hpp"

2
GPU/Common/ShaderTranslation.h
View file

@ -19,7 +19,7 @@
#include <string>
#include "GPU/Common/ShaderCommon.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
struct TranslatedShaderMetadata {

2
GPU/Common/SoftwareTransformCommon.cpp
View file

@ -18,7 +18,7 @@
#include <algorithm>
#include <cmath>
#include "Common/Math/math_util.h"
#include "gfx_es2/gpu_features.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Core/Config.h"
#include "GPU/GPUState.h"

2
GPU/D3D11/D3D11Util.cpp
View file

@ -10,7 +10,7 @@
#if PPSSPP_PLATFORM(UWP)
#define ptr_D3DCompile D3DCompile
#else
#include "thin3d/d3d11_loader.h"
#include "Common/GPU/D3D11/D3D11Loader.h"
#endif
#include "Common/CommonFuncs.h"

2
GPU/D3D11/DepalettizeShaderD3D11.h
View file

@ -22,7 +22,7 @@
#include "Common/CommonTypes.h"
#include "GPU/ge_constants.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "GPU/Common/DepalettizeShaderCommon.h"
class DepalShaderD3D11 {

2
GPU/D3D11/FramebufferManagerD3D11.cpp
View file

@ -21,7 +21,7 @@
#include "Common/System/Display.h"
#include "Common/Math/lin/matrix4x4.h"
#include "ext/native/thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Common.h"
#include "Common/ColorConv.h"

2
GPU/D3D11/FramebufferManagerD3D11.h
View file

@ -25,7 +25,7 @@
#include "GPU/GPUCommon.h"
#include "GPU/Common/FramebufferManagerCommon.h"
#include "ext/native/thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
class TextureCacheD3D11;
class DrawEngineD3D11;

2
GPU/D3D11/ShaderManagerD3D11.cpp
View file

@ -25,7 +25,7 @@
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Math/math_util.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Log.h"
#include "Common/Common.h"

2
GPU/D3D11/StateMappingD3D11.h
View file

@ -3,7 +3,7 @@
#include <cstdint>
#include <d3d11.h>
#include "thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
// TODO: Do this more progressively. No need to compute the entire state if the entire state hasn't changed.

2
GPU/D3D11/StencilBufferD3D11.cpp
View file

@ -17,7 +17,7 @@
#include <d3d11.h>
#include "ext/native/thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/Log.h"
#include "Core/Reporting.h"

4
GPU/Directx9/DepalettizeShaderDX9.cpp
View file

@ -18,14 +18,14 @@
#include <map>
#include <d3d9.h>
#include "thin3d/thin3d.h"
#include "Common/GPU/D3D9/D3D9ShaderCompiler.h"
#include "Common/GPU/thin3d.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Core/Reporting.h"
#include "GPU/Directx9/TextureCacheDX9.h"
#include "GPU/Directx9/DepalettizeShaderDX9.h"
#include "GPU/Common/DepalettizeShaderCommon.h"
#include "gfx/d3d9_shader.h"
namespace DX9 {

2
GPU/Directx9/DrawEngineDX9.cpp
View file

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

6
GPU/Directx9/FramebufferManagerDX9.cpp
View file

@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/Math/lin/matrix4x4.h"
#include "ext/native/thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include "Common/ColorConv.h"
#include "Core/MemMap.h"
@ -28,7 +28,7 @@
#include "GPU/GPUState.h"
#include "GPU/Debugger/Stepping.h"
#include "gfx/d3d9_state.h"
#include "Common/GPU/D3D9/D3D9StateCache.h"
#include "GPU/Common/FramebufferManagerCommon.h"
#include "GPU/Common/PresentationCommon.h"
#include "GPU/Common/ShaderTranslation.h"
@ -38,7 +38,7 @@
#include "GPU/Directx9/TextureCacheDX9.h"
#include "GPU/Directx9/DrawEngineDX9.h"
#include "ext/native/thin3d/thin3d.h"
#include "Common/GPU/thin3d.h"
#include <algorithm>

2
GPU/Directx9/GPU_DX9.cpp
View file

@ -31,7 +31,7 @@
#include "Core/Reporting.h"
#include "Core/System.h"
#include "gfx/d3d9_state.h"
#include "Common/GPU/D3D9/D3D9StateCache.h"
#include "GPU/GPUState.h"
#include "GPU/ge_constants.h"

4
GPU/Directx9/ShaderManagerDX9.cpp
View file

@ -22,12 +22,12 @@
#include <cmath>
#include <map>
#include "gfx/d3d9_shader.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Math/math_util.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "thin3d/thin3d.h"
#include "Common/GPU/D3D9/D3D9ShaderCompiler.h"
#include "Common/GPU/thin3d.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Common.h"

Some files were not shown because too many files have changed in this diff Show more