summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-04-08 01:21:55 +0300
committerAndrei Karas <akaras@inbox.ru>2014-04-08 01:21:55 +0300
commit8781220335a1f7b8b60122df13fedba23bef9b35 (patch)
tree89785ca78b67731683e76e4ad6de62078e54c74e /src/gui
parentcf24722d84c7e4fd1d32365d720c291a48b9f9c8 (diff)
downloadmanaplus-8781220335a1f7b8b60122df13fedba23bef9b35.tar.gz
manaplus-8781220335a1f7b8b60122df13fedba23bef9b35.tar.bz2
manaplus-8781220335a1f7b8b60122df13fedba23bef9b35.tar.xz
manaplus-8781220335a1f7b8b60122df13fedba23bef9b35.zip
Add support for OpenGL extension GL_EXT_debug_marker.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/desktop.cpp4
-rw-r--r--src/gui/windows/chatwindow.cpp6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6ae892c81..3e77a65a5 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -28,6 +28,8 @@
#include "input/inputmanager.h"
+#include "render/opengldebug.h"
+
#include "resources/image.h"
#include "resources/imagehelper.h"
#include "resources/resourcemanager.h"
@@ -111,6 +113,7 @@ void Desktop::widgetResized(const Event &event A_UNUSED)
void Desktop::draw(Graphics *graphics)
{
BLOCK_START("Desktop::draw")
+ GLDEBUG_START("Desktop::draw")
const Rect &rect = mDimension;
const int width = rect.width;
@@ -144,6 +147,7 @@ void Desktop::draw(Graphics *graphics)
}
Container::draw(graphics);
+ GLDEBUG_END()
BLOCK_END("Desktop::draw")
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 05ee56356..c3a3569f7 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -62,6 +62,8 @@
#include "gui/widgets/tabs/tradetab.h"
#include "gui/widgets/tabs/whispertab.h"
+#include "render/opengldebug.h"
+
#include "net/chathandler.h"
#include "net/playerhandler.h"
#include "net/net.h"
@@ -1867,7 +1869,11 @@ void ChatWindow::draw(Graphics* graphics)
{
BLOCK_START("ChatWindow::draw")
if (!mAutoHide || mHaveMouse)
+ {
+ GLDEBUG_START("ChatWindow::draw");
Window::draw(graphics);
+ GLDEBUG_END();
+ }
BLOCK_END("ChatWindow::draw")
}