Commit 33975acb authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'fix_opengles_float_texture_error'

ba5c540d

 opengles does not use glew to ifdef glew code
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1897
parents 3391a22a ba5c540d
...@@ -551,6 +551,7 @@ void vtkOpenGLRenderWindow::InitializeTextureInternalFormats() ...@@ -551,6 +551,7 @@ void vtkOpenGLRenderWindow::InitializeTextureInternalFormats()
// on mesa we may not have float textures even though we think we do // on mesa we may not have float textures even though we think we do
// this is due to Mesa being iompacted by a patent issue with SGI // this is due to Mesa being iompacted by a patent issue with SGI
#if GL_ES_VERSION_2_0 != 1
if (haveFloatTextures) if (haveFloatTextures)
{ {
const char *glVersion = const char *glVersion =
...@@ -566,6 +567,7 @@ void vtkOpenGLRenderWindow::InitializeTextureInternalFormats() ...@@ -566,6 +567,7 @@ void vtkOpenGLRenderWindow::InitializeTextureInternalFormats()
return; return;
} }
} }
#endif
if (haveFloatTextures) if (haveFloatTextures)
{ {
......
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