19 Commits
Author SHA1 Message Date
LunaMoo 86d082b940 Fix build 2021-03-13 01:56:00 +01:00
LunaMoo a5ed04b1b6 Merge branch 'master' into TemporaryHackishBranch
# Conflicts:
#	Common/GPU/Vulkan/VulkanRenderManager.cpp
#	Core/Config.cpp
#	Core/HW/MediaEngine.cpp
#	UI/CwCheatScreen.cpp
#	UI/MainScreen.cpp
#	UI/MiscScreens.cpp
#	Windows/resource.h
2021-03-13 01:48:32 +01:00
Unknown W. Brackets f32f89dd90 Global: Remove some unused variables. 2021-02-15 11:59:45 -08:00
LunaMoo 431e19977c Merge branch 'master' into TemporaryHackishBranch
# Conflicts:
#	Common/GPU/OpenGL/GLQueueRunner.cpp
#	Common/GPU/OpenGL/GLRenderManager.h
#	Common/GPU/OpenGL/thin3d_gl.cpp
#	Common/GPU/Vulkan/VulkanRenderManager.cpp
#	Common/GPU/Vulkan/thin3d_vulkan.cpp
#	Common/UI/Context.cpp
#	Core/Config.cpp
#	Core/Config.h
#	Core/HLE/proAdhoc.cpp
#	Core/HLE/proAdhocServer.cpp
#	Core/HLE/sceKernelThread.cpp
#	Core/HLE/sceNet.cpp
#	Core/HLE/sceNetAdhoc.cpp
#	Core/Util/PPGeDraw.cpp
#	GPU/Common/PresentationCommon.cpp
#	GPU/Common/TextureCacheCommon.cpp
#	GPU/GLES/TextureCacheGLES.cpp
#	GPU/Vulkan/TextureCacheVulkan.cpp
#	README.md
#	UI/EmuScreen.cpp
#	UI/GameSettingsScreen.cpp
#	UI/NativeApp.cpp
#	UI/ProfilerDraw.cpp
#	Windows/git-version-gen.cmd
#	ext/native/base/logging.h
2020-10-07 03:55:13 +02:00
Henrik Rydgård 0e3a84b4a8 Move most GPU things to Common.
It works after the move, on Windows and Android at least.

Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 23:39:02 +02:00
Henrik Rydgård 4f43cff5ca Move fileutil, net, image loaders, ui to Common. (#13506)
* Move and rename file_util/fd_util to Common/File/FileUtil and DirListing

Let's also move net while we're at it.

Move the ZIM/PNG loaders over to Common.

Move the UI framework into Common

iOS buildfix

* Buildfix

* Buildfixes

* Apple buildfix

* This typo again..

* UWP buildfix

* Fix build of PPSSPPQt, such as it is (it's not in good condition...)

* Guess what? Another buildfix.
2020-10-04 20:48:47 +02:00
Henrik Rydgård 821817e6d4 Move the profiler to Common 2020-10-04 11:42:16 +02:00
LunaMoo 20a8b29daf Add extra limits to frame profiler. 2019-11-03 17:57:46 +01:00
LunaMoo 867293dd17 Add 60Hz sync option for testing(don't think it's required for AMD)
Fix profiler merge messup.
2018-01-15 13:00:51 +01:00
LunaMoo 5aa61aa700 Merge branch 'master' into TemporaryHackishBranch
Conflicts:
	Core/Config.cpp
	UI/ProfilerDraw.cpp
	ext/native/profiler/profiler.h
2018-01-15 12:16:23 +01:00
Unknown W. Brackets 52c4293896 Profiler: Show the slowest thread's categories.
May or may not be ideal, but this was the easiest solution...
2017-12-30 10:45:51 -08:00
Unknown W. Brackets 4871b1eeb0 Profiler: Fix cat display on small screens. 2017-12-30 10:19:15 -08:00
LunaMoo 70117f93a2 Remove Timing from simple frame stats as it's just confusing. 2017-12-17 18:48:47 +01:00
LunaMoo db49a9941a Small tweaks to simple frame stats display. 2017-12-17 16:10:04 +01:00
LunaMoo ebf16e2a5a Make Frame Profiling a normal option and add simple % frame stats.
Might need tweaking.:]
2017-12-17 02:30:29 +01:00
Henrik Rydgård b9b2656e93 More vulkan microoptimizations. Add more profiler scopes. 2017-08-18 13:48:11 +02:00
LunaMoo 58af2b8eae Fix profiler build. 2017-01-09 22:09:34 +01:00
Unknown W. Brackets 9d64f9f9f6 Fix compile errors when profiler is enabled. 2015-11-25 18:44:32 -08:00
Henrik Rydgard 7f4e473e8c Add new shader viewing tool 2015-10-14 18:10:21 +02:00