Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Christian Butz
VTK
Commits
08c27636
Commit
08c27636
authored
Nov 03, 2016
by
Ken Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a compiler error on es3
GL_MULTISAMPLE is not defined for ES3
parent
149919e1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
Rendering/OpenGL2/vtkOpenGLRenderer.cxx
Rendering/OpenGL2/vtkOpenGLRenderer.cxx
+5
-0
No files found.
Rendering/OpenGL2/vtkOpenGLRenderer.cxx
View file @
08c27636
...
...
@@ -630,12 +630,14 @@ void vtkOpenGLRenderer::DevicePickRender()
this
->
RenderWindow
->
MakeCurrent
();
vtkOpenGLClearErrorMacro
();
#if GL_ES_VERSION_3_0 != 1
bool
msaaWasEnabled
=
false
;
if
(
this
->
RenderWindow
->
GetMultiSamples
()
>
0
&&
glIsEnabled
(
GL_MULTISAMPLE
))
{
glDisable
(
GL_MULTISAMPLE
);
msaaWasEnabled
=
true
;
}
#endif
this
->
UpdateCamera
();
this
->
UpdateLightGeometry
();
...
...
@@ -645,10 +647,13 @@ void vtkOpenGLRenderer::DevicePickRender()
this
->
PickInfo
->
PerformedHardwarePick
=
true
;
#if GL_ES_VERSION_3_0 != 1
if
(
msaaWasEnabled
)
{
glEnable
(
GL_MULTISAMPLE
);
}
#endif
vtkOpenGLCheckErrorMacro
(
"failed after DevicePickRender"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment