Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into plugins

Browse source
This commit is contained in:
Brad Davis 2015-06-04 00:29:39 -07:00
commit edfb1305af
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/OffscreenGlCanvas.cpp
View file

@ -16,6 +16,17 @@
OffscreenGlCanvas::OffscreenGlCanvas() { OffscreenGlCanvas::OffscreenGlCanvas() {
} }
OffscreenGlCanvas::~OffscreenGlCanvas() {
#ifdef DEBUG
if (_logger) {
makeCurrent();
delete _logger;
_logger = nullptr;
}
#endif
_context.doneCurrent();
}
void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) { void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) {
if (nullptr != sharedContext) { if (nullptr != sharedContext) {
sharedContext->doneCurrent(); sharedContext->doneCurrent();

1
libraries/render-utils/src/OffscreenGlCanvas.h
View file

@ -20,6 +20,7 @@ class QOpenGLDebugLogger;
class OffscreenGlCanvas : public QObject { class OffscreenGlCanvas : public QObject {
public: public:
OffscreenGlCanvas(); OffscreenGlCanvas();
~OffscreenGlCanvas();
void create(QOpenGLContext* sharedContext = nullptr); void create(QOpenGLContext* sharedContext = nullptr);
bool makeCurrent(); bool makeCurrent();
void doneCurrent(); void doneCurrent();