Commit 08c27636 authored by Ken Martin's avatar Ken Martin

fix a compiler error on es3

GL_MULTISAMPLE is not defined for ES3
parent 149919e1
...@@ -630,12 +630,14 @@ void vtkOpenGLRenderer::DevicePickRender() ...@@ -630,12 +630,14 @@ void vtkOpenGLRenderer::DevicePickRender()
this->RenderWindow->MakeCurrent(); this->RenderWindow->MakeCurrent();
vtkOpenGLClearErrorMacro(); vtkOpenGLClearErrorMacro();
#if GL_ES_VERSION_3_0 != 1
bool msaaWasEnabled = false; bool msaaWasEnabled = false;
if (this->RenderWindow->GetMultiSamples() > 0 && glIsEnabled(GL_MULTISAMPLE)) if (this->RenderWindow->GetMultiSamples() > 0 && glIsEnabled(GL_MULTISAMPLE))
{ {
glDisable(GL_MULTISAMPLE); glDisable(GL_MULTISAMPLE);
msaaWasEnabled = true; msaaWasEnabled = true;
} }
#endif
this->UpdateCamera(); this->UpdateCamera();
this->UpdateLightGeometry(); this->UpdateLightGeometry();
...@@ -645,10 +647,13 @@ void vtkOpenGLRenderer::DevicePickRender() ...@@ -645,10 +647,13 @@ void vtkOpenGLRenderer::DevicePickRender()
this->PickInfo->PerformedHardwarePick = true; this->PickInfo->PerformedHardwarePick = true;
#if GL_ES_VERSION_3_0 != 1
if (msaaWasEnabled) if (msaaWasEnabled)
{ {
glEnable(GL_MULTISAMPLE); glEnable(GL_MULTISAMPLE);
} }
#endif
vtkOpenGLCheckErrorMacro("failed after DevicePickRender"); vtkOpenGLCheckErrorMacro("failed after DevicePickRender");
} }
......
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