Merge pull request #8805 from CesiumGS/highp-batch-tables-fix

Fixing highp issue - Batch Tables

CHANGES.md

@@ -21,6 +21,7 @@
 - Fixed a bug with very long view ranges requiring multiple frustums even with the logarithmic depth buffer enabled. Previously, such scenes could resolve depth incorrectly. [#8727](https://github.com/CesiumGS/cesium/pull/8727)
 - Fixed a bug where the elevation contour material's alpha was not being applied. [#8749](https://github.com/CesiumGS/cesium/pull/8749)
 - Fix potential memory leak when destroying `CesiumWidget` instances.
+- Geometry instance floats now work for high precision floats on newer iOS devices. [#8805](https://github.com/CesiumGS/cesium/pull/8805)
 
 ### 1.68.0 - 2020-04-01
 

Source/Renderer/Context.js

@@ -16,7 +16,6 @@ import RuntimeError from "../Core/RuntimeError.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
 import ViewportQuadVS from "../Shaders/ViewportQuadVS.js";
 import BufferUsage from "./BufferUsage.js";
-import checkFloatTexturePrecision from "./checkFloatTexturePrecision.js";
 import ClearCommand from "./ClearCommand.js";
 import ContextLimits from "./ContextLimits.js";
 import CubeMap from "./CubeMap.js";
@@ -507,8 +506,6 @@ function Context(canvas, options) {
   this.cache = {};
 
   RenderState.apply(gl, rs, ps);
-
-  this._floatTexSixPlaces = checkFloatTexturePrecision(this);
 }
 
 var defaultFramebufferMarker = {};
@@ -663,18 +660,6 @@ Object.defineProperties(Context.prototype, {
     },
   },
 
-  /**
-   * Returns <code>true</code> if the context's floating point textures support 6 decimal places of precision.
-   * @memberof Context.prototype
-   * @type {Boolean}
-   * @see {@link https://www.khronos.org/registry/webgl/extensions/OES_texture_float/}
-   */
-  floatTextureSixPlaces: {
-    get: function () {
-      return this._floatTexSixPlaces;
-    },
-  },
-
   /**
    * <code>true</code> if OES_texture_half_float is supported. This extension provides
    * access to floating point textures that, for example, can be attached to framebuffers for high dynamic range.

Source/Scene/BatchTable.js

@@ -579,7 +579,7 @@ BatchTable.prototype.getVertexShaderCallback = function () {
     };
   }
 
-  var batchTableShader = "uniform sampler2D batchTexture; \n";
+  var batchTableShader = "uniform highp sampler2D batchTexture; \n";
   batchTableShader += getGlslComputeSt(this) + "\n";
 
   var length = attributes.length;

Source/Scene/ClassificationPrimitive.js

@@ -589,8 +589,7 @@ function createShaderProgram(classificationPrimitive, frameState) {
   var shadowVolumeAppearance = new ShadowVolumeAppearance(
     cullFragmentsUsingExtents,
     planarExtents,
-    classificationPrimitive.appearance,
-    context.floatTextureSixPlaces
+    classificationPrimitive.appearance
   );
 
   classificationPrimitive._spStencil = ShaderProgram.replaceCache({

Source/Scene/GroundPrimitive.js

@@ -805,23 +805,20 @@ GroundPrimitive.prototype.update = function (frameState) {
         var textureCoordinateRotationPoints =
           geometry.textureCoordinateRotationPoints;
 
-        var useFloatBatchTable = frameState.context.floatTextureSixPlaces;
         if (usePlanarExtents) {
           attributes = ShadowVolumeAppearance.getPlanarTextureCoordinateAttributes(
             boundingRectangle,
             textureCoordinateRotationPoints,
             ellipsoid,
             frameState.mapProjection,
-            useFloatBatchTable,
             this._maxHeight
           );
         } else {
           attributes = ShadowVolumeAppearance.getSphericalExtentGeometryInstanceAttributes(
             boundingRectangle,
             textureCoordinateRotationPoints,
             ellipsoid,
-            frameState.mapProjection,
-            useFloatBatchTable
+            frameState.mapProjection
           );
         }