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
..
BoundingBox.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
BoundingBox.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
CMakeLists.txt	Externals: Fix build failures with the newer glslang.	2020-05-30 18:54:21 -07:00
CommandBufferManager.cpp	name some threads	2020-08-22 17:22:07 -07:00
CommandBufferManager.h	Vulkan: Exclusive fullscreen support via VK_EXT_full_screen_exclusive	2019-10-31 22:45:59 +10:00
Constants.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
main.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
ObjectCache.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
ObjectCache.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
PerfQuery.cpp	VideoCommon: Remove unused MathUtil.h include from VideoCommon.h	2019-07-16 20:54:34 -04:00
PerfQuery.h	Vulkan: Simplify perf queries using vkGetQueryPoolResults	2019-03-29 20:54:44 +10:00
Renderer.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
Renderer.h	Vulkan: Exclusive fullscreen support via VK_EXT_full_screen_exclusive	2019-10-31 22:45:59 +10:00
ShaderCompiler.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
ShaderCompiler.h	VideoBackends/Vulkan: Use nested namespace specifiers where applicable	2019-06-17 16:57:30 -04:00
StagingBuffer.cpp	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
StagingBuffer.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
StateTracker.cpp	Vulkan: fix validation error in bSupportsGeometryShaders=false case	2020-11-20 12:23:34 +01:00
StateTracker.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
StreamBuffer.cpp	Use pre-increment for iterators instead of post-increment.	2019-12-29 23:45:02 -05:00
StreamBuffer.h	Vulkan: Simplify command buffer fence tracking	2019-03-29 20:54:44 +10:00
SwapChain.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
SwapChain.h	Vulkan: Exclusive fullscreen support via VK_EXT_full_screen_exclusive	2019-10-31 22:45:59 +10:00
VertexFormat.cpp	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
VertexFormat.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
VertexManager.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
VertexManager.h	Move most backend functionality to VideoCommon	2019-02-19 16:57:54 +10:00
VideoBackend.h	Make default graphics backend not show up as empty	2020-09-06 12:56:45 +02:00
VKPipeline.cpp	Common/CommonFuncs: Remove now-unneccessary ArraySize function	2019-06-01 10:07:57 -04:00
VKPipeline.h	VKPipeline: Fix render pass and add pipeline layout fields	2018-03-10 15:56:13 +10:00
VKShader.cpp	VideoVulkan/ShaderCompiler: Use a std::optional instead of bool+out variable	2019-05-30 04:16:17 -04:00
VKShader.h	VideoCommon/RenderBase: Use a std::string_view with CreateShaderFromSource()	2019-05-30 03:29:35 -04:00
VKTexture.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
VKTexture.h	Resolve VkDeviceMemory/nullptr type mismatch to fix build on FreeBSD i386	2020-11-03 07:47:43 +01:00
VulkanContext.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
VulkanContext.h	Vulkan: Exclusive fullscreen support via VK_EXT_full_screen_exclusive	2019-10-31 22:45:59 +10:00
VulkanEntryPoints.inl	Vulkan: Switch from vkCreateMacOSSurfaceMVK() to vkCreateMetalSurfaceEXT()	2020-04-07 18:56:55 +10:00
VulkanLoader.cpp	Vulkan: Migrate logging over to fmt	2020-11-09 03:26:16 -05:00
VulkanLoader.h	windows: fix build if pch were to be disabled	2020-08-22 16:18:24 -07:00