Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenFlipper
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenFlipper-Free
OpenFlipper
Commits
deb2ee91
Commit
deb2ee91
authored
7 years ago
by
Martin Schultz
Browse files
Options
Downloads
Patches
Plain Diff
added defaultVAO binding from QOpenGL branch
parent
37950e18
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!65
Feature core profile
,
!41
Fix core profile incompatibility
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
widgets/glWidget/QtBaseViewer.cc
+12
-0
12 additions, 0 deletions
widgets/glWidget/QtBaseViewer.cc
widgets/glWidget/QtBaseViewer.hh
+2
-0
2 additions, 0 deletions
widgets/glWidget/QtBaseViewer.hh
with
14 additions
and
0 deletions
widgets/glWidget/QtBaseViewer.cc
+
12
−
0
View file @
deb2ee91
...
...
@@ -1060,6 +1060,18 @@ void glViewer::paintGL(double _aspect)
{
if
(
!
initialized_
)
initializeGL
();
// some drivers in core profile require a VAO object to be bound for all buffer array operations
if
(
!
glstate_
->
compatibilityProfile
())
{
if
(
!
defaultVAO_
.
isSupported
())
std
::
cerr
<<
"Error - using core profile, but required VAO is not supported!"
<<
std
::
endl
;
else
defaultVAO_
.
bind
();
}
if
(
!
properties_
.
updateLocked
())
{
properties_
.
lockUpdate
();
...
...
This diff is collapsed.
Click to expand it.
widgets/glWidget/QtBaseViewer.hh
+
2
−
0
View file @
deb2ee91
...
...
@@ -620,6 +620,8 @@ private:
// Used to calculate the time passed between redraws
QTime
redrawTime_
;
// Default VAO needed in core profile mode
ACG
::
VertexArrayObject
defaultVAO_
;
#if (QT_VERSION >= QT_VERSION_CHECK(5,1,0))
// Get additional debug info from OpenGL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment