ome minor updates for mobile

Update ios to include 9.1 Update OpenGL ES 2 to always require OES derivs extension and put it first to avoid errors on some devices
lfmc · Oct 30, 2015 · d6cc61f · d6cc61f
1 parent 2a23c1d
commit d6cc61f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/CMake/ios.device.toolchain.cmake.in b/CMake/ios.device.toolchain.cmake.in
@@ -76,7 +76,8 @@ if (NOT CMAKE_OSX_SYSROOT)
       iPhoneOS7.0.sdk
       iPhoneOS7.1.sdk
       iPhoneOS8.0.sdk
-      iPhoneOS9.0.sdk)
+      iPhoneOS9.0.sdk
+      iPhoneOS9.1.sdk)
       if (EXISTS ${sdk_root}/${sdk} AND IS_DIRECTORY ${sdk_root}/${sdk})
         set(CMAKE_OSX_SYSROOT ${sdk_root}/${sdk})
       endif()

diff --git a/CMake/ios.simulator.toolchain.cmake b/CMake/ios.simulator.toolchain.cmake
@@ -82,15 +82,11 @@ if (NOT CMAKE_OSX_SYSROOT)
     )
   foreach(sdk_root ${possible_sdk_roots})
     foreach(sdk
-      iPhoneSimulator4.3.sdk
-      iPhoneSimulator5.0.sdk
-      iPhoneSimulator5.1.sdk
-      iPhoneSimulator6.0.sdk
-      iPhoneSimulator6.1.sdk
       iPhoneSimulator7.0.sdk
       iPhoneSimulator7.1.sdk
       iPhoneSimulator8.0.sdk
-      iPhoneSimulator9.0.sdk)
+      iPhoneSimulator9.0.sdk
+      iPhoneSimulator9.1.sdk)
       if (EXISTS ${sdk_root}/${sdk} AND IS_DIRECTORY ${sdk_root}/${sdk})
         set(CMAKE_OSX_SYSROOT ${sdk_root}/${sdk})
       endif()

diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
@@ -1019,15 +1019,6 @@ void vtkOpenGLPolyDataMapper::ReplaceShaderNormal(
         }
       else
         {
-        if (!vtkOpenGLRenderWindow::GetContextSupportsOpenGL32())
-          {
-          vtkShaderProgram::Substitute(FSSource,"//VTK::System::Dec",
-            "//VTK::System::Dec\n"
-            "#if GL_ES==1 && __VERSION__<300\n"
-            "#extension GL_OES_standard_derivatives : enable\n"
-            "#endif\n",
-            false);
-          }
         if (actor->GetProperty()->GetRepresentation() == VTK_WIREFRAME)
           {
           // generate a normal for lines, it will be perpendicular to the line

diff --git a/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx b/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx
@@ -233,6 +233,7 @@ unsigned int vtkOpenGLShaderCache::ReplaceShaderValues(
 #else
   vtkShaderProgram::Substitute(FSSource,"//VTK::System::Dec",
      "#ifdef GL_ES\n"
+     "#extension GL_OES_standard_derivatives : enable\n"
      "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
      "precision highp float;\n"
      "#else\n"