preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 10:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into TemporaryHackishBranch

Browse Source 
Conflicts:
	Core/Config.cpp
	UI/ProfilerDraw.cpp
	ext/native/profiler/profiler.h
This commit is contained in:
LunaMoo committed 2018-01-15 12:16:23 +01:00
2 parents e658e74002 e119d3731a
commit 5aa61aa700
121 files changed
+2865 -1336
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/ProfilerDraw.cpp
+10 -1
View File
@@ -58,6 +58,7 @@ void DrawProfile(UIContext &ui) {
if (g_Config.bShowFrameProfiler) {
PROFILE_THIS_SCOPE("timing");
int numCategories = Profiler_GetNumCategories();
int numThreads = Profiler_GetNumThreads();
int historyLength = Profiler_GetHistoryLength();
ui.SetFontStyle(ui.theme->uiFont);
@@ -66,8 +67,11 @@ void DrawProfile(UIContext &ui) {
float legendMinVal = lastMaxVal * (1.0f / 120.0f);
std::vector<float> history(historyLength);
std::vector<int> slowestThread(historyLength);
std::vector<ProfileCatStatus> catStatus(numCategories);
Profiler_GetSlowestThreads(&slowestThread[0], historyLength);
float rowH = 30.0f;
float legendHeight = 0.0f;
float legendWidth = 80.0f;
@@ -78,7 +82,7 @@ void DrawProfile(UIContext &ui) {
continue;
}
Profiler_GetHistory(i, &history[0], historyLength);
Profiler_GetSlowestHistory(i, &slowestThread[0], &history[0], historyLength);
catStatus[i] = PROFILE_CAT_NOLEGEND;
for (int j = 0; j < historyLength; ++j) {
if (history[j] > legendMinVal) {
@@ -97,6 +101,10 @@ void DrawProfile(UIContext &ui) {
}
legendWidth += 20.0f;
if (legendHeight > ui.GetBounds().h) {
legendHeight = ui.GetBounds().h;
}
float legendStartY = legendHeight > ui.GetBounds().centerY() ? ui.GetBounds().y2() - legendHeight : ui.GetBounds().centerY();
float legendStartX = ui.GetBounds().x2() - std::min(legendWidth, 200.0f);
@@ -183,6 +191,7 @@ void DrawProfile(UIContext &ui) {
}
}
}
Profiler_GetSlowestHistory(i, &slowestThread[0], &history[0], historyLength);
for (int n = 0; n < historyLength; n++) {
if (total[n] > maxTotal)