JosJuice 24a62eec41 Merge remote-tracking branch 'upstream/master' into merge-upstream ... # Conflicts: # CMakeLists.txt # CMakeSettings.json # Data/Sys/GameSettings/GLR.ini # Data/Sys/GameSettings/HA9.ini # Data/Sys/GameSettings/MB3.ini # Data/Sys/GameSettings/MBA.ini # Data/Sys/GameSettings/MCV.ini # Data/Sys/GameSettings/MCY.ini # Data/Sys/GameSettings/NAK.ini # Data/Sys/GameSettings/NAL.ini # Data/Sys/GameSettings/NAT.ini # Data/Sys/GameSettings/R8P.ini # Data/Sys/GameSettings/R9I.ini # Data/Sys/GameSettings/REF.ini # Data/Sys/GameSettings/RES.ini # Data/Sys/GameSettings/RMHE08.ini # Data/Sys/GameSettings/RMHP08.ini # Data/Sys/GameSettings/SE2.ini # Data/Sys/GameSettings/WW2.ini # Data/Sys/GameSettings/WW3.ini # Data/Sys/GameSettings/WWI.ini # Externals/Bochs_disasm/Bochs_disasm.vcxproj # Externals/FreeSurround/FreeSurround.vcxproj # Externals/LZO/LZO.vcxproj # Externals/SFML/build/vc2010/SFML_Network.vcxproj # Externals/bzip2/bzip2.vcxproj # Externals/cpp-optparse/cpp-optparse.vcxproj # Externals/cubeb/msvc/cubeb.vcxproj # Externals/curl/curl.vcxproj # Externals/curl/lib/CMakeLists.txt # Externals/discord-rpc/src/discord-rpc.vcxproj # Externals/ed25519/ed25519.vcxproj # Externals/enet/enet.vcxproj # Externals/glslang/glslang.vcxproj # Externals/imgui/imgui.vcxproj # Externals/liblzma/liblzma.vcxproj # Externals/libpng/png/png.vcxproj # Externals/libusb/libusb_static_2013.vcxproj # Externals/mbedtls/mbedTLS.vcxproj # Externals/miniupnpc/miniupnpc.vcxproj # Externals/minizip/minizip.vcxproj # Externals/picojson/picojson.vcxproj # Externals/pugixml/pugixml.vcxproj # Externals/soundtouch/SoundTouch.vcxproj # Externals/xxhash/xxhash.vcxproj # Externals/zlib/zlib.vcxproj # Externals/zstd/zstd.vcxproj # Languages/Languages.vcxproj # Source/Android/jni/MainAndroid.cpp # Source/Core/AudioCommon/AudioCommon.vcxproj # Source/Core/Common/Common.vcxproj # Source/Core/Common/Common.vcxproj.filters # Source/Core/Common/Logging/Log.h # Source/Core/Common/StringUtil.cpp # Source/Core/Core/CMakeLists.txt # Source/Core/Core/ConfigManager.cpp # Source/Core/Core/ConfigManager.h # Source/Core/Core/Core.vcxproj # Source/Core/Core/Core.vcxproj.filters # Source/Core/Core/HotkeyManager.cpp # Source/Core/Core/State.cpp # Source/Core/DiscIO/DiscIO.vcxproj # Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj # Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp # Source/Core/DolphinQt/DolphinQt.vcxproj # Source/Core/InputCommon/InputCommon.vcxproj # Source/Core/InputCommon/InputCommon.vcxproj.filters # Source/Core/UICommon/UICommon.vcxproj # Source/Core/UpdaterCommon/UpdaterCommon.vcxproj # Source/Core/VideoBackends/D3D/D3D.vcxproj # Source/Core/VideoBackends/D3D12/D3D12.vcxproj # Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj # Source/Core/VideoBackends/Null/Null.vcxproj # Source/Core/VideoBackends/OGL/OGL.vcxproj # Source/Core/VideoBackends/Software/Software.vcxproj # Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj # Source/Core/VideoCommon/OnScreenDisplay.cpp # Source/Core/VideoCommon/OnScreenDisplay.h # Source/Core/VideoCommon/VideoCommon.vcxproj # Source/Core/WinUpdater/WinUpdater.vcxproj # Source/DSPTool/DSPTool.vcxproj # Source/PCH/pch.vcxproj # Source/UnitTests/UnitTests.vcxproj		2020-12-01 23:44:32 +01:00
..
Clipper.cpp	VideoCommon/Statistics: Rename stats global to g_stats	2019-07-10 23:34:54 -04:00
Clipper.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
CMakeLists.txt	VideoSoftware/CMakeLists: Specify headers in target sources	2019-05-31 06:54:26 -04:00
CopyRegion.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
DebugUtil.cpp	Use range loop (if possible)	2020-07-18 18:29:16 -05:00
DebugUtil.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
EfbCopy.cpp	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
EfbCopy.h	Software Backend: Fix xfb output and add vertical scaling support	2017-11-17 22:11:31 -06:00
EfbInterface.cpp	Software: Migrate logging over to fmt	2020-11-09 03:14:01 -05:00
EfbInterface.h	VideoCommon: Remove unused MathUtil.h include from VideoCommon.h	2019-07-16 20:54:34 -04:00
NativeVertexFormat.h	SW NativeVertexFormat: Utilize std::array where applicable	2017-08-22 22:39:28 -04:00
Rasterizer.cpp	Remove warnings of -Wsign-compare	2020-03-25 07:57:14 +08:00
Rasterizer.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
SetupUnit.cpp	Software: Migrate logging over to fmt	2020-11-09 03:14:01 -05:00
SetupUnit.h	Reformat all the things. Have fun with merge conflicts.	2016-06-24 10:43:46 +02:00
SWmain.cpp	Make default graphics backend not show up as empty	2020-09-06 12:56:45 +02:00
SWOGLWindow.cpp	Software: Migrate logging over to fmt	2020-11-09 03:14:01 -05:00
SWOGLWindow.h	VideoCommon: Remove unused MathUtil.h include from VideoCommon.h	2019-07-16 20:54:34 -04:00
SWRenderer.cpp	VideoCommon/BoundingBox: Make interface for querying bounding box data	2019-12-05 11:48:42 -05:00
SWRenderer.h	Merge pull request #8049 from stenzek/crop	2019-06-08 20:57:52 +10:00
SWTexture.cpp	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
SWTexture.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
SWVertexLoader.cpp	Software: Use same logic for colors as hardware backends	2020-11-20 15:54:06 -08:00
SWVertexLoader.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
Tev.cpp	Remove warnings of -Wsign-compare	2020-03-25 07:57:14 +08:00
Tev.h	Software/Tev: const correctness	2017-09-03 14:15:21 -04:00
TextureCache.h	Replace EFBRectangle/TargetRectangle with MathUtil::Rectangle	2019-04-21 14:28:14 +10:00
TextureEncoder.cpp	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
TextureEncoder.h	VideoCommon: Remove unused MathUtil.h include from VideoCommon.h	2019-07-16 20:54:34 -04:00
TextureSampler.cpp	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
TextureSampler.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
TransformUnit.cpp	Software: Migrate logging over to fmt	2020-11-09 03:14:01 -05:00
TransformUnit.h	Reformat repo to clang-format 7.0 rules	2019-05-06 18:48:04 +00:00
Vec3.h	Software: Clean out unnecessary includes/fwd decls	2016-09-24 05:28:00 -04:00
VideoBackend.h	Make default graphics backend not show up as empty	2020-09-06 12:56:45 +02:00