Was about to update microprofile, but the new version is meh.
This commit is contained in:
parent
3c50b6739a
commit
8dd59d07ac
|
@ -14,7 +14,6 @@ includedirs({
|
||||||
defines({
|
defines({
|
||||||
"_UNICODE",
|
"_UNICODE",
|
||||||
"UNICODE",
|
"UNICODE",
|
||||||
"MICROPROFILE_MAX_THREADS=128",
|
|
||||||
})
|
})
|
||||||
|
|
||||||
vectorextensions("AVX")
|
vectorextensions("AVX")
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#define MICROPROFILE_PRINTF XELOGI
|
#define MICROPROFILE_PRINTF XELOGI
|
||||||
#define MICROPROFILE_WEBSERVER 0
|
#define MICROPROFILE_WEBSERVER 0
|
||||||
#define MICROPROFILE_DEBUG 0
|
#define MICROPROFILE_DEBUG 0
|
||||||
|
#define MICROPROFILE_MAX_THREADS 128
|
||||||
#include "third_party/microprofile/microprofile.h"
|
#include "third_party/microprofile/microprofile.h"
|
||||||
|
|
||||||
#include "xenia/profiling.h"
|
#include "xenia/profiling.h"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
#if XE_OPTION_PROFILING
|
#if XE_OPTION_PROFILING
|
||||||
// Pollutes the global namespace. Yuck.
|
// Pollutes the global namespace. Yuck.
|
||||||
|
#define MICROPROFILE_MAX_THREADS 128
|
||||||
#include <microprofile/microprofile.h>
|
#include <microprofile/microprofile.h>
|
||||||
#endif // XE_OPTION_PROFILING
|
#endif // XE_OPTION_PROFILING
|
||||||
|
|
||||||
|
|
|
@ -443,23 +443,23 @@ void GLProfilerDisplay::DrawBox(int x0, int y0, int x1, int y1, uint32_t color,
|
||||||
if (type == BoxType::kFlat) {
|
if (type == BoxType::kFlat) {
|
||||||
color =
|
color =
|
||||||
((color & 0xff) << 16) | ((color >> 16) & 0xff) | (0xff00ff00 & color);
|
((color & 0xff) << 16) | ((color >> 16) & 0xff) | (0xff00ff00 & color);
|
||||||
Q0(v, x, x0);
|
Q0(v, x, static_cast<float>(x0));
|
||||||
Q0(v, y, y0);
|
Q0(v, y, static_cast<float>(y0));
|
||||||
Q0(v, color, color);
|
Q0(v, color, color);
|
||||||
Q0(v, u, 2.0f);
|
Q0(v, u, 2.0f);
|
||||||
Q0(v, v, 2.0f);
|
Q0(v, v, 2.0f);
|
||||||
Q1(v, x, x1);
|
Q1(v, x, static_cast<float>(x1));
|
||||||
Q1(v, y, y0);
|
Q1(v, y, static_cast<float>(y0));
|
||||||
Q1(v, color, color);
|
Q1(v, color, color);
|
||||||
Q1(v, u, 2.0f);
|
Q1(v, u, 2.0f);
|
||||||
Q1(v, v, 2.0f);
|
Q1(v, v, 2.0f);
|
||||||
Q2(v, x, x1);
|
Q2(v, x, static_cast<float>(x1));
|
||||||
Q2(v, y, y1);
|
Q2(v, y, static_cast<float>(y1));
|
||||||
Q2(v, color, color);
|
Q2(v, color, color);
|
||||||
Q2(v, u, 2.0f);
|
Q2(v, u, 2.0f);
|
||||||
Q2(v, v, 2.0f);
|
Q2(v, v, 2.0f);
|
||||||
Q3(v, x, x0);
|
Q3(v, x, static_cast<float>(x0));
|
||||||
Q3(v, y, y1);
|
Q3(v, y, static_cast<float>(y1));
|
||||||
Q3(v, color, color);
|
Q3(v, color, color);
|
||||||
Q3(v, u, 2.0f);
|
Q3(v, u, 2.0f);
|
||||||
Q3(v, v, 2.0f);
|
Q3(v, v, 2.0f);
|
||||||
|
@ -479,23 +479,23 @@ void GLProfilerDisplay::DrawBox(int x0, int y0, int x1, int y1, uint32_t color,
|
||||||
uint32_t b1 = 0xff & ((b + nMin) / 2);
|
uint32_t b1 = 0xff & ((b + nMin) / 2);
|
||||||
uint32_t color0 = (r0 << 0) | (g0 << 8) | (b0 << 16) | (0xff000000 & color);
|
uint32_t color0 = (r0 << 0) | (g0 << 8) | (b0 << 16) | (0xff000000 & color);
|
||||||
uint32_t color1 = (r1 << 0) | (g1 << 8) | (b1 << 16) | (0xff000000 & color);
|
uint32_t color1 = (r1 << 0) | (g1 << 8) | (b1 << 16) | (0xff000000 & color);
|
||||||
Q0(v, x, x0);
|
Q0(v, x, static_cast<float>(x0));
|
||||||
Q0(v, y, y0);
|
Q0(v, y, static_cast<float>(y0));
|
||||||
Q0(v, color, color0);
|
Q0(v, color, color0);
|
||||||
Q0(v, u, 2.0f);
|
Q0(v, u, 2.0f);
|
||||||
Q0(v, v, 2.0f);
|
Q0(v, v, 2.0f);
|
||||||
Q1(v, x, x1);
|
Q1(v, x, static_cast<float>(x1));
|
||||||
Q1(v, y, y0);
|
Q1(v, y, static_cast<float>(y0));
|
||||||
Q1(v, color, color0);
|
Q1(v, color, color0);
|
||||||
Q1(v, u, 3.0f);
|
Q1(v, u, 3.0f);
|
||||||
Q1(v, v, 2.0f);
|
Q1(v, v, 2.0f);
|
||||||
Q2(v, x, x1);
|
Q2(v, x, static_cast<float>(x1));
|
||||||
Q2(v, y, y1);
|
Q2(v, y, static_cast<float>(y1));
|
||||||
Q2(v, color, color1);
|
Q2(v, color, color1);
|
||||||
Q2(v, u, 3.0f);
|
Q2(v, u, 3.0f);
|
||||||
Q2(v, v, 3.0f);
|
Q2(v, v, 3.0f);
|
||||||
Q3(v, x, x0);
|
Q3(v, x, static_cast<float>(x0));
|
||||||
Q3(v, y, y1);
|
Q3(v, y, static_cast<float>(y1));
|
||||||
Q3(v, color, color1);
|
Q3(v, color, color1);
|
||||||
Q3(v, u, 2.0f);
|
Q3(v, u, 2.0f);
|
||||||
Q3(v, v, 3.0f);
|
Q3(v, v, 3.0f);
|
||||||
|
|
|
@ -1 +1,14 @@
|
||||||
https://bitbucket.org/jonasmeyer/microprofile
|
# microprofile
|
||||||
|
|
||||||
|
MicroProfile is a embeddable profiler in a single file, written in C++
|
||||||
|
|
||||||
|
It can display profile information in the application, or by generating captures via a minimal built in webserver.
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
Microprofile supports generating compressed captures using miniz(http:/code.google.com/miniz).
|
||||||
|
|
||||||
|
# License
|
||||||
|
Licensed using unlicense.org
|
||||||
|
|
||||||
|
# Screenshot
|
||||||
|
![Microprofile in action](https://pbs.twimg.com/media/BnvzublCEAA0Mqf.png:large)
|
||||||
|
|
Loading…
Reference in New Issue