Commit 647b0430 authored by Martin Schultz's avatar Martin Schultz
Browse files

bind default vao in core profile

parent 9113b214
......@@ -603,6 +603,8 @@ void glViewer::drawScene(double _aspect)
glstate_->set_msSinceLastRedraw (redrawTime_.restart ());
makeCurrent();
if(!glstate_->compatibilityProfile())
defaultVAO_.bind();
// draw mono or stereo
// If stereo mode is selected, we have to provide multiple ways of rendering.
......@@ -699,7 +701,6 @@ void glViewer::drawScene(double _aspect)
// right eye: fbo 1
for (int eye = 0; eye < 2; ++eye) {
glstate_->set_projection(projLR[eye]);
if (stereoOpenGL && !numPostProcessors) {
// render directly into back_left
......@@ -712,7 +713,7 @@ void glViewer::drawScene(double _aspect)
postproc_->setupScene(properties_.viewerId(), glstate_->viewport_width(), glstate_->viewport_height(),
properties_.multisampling() ? 16 : 0, eye);
}
renderPlugin->render(glstate_,properties_);
drawCursor();
}
......@@ -731,7 +732,6 @@ void glViewer::drawScene(double _aspect)
}
checkGLError();
// =================================================================================
// Post-Processing pipeline
......
......@@ -63,6 +63,8 @@
#include "QtGLGraphicsScene.hh"
#include "QtGLGraphicsView.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#if QT_VERSION < 0x050000
#include <QGLFramebufferObject>
#else
......@@ -127,6 +129,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
// prepare GL state
makeCurrent();
if(OpenFlipper::Options::coreProfile())
defaultVAO_.bind();
if (pickCacheSupported_)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment