Add missing makeCurrent()

This commit is contained in:
Maxime Gimeno 2021-01-21 10:22:51 +01:00
parent af3d33b5e7
commit dfc613c342
6 changed files with 13 additions and 0 deletions

View File

@ -21,6 +21,7 @@ public:
Viewer(QWidget* parent); Viewer(QWidget* parent);
~Viewer() ~Viewer()
{ {
makeCurrent();
buffers[0].destroy(); buffers[0].destroy();
buffers[1].destroy(); buffers[1].destroy();
buffers[2].destroy(); buffers[2].destroy();

View File

@ -11,6 +11,14 @@ Viewer::Viewer(QWidget* parent )
{ {
extension_is_found = false; extension_is_found = false;
} }
Viewer::~Viewer()
{
makeCurrent();
for(int i=0; i<3; ++i)
vao[i].destroy();
for(int i=0; i<9; ++i)
buffers[i].destroy();
}
void Viewer::compile_shaders() void Viewer::compile_shaders()
{ {

View File

@ -13,6 +13,7 @@ class Viewer : public CGAL::QGLViewer
{ {
public: public:
Viewer(QWidget* parent = 0); Viewer(QWidget* parent = 0);
~Viewer();
GLuint dl_nb; GLuint dl_nb;
protected : protected :
virtual void draw(); virtual void draw();

View File

@ -76,6 +76,7 @@ public:
} }
~Scene() { ~Scene() {
ui->viewer->makeCurrent();
for(int i=0; i<24; i++) for(int i=0; i<24; i++)
buffers[i].destroy(); buffers[i].destroy();
for(int i=0; i<12; i++) for(int i=0; i<12; i++)

View File

@ -27,6 +27,7 @@ public:
{} {}
~Viewer() ~Viewer()
{ {
makeCurrent();
for(int i=0; i<4; i++) for(int i=0; i<4; i++)
{ {
buffers[i].destroy(); buffers[i].destroy();

View File

@ -374,6 +374,7 @@ Viewer::Viewer(QWidget* parent,
Viewer::~Viewer() Viewer::~Viewer()
{ {
makeCurrent();
QSettings viewer_settings; QSettings viewer_settings;
viewer_settings.setValue("cam_pos", viewer_settings.setValue("cam_pos",
QString("%1,%2,%3") QString("%1,%2,%3")