Changeset 173539 in webkit

Timestamp:

Sep 11, 2014, 2:18:54 PM (12 years ago)

Author:

roger_fong@apple.com

Message:

Unreviewed build fix iOS.

• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::checkVaryingsPacking):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed build fix iOS.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::GraphicsContext3D::checkVaryingsPacking):
+
 2014-09-11  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

@@ -375 +375 @@
         index++;
     }
-    
+
+    GC3Dint maxVaryingVectors = 0;
+#if !PLATFORM(IOS)
     GC3Dint maxVaryingFloats = 0;
     ::glGetIntegerv(GL_MAX_VARYING_FLOATS, &maxVaryingFloats);
-    int result = ShCheckVariablesWithinPackingLimits(maxVaryingFloats / 4, variables, numVaryings);
-
+    maxVaryingVectors = maxVaryingFloats / 4;
+#else
+    ::glGetIntegerv(MAX_VARYING_VECTORS, &maxVaryingVectors);
+#endif
+    int result = ShCheckVariablesWithinPackingLimits(maxVaryingVectors, variables, numVaryings);
     delete[] variables;
     return result;