chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

shutdown framebufferobject properly if used

Browse Source
This commit is contained in:
Mark Watkins 2013-01-16 15:37:09 +10:00
parent 5446992899
commit aa24352e70
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Graphs/gGraphView.cpp
View File

@ -45,6 +45,12 @@ QFont * defaultfont=NULL;
QFont * mediumfont=NULL; QFont * mediumfont=NULL;
QFont * bigfont=NULL; QFont * bigfont=NULL;
//MW: ick globals, but I want a system wide framebuffer of decent proprotions..
bool fbo_unsupported=false;
QGLFramebufferObject *fbo=NULL;
const int max_fbo_width=2048;
const int max_fbo_height=2048;
bool evil_intel_graphics_chip=false; bool evil_intel_graphics_chip=false;
extern QLabel * qstatus2; extern QLabel * qstatus2;
@ -118,6 +124,12 @@ void DoneGraphs()
for (QHash<QString,QImage *>::iterator i=images.begin();i!=images.end();i++) { for (QHash<QString,QImage *>::iterator i=images.begin();i!=images.end();i++) {
delete i.value(); delete i.value();
} }
if (fbo) { // Clear the frame buffer object
if (fbo->isBound()) fbo->release();
delete fbo;
fbo=NULL;
fbo_unsupported=true; // just in case shutdown order gets messed up
}
_graph_init=false; _graph_init=false;
} }
} }
@ -1857,12 +1869,6 @@ QPixmap gGraphView::pbRenderPixmap(int w,int h)
} }
//MW: ick globals, but I want a system wide framebuffer of decent proprotions..
bool fbo_unsupported=false;
QGLFramebufferObject *fbo=NULL;
const int max_fbo_width=2048;
const int max_fbo_height=2048;
QPixmap gGraphView::fboRenderPixmap(int w,int h) QPixmap gGraphView::fboRenderPixmap(int w,int h)
{ {
QPixmap pm=QPixmap(); QPixmap pm=QPixmap();