summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-07-10 03:27:27 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-14 18:00:30 +0200
commit913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd (patch)
treefa1dbdbdbe4f5e4e0eeb4b689bef0f1ff0ae780d
parentGL_State: Add a microprofile timer to OpenGL state. (diff)
downloadyuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar.gz
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar.bz2
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar.lz
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar.xz
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.tar.zst
yuzu-913b7a6872a67a0dd689bb19bc4ecfef7fb9cdcd.zip
-rw-r--r--src/video_core/macro_interpreter.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_texture_cache.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp
index c766ed692..9f59a2dc1 100644
--- a/src/video_core/macro_interpreter.cpp
+++ b/src/video_core/macro_interpreter.cpp
@@ -4,14 +4,18 @@
#include "common/assert.h"
#include "common/logging/log.h"
+#include "common/microprofile.h"
#include "video_core/engines/maxwell_3d.h"
#include "video_core/macro_interpreter.h"
+MICROPROFILE_DEFINE(MacroInterp, "GPU", "Execute macro interpreter", MP_RGB(128, 128, 192));
+
namespace Tegra {
MacroInterpreter::MacroInterpreter(Engines::Maxwell3D& maxwell3d) : maxwell3d(maxwell3d) {}
void MacroInterpreter::Execute(u32 offset, std::vector<u32> parameters) {
+ MICROPROFILE_SCOPE(MacroInterp);
Reset();
registers[1] = parameters[0];
this->parameters = std::move(parameters);
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp
index c6c76de08..b1f6bc7c2 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp
@@ -31,7 +31,8 @@ using VideoCore::Surface::SurfaceType;
MICROPROFILE_DEFINE(OpenGL_Texture_Upload, "OpenGL", "Texture Upload", MP_RGB(128, 192, 128));
MICROPROFILE_DEFINE(OpenGL_Texture_Download, "OpenGL", "Texture Download", MP_RGB(128, 192, 128));
-MICROPROFILE_DEFINE(OpenGL_Texture_Buffer_Copy, "OpenGL", "Texture Buffer Copy", MP_RGB(128, 192, 128));
+MICROPROFILE_DEFINE(OpenGL_Texture_Buffer_Copy, "OpenGL", "Texture Buffer Copy",
+ MP_RGB(128, 192, 128));
namespace {