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

Common: Move ColorConv to a more appropriate place.

Browse source
This commit is contained in:
Unknown W. Brackets 2021-05-01 07:15:04 -07:00
parent 75d5c4367e
commit 8a8328c431
40 changed files with 79 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -400,7 +400,7 @@ set(CommonARM
Common/ArmCPUDetect.cpp
Common/ArmEmitter.h
Common/ArmEmitter.cpp
Common/ColorConvNEON.cpp
Common/Data/Convert/ColorConvNEON.cpp
)
source_group(ARM FILES ${CommonARM})
@ -460,6 +460,8 @@ add_library(Common STATIC
Common/Data/Collections/ThreadSafeList.h
Common/Data/Color/RGBAUtil.cpp
Common/Data/Color/RGBAUtil.h
Common/Data/Convert/ColorConv.cpp
Common/Data/Convert/ColorConv.h
Common/Data/Convert/SmallDataConvert.cpp
Common/Data/Convert/SmallDataConvert.h
Common/Data/Encoding/Base64.cpp
@ -624,8 +626,6 @@ add_library(Common STATIC
Common/Buffer.h
Common/Buffer.cpp
Common/CodeBlock.h
Common/ColorConv.cpp
Common/ColorConv.h
Common/Common.h
Common/CommonFuncs.h
Common/CommonTypes.h

8
Common/Common.vcxproj
View file

@ -469,12 +469,12 @@
<ClInclude Include="Render\Text\draw_text_win.h" />
<ClInclude Include="Serialize\SerializeDeque.h" />
<ClInclude Include="Serialize\SerializeFuncs.h" />
<ClInclude Include="ColorConvNEON.h" />
<ClInclude Include="Data\Convert\ColorConvNEON.h" />
<ClInclude Include="Serialize\SerializeList.h" />
<ClInclude Include="Serialize\SerializeMap.h" />
<ClInclude Include="Serialize\Serializer.h" />
<ClInclude Include="CodeBlock.h" />
<ClInclude Include="ColorConv.h" />
<ClInclude Include="Data\Convert\ColorConv.h" />
<ClInclude Include="Common.h" />
<ClInclude Include="CommonFuncs.h" />
<ClInclude Include="CommonTypes.h" />
@ -705,7 +705,7 @@
</ClCompile>
<ClCompile Include="ArmEmitter.cpp" />
<ClCompile Include="Buffer.cpp" />
<ClCompile Include="ColorConvNEON.cpp">
<ClCompile Include="Data\Convert\ColorConvNEON.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@ -791,7 +791,7 @@
<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="Data\Convert\ColorConv.cpp" />
<ClCompile Include="ConsoleListener.cpp" />
<ClCompile Include="CPUDetect.cpp" />
<ClCompile Include="MipsCPUDetect.cpp">

16
Common/Common.vcxproj.filters
View file

@ -32,8 +32,6 @@
<ClInclude Include="ArmCommon.h" />
<ClInclude Include="BitSet.h" />
<ClInclude Include="CodeBlock.h" />
<ClInclude Include="ColorConv.h" />
<ClInclude Include="ColorConvNEON.h" />
<ClInclude Include="GL\GLInterface\EGL.h">
<Filter>GL\GLInterface</Filter>
</ClInclude>
@ -384,6 +382,12 @@
<ClInclude Include="GPU\ShaderTranslation.h">
<Filter>GPU</Filter>
</ClInclude>
<ClInclude Include="Data\Convert\ColorConvNEON.h">
<Filter>Data\Convert</Filter>
</ClInclude>
<ClInclude Include="Data\Convert\ColorConv.h">
<Filter>Data\Convert</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -410,8 +414,6 @@
</ClCompile>
<ClCompile Include="MipsEmitter.cpp" />
<ClCompile Include="Arm64Emitter.cpp" />
<ClCompile Include="ColorConv.cpp" />
<ClCompile Include="ColorConvNEON.cpp" />
<ClCompile Include="GL\GLInterface\EGL.cpp">
<Filter>GL\GLInterface</Filter>
</ClCompile>
@ -740,6 +742,12 @@
<ClCompile Include="GPU\ShaderTranslation.cpp">
<Filter>GPU</Filter>
</ClCompile>
<ClCompile Include="Data\Convert\ColorConvNEON.cpp">
<Filter>Data\Convert</Filter>
</ClCompile>
<ClCompile Include="Data\Convert\ColorConv.cpp">
<Filter>Data\Convert</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">

8
Common/ColorConv.cpp → Common/Data/Convert/ColorConv.cpp
View file

@ -16,12 +16,12 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "ppsspp_config.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "ColorConv.h"
// NEON is in a separate file so that it can be compiled with a runtime check.
#include "ColorConvNEON.h"
#include "Common.h"
#include "CPUDetect.h"
#include "Common/Data/Convert/ColorConvNEON.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#ifdef _M_SSE
#include <emmintrin.h>

4
Common/ColorConv.h → Common/Data/Convert/ColorConv.h
View file

@ -18,8 +18,8 @@
#pragma once
#include "ppsspp_config.h"
#include "CommonTypes.h"
#include "ColorConvNEON.h"
#include "Common/CommonTypes.h"
#include "Common/Data/Convert/ColorConvNEON.h"
void SetupColorConv();

6
Common/ColorConvNEON.cpp → Common/Data/Convert/ColorConvNEON.cpp
View file

@ -23,9 +23,9 @@
#else
#include <arm_neon.h>
#endif
#include "ColorConvNEON.h"
#include "Common.h"
#include "CPUDetect.h"
#include "Common/Data/Convert/ColorConvNEON.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
// TODO: More NEON color conversion funcs.

2
Common/ColorConvNEON.h → Common/Data/Convert/ColorConvNEON.h
View file

@ -17,7 +17,7 @@
#pragma once
#include "ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, u32 numPixels);
void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, u32 numPixels);

2
Common/GPU/D3D11/thin3d_d3d11.cpp
View file

@ -8,9 +8,9 @@
#endif
#include "Common/System/Display.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/ColorConv.h"
#include "Common/Log.h"
#include <cfloat>

4
Common/GPU/thin3d.cpp
View file

@ -2,10 +2,10 @@
#include <cstring>
#include <cstdint>
#include "Common/System/Display.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/GPU/thin3d.h"
#include "Common/Log.h"
#include "Common/ColorConv.h"
#include "Common/System/Display.h"
namespace Draw {

2
Core/AVIDump.cpp
View file

@ -23,8 +23,8 @@ extern "C" {
#endif
#include "Common/Data/Convert/ColorConv.h"
#include "Common/File/FileUtil.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "Core/AVIDump.h"

2
Core/Screenshot.cpp
View file

@ -21,7 +21,7 @@
#include <png.h>
#include "ext/jpge/jpge.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/File/FileUtil.h"
#include "Common/Log.h"
#include "Common/System/Display.h"

4
Core/TextureReplacer.cpp
View file

@ -21,10 +21,10 @@
#include "ext/xxhash.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/ColorConv.h"
#include "Common/File/FileUtil.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"

2
GPU/Common/DrawEngineCommon.cpp
View file

@ -17,8 +17,8 @@
#include <algorithm>
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Profiler/Profiler.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "GPU/Common/DrawEngineCommon.h"
#include "GPU/Common/SplineCommon.h"

2
GPU/Common/FramebufferManagerCommon.cpp
View file

@ -21,8 +21,8 @@
#include "Common/GPU/thin3d.h"
#include "Common/GPU/OpenGL/GLFeatures.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Text/I18n.h"
#include "Common/ColorConv.h"
#include "Common/Common.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"

2
GPU/Common/TextureCacheCommon.cpp
View file

@ -18,8 +18,8 @@
#include <algorithm>
#include "ppsspp_config.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Profiler/Profiler.h"
#include "Common/ColorConv.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"

4
GPU/Common/TextureDecoder.cpp
View file

@ -17,8 +17,8 @@
#include "ppsspp_config.h"
#include "ext/xxhash.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/CPUDetect.h"
#include "Common/ColorConv.h"
#include "GPU/GPU.h"
#include "GPU/GPUState.h"
@ -26,8 +26,6 @@
// NEON is in a separate file so that it can be compiled with a runtime check.
#include "GPU/Common/TextureDecoderNEON.h"
// TODO: Move some common things into here.
#ifdef _M_SSE
#include <emmintrin.h>
#if _M_SSE >= 0x401

6
GPU/Common/VertexDecoderCommon.cpp
View file

@ -20,10 +20,10 @@
#include "ppsspp_config.h"
#include "Common/Log.h"
#include "Common/CPUDetect.h"
#include "Common/ColorConv.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Log.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/MemMap.h"

2
GPU/D3D11/DepalettizeShaderD3D11.cpp
View file

@ -19,8 +19,8 @@
#include <d3d11.h>
#include "Common/Common.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Log.h"
#include "Common/ColorConv.h"
#include "Common/StringUtils.h"
#include "Core/Reporting.h"
#include "GPU/D3D11/TextureCacheD3D11.h"

2
GPU/D3D11/FramebufferManagerD3D11.cpp
View file

@ -20,11 +20,11 @@
#include <D3Dcompiler.h>
#include "Common/Common.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/System/Display.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Math/math_util.h"
#include "Common/GPU/thin3d.h"
#include "Common/ColorConv.h"
#include "Core/MemMap.h"
#include "Core/Config.h"

4
GPU/D3D11/TextureScalerD3D11.cpp
View file

@ -18,7 +18,7 @@
#include <algorithm>
#include <d3d11.h>
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Core/ThreadPools.h"
#include "GPU/Common/TextureScalerCommon.h"
#include "GPU/D3D11/TextureScalerD3D11.h"
@ -54,4 +54,4 @@ void TextureScalerD3D11::ConvertTo8888(u32 format, u32* source, u32* &dest, int
dest = source;
ERROR_LOG(G3D, "iXBRZTexScaling: unsupported texture format");
}
}
}

2
GPU/Directx9/FramebufferManagerDX9.cpp
View file

@ -18,7 +18,7 @@
#include "Common/Math/lin/matrix4x4.h"
#include "Common/GPU/thin3d.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Core/MemMap.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"

2
GPU/Directx9/TextureScalerDX9.cpp
View file

@ -18,7 +18,7 @@
#include <algorithm>
#include "Common/Common.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Core/ThreadPools.h"
#include "GPU/Common/TextureScalerCommon.h"
#include "GPU/Directx9/TextureScalerDX9.h"

2
GPU/GLES/FramebufferManagerGLES.cpp
View file

@ -17,12 +17,12 @@
#include <algorithm>
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Profiler/Profiler.h"
#include "Common/GPU/OpenGL/GLCommon.h"
#include "Common/GPU/OpenGL/GLDebugLog.h"
#include "Common/GPU/OpenGL/GLSLProgram.h"
#include "Common/GPU/thin3d.h"
#include "Common/ColorConv.h"
#include "Core/MemMap.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"

2
GPU/GLES/TextureCacheGLES.cpp
View file

@ -19,12 +19,12 @@
#include <cstring>
#include "ext/xxhash.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Math/math_util.h"
#include "Common/Profiler/Profiler.h"
#include "Common/GPU/OpenGL/GLRenderManager.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "Core/Host.h"
#include "Core/MemMap.h"

2
GPU/GLES/TextureScalerGLES.cpp
View file

@ -20,7 +20,7 @@
#include "GPU/Common/TextureScalerCommon.h"
#include "GPU/GLES/TextureScalerGLES.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Log.h"
#include "Core/ThreadPools.h"
#include "Common/GPU/DataFormat.h"

2
GPU/GPUCommon.cpp
View file

@ -5,7 +5,7 @@
#include "Common/Profiler/Profiler.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/GraphicsContext.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

2
GPU/Software/Rasterizer.cpp
View file

@ -19,10 +19,10 @@
#include <algorithm>
#include <cmath>
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Profiler/Profiler.h"
#include "Core/ThreadPools.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "Core/MemMap.h"
#include "Core/Reporting.h"

6
GPU/Software/RasterizerRectangle.cpp
View file

@ -3,17 +3,15 @@
#include <algorithm>
#include <cmath>
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Profiler/Profiler.h"
#include "Core/System.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "Core/MemMap.h"
#include "Core/Reporting.h"
#include "Core/System.h"
#include "GPU/GPUState.h"
#include "Rasterizer.h"
#include "GPU/Common/TextureCacheCommon.h"
#include "GPU/Software/SoftGpu.h"
#include "GPU/Software/Rasterizer.h"

2
GPU/Software/Sampler.cpp
View file

@ -18,7 +18,7 @@
#include "ppsspp_config.h"
#include <unordered_map>
#include <mutex>
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Core/Reporting.h"
#include "GPU/Common/TextureDecoder.h"
#include "GPU/GPUState.h"

2
GPU/Software/SoftGpu.cpp
View file

@ -21,7 +21,7 @@
#include "GPU/GPUState.h"
#include "GPU/ge_constants.h"
#include "GPU/Common/TextureDecoder.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/GraphicsContext.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"

2
GPU/Vulkan/DepalettizeShaderVulkan.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/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/GPU/Vulkan/VulkanImage.h"
#include "Common/GPU/Vulkan/VulkanMemory.h"
#include "Common/GPU/Vulkan/VulkanContext.h"

2
GPU/Vulkan/FramebufferManagerVulkan.cpp
View file

@ -21,6 +21,7 @@
#include "Common/System/Display.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Convert/SmallDataConvert.h"
#include "Common/GPU/thin3d.h"
@ -28,7 +29,6 @@
#include "Common/GPU/Vulkan/VulkanMemory.h"
#include "Common/GPU/Vulkan/VulkanImage.h"
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
#include "Common/ColorConv.h"
#include "Core/MemMap.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"

2
GPU/Vulkan/TextureCacheVulkan.cpp
View file

@ -26,7 +26,7 @@
#include "Common/GPU/thin3d.h"
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"
#include "Core/Host.h"

2
GPU/Vulkan/TextureScalerVulkan.cpp
View file

@ -18,8 +18,8 @@
#include <algorithm>
#include "Common/Common.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/GPU/Vulkan/VulkanContext.h"
#include "Common/ColorConv.h"
#include "Common/Log.h"
#include "Core/ThreadPools.h"
#include "GPU/Common/TextureScalerCommon.h"

8
UWP/CommonUWP/CommonUWP.vcxproj
View file

@ -457,8 +457,8 @@
<ClInclude Include="..\..\Common\Serialize\SerializeMap.h" />
<ClInclude Include="..\..\Common\Serialize\SerializeSet.h" />
<ClInclude Include="..\..\Common\CodeBlock.h" />
<ClInclude Include="..\..\Common\ColorConv.h" />
<ClInclude Include="..\..\Common\ColorConvNEON.h" />
<ClInclude Include="..\..\Common\Data\Convert\ColorConv.h" />
<ClInclude Include="..\..\Common\Data\Convert\ColorConvNEON.h" />
<ClInclude Include="..\..\Common\Common.h" />
<ClInclude Include="..\..\Common\CommonFuncs.h" />
<ClInclude Include="..\..\Common\CommonTypes.h" />
@ -568,8 +568,8 @@
<ClCompile Include="..\..\Common\Render\Text\draw_text_uwp.cpp" />
<ClCompile Include="..\..\Common\Render\Text\draw_text_win.cpp" />
<ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
<ClCompile Include="..\..\Common\ColorConv.cpp" />
<ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
<ClCompile Include="..\..\Common\Data\Convert\ColorConv.cpp" />
<ClCompile Include="..\..\Common\Data\Convert\ColorConvNEON.cpp" />
<ClCompile Include="..\..\Common\ConsoleListener.cpp" />
<ClCompile Include="..\..\Common\CPUDetect.cpp" />
<ClCompile Include="..\..\Common\FakeCPUDetect.cpp" />

8
UWP/CommonUWP/CommonUWP.vcxproj.filters
View file

@ -92,8 +92,8 @@
<ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
<ClCompile Include="..\..\Common\ArmEmitter.cpp" />
<ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
<ClCompile Include="..\..\Common\ColorConv.cpp" />
<ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
<ClCompile Include="..\..\Common\Data\Convert\ColorConv.cpp" />
<ClCompile Include="..\..\Common\Data\Convert\ColorConvNEON.cpp" />
<ClCompile Include="..\..\Common\ConsoleListener.cpp" />
<ClCompile Include="..\..\Common\CPUDetect.cpp" />
<ClCompile Include="..\..\Common\FakeCPUDetect.cpp" />
@ -381,8 +381,8 @@
<ClInclude Include="..\..\Common\BitScan.h" />
<ClInclude Include="..\..\Common\Serialize\Serializer.h" />
<ClInclude Include="..\..\Common\CodeBlock.h" />
<ClInclude Include="..\..\Common\ColorConv.h" />
<ClInclude Include="..\..\Common\ColorConvNEON.h" />
<ClInclude Include="..\..\Common\Data\Convert\ColorConv.h" />
<ClInclude Include="..\..\Common\Data\Convert\ColorConvNEON.h" />
<ClInclude Include="..\..\Common\Common.h" />
<ClInclude Include="..\..\Common\CommonFuncs.h" />
<ClInclude Include="..\..\Common\CommonTypes.h" />

4
Windows/GEDebugger/GEDebugger.cpp
View file

@ -21,9 +21,9 @@
#include <string>
#include <vector>
#include "Common/Data/Text/Parsers.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/ColorConv.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"
#include "Core/Screenshot.h"

6
android/jni/Android.mk
View file

@ -60,7 +60,7 @@ ARCH_FILES := \
$(SRC)/GPU/Common/TextureDecoderNEON.cpp.neon \
$(SRC)/Core/Util/AudioFormatNEON.cpp.neon \
$(SRC)/Common/ArmEmitter.cpp \
$(SRC)/Common/ColorConvNEON.cpp.neon \
$(SRC)/Common/Data/Convert/ColorConvNEON.cpp.neon \
$(SRC)/Common/Math/fast/fast_matrix_neon.S.neon \
$(SRC)/Core/MIPS/ARM/ArmCompALU.cpp \
$(SRC)/Core/MIPS/ARM/ArmCompBranch.cpp \
@ -87,7 +87,7 @@ ARCH_FILES := \
$(SRC)/GPU/Common/TextureDecoderNEON.cpp \
$(SRC)/Core/Util/AudioFormatNEON.cpp \
$(SRC)/Common/Arm64Emitter.cpp \
$(SRC)/Common/ColorConvNEON.cpp \
$(SRC)/Common/Data/Convert/ColorConvNEON.cpp \
$(SRC)/Core/MIPS/ARM64/Arm64CompALU.cpp \
$(SRC)/Core/MIPS/ARM64/Arm64CompBranch.cpp \
$(SRC)/Core/MIPS/ARM64/Arm64CompFPU.cpp \
@ -228,6 +228,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Common/Crypto/sha1.cpp \
$(SRC)/Common/Crypto/sha256.cpp \
$(SRC)/Common/Data/Color/RGBAUtil.cpp \
$(SRC)/Common/Data/Convert/ColorConv.cpp \
$(SRC)/Common/Data/Convert/SmallDataConvert.cpp \
$(SRC)/Common/Data/Encoding/Base64.cpp \
$(SRC)/Common/Data/Encoding/Compression.cpp \
@ -292,7 +293,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Common/UI/ViewGroup.cpp \
$(SRC)/Common/Serialize/Serializer.cpp \
$(SRC)/Common/ArmCPUDetect.cpp \
$(SRC)/Common/ColorConv.cpp \
$(SRC)/Common/CPUDetect.cpp \
$(SRC)/Common/ExceptionHandlerSetup.cpp \
$(SRC)/Common/FakeCPUDetect.cpp \

2
headless/Compare.cpp
View file

@ -23,7 +23,7 @@
#include <vector>
#include "headless/Compare.h"
#include "Common/ColorConv.h"
#include "Common/Data/Convert/ColorConv.h"
#include "Common/Data/Format/PNGLoad.h"
#include "Common/File/FileUtil.h"
#include "Common/StringUtils.h"

6
libretro/Makefile.common
View file

@ -251,7 +251,7 @@ SOURCES_CXX += \
$(GPUCOMMONDIR)/IndexGenerator.cpp \
$(GPUCOMMONDIR)/TextureDecoder.cpp \
$(GPUCOMMONDIR)/PostShader.cpp \
$(COMMONDIR)/ColorConv.cpp \
$(COMMONDIR)/Data/Convert/ColorConv.cpp \
$(GPUDIR)/Debugger/Breakpoints.cpp \
$(GPUDIR)/Debugger/Debugger.cpp \
$(GPUDIR)/Debugger/Playback.cpp \
@ -543,7 +543,7 @@ ifeq ($(WITH_DYNAREC),1)
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \
$(COREDIR)/Util/AudioFormatNEON.cpp \
$(COMMONDIR)/ColorConvNEON.cpp \
$(COMMONDIR)/Data/Convert/ColorConvNEON.cpp \
$(GPUDIR)/Common/TextureDecoderNEON.cpp
SOURCES_C += $(EXTDIR)/libpng17/arm/arm_init.c \
@ -572,7 +572,7 @@ ifeq ($(WITH_DYNAREC),1)
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \
$(COREDIR)/Util/AudioFormatNEON.cpp \
$(COMMONDIR)/ColorConvNEON.cpp \
$(COMMONDIR)/Data/Convert/ColorConvNEON.cpp \
$(GPUDIR)/Common/TextureDecoderNEON.cpp
SOURCES_C += $(EXTDIR)/libpng17/arm/arm_init.c \