Merge pull request #11308 from CesiumGS/standard-derivatives

Fix misleading warnings for OES_standard_derivatives
CesiumGS · May 24, 2023 · 8da0967 · 8da0967
2 parents 2cbe296 + 95c5e60
commit 8da0967
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 28 deletions.
diff --git a/packages/engine/Source/Renderer/demodernizeShader.js b/packages/engine/Source/Renderer/demodernizeShader.js
@@ -56,6 +56,9 @@ function demodernizeShader(input, isFragmentShader) {
       // Replace gl_FragDepth with gl_FragDepthEXT.
       output = output.replaceAll(/gl_FragDepth/g, `gl_FragDepthEXT`);
     }
+
+    // Enable the OES_standard_derivatives extension
+    output = `#ifdef GL_OES_standard_derivatives\n#extension GL_OES_standard_derivatives : enable\n#endif\n${output}`;
   } else {
     // Replace the in with attribute.
     output = output.replaceAll(/(in)\s+(vec\d|mat\d|float)/g, `attribute $2`);

diff --git a/packages/engine/Source/Scene/Cesium3DTileBatchTable.js b/packages/engine/Source/Scene/Cesium3DTileBatchTable.js
@@ -1050,9 +1050,6 @@ function getLogDepthPolygonOffsetFragmentShaderProgram(context, shaderProgram) {
     fs.defines = defined(fs.defines) ? fs.defines.slice(0) : [];
     fs.defines.push("POLYGON_OFFSET");
 
-    fs.sources.unshift(
-      "#ifdef GL_OES_standard_derivatives\n#extension GL_OES_standard_derivatives : enable\n#endif\n"
-    );
     shader = context.shaderCache.createDerivedShaderProgram(
       shaderProgram,
       "zBackfaceLogDepth",

diff --git a/packages/engine/Source/Shaders/BillboardCollectionFS.glsl b/packages/engine/Source/Shaders/BillboardCollectionFS.glsl
@@ -1,7 +1,3 @@
-#ifdef GL_OES_standard_derivatives
-#extension GL_OES_standard_derivatives : enable
-#endif
-
 uniform sampler2D u_atlas;
 
 #ifdef VECTOR_TILE

diff --git a/packages/engine/Source/Shaders/Builtin/Functions/writeLogDepth.glsl b/packages/engine/Source/Shaders/Builtin/Functions/writeLogDepth.glsl
@@ -3,9 +3,6 @@ in float v_depthFromNearPlusOne;
 
 #ifdef POLYGON_OFFSET
 uniform vec2 u_polygonOffset;
-#ifdef GL_OES_standard_derivatives
-#extension GL_OES_standard_derivatives : enable
-#endif
 #endif
 
 #endif

diff --git a/packages/engine/Source/Shaders/Materials/ElevationContourMaterial.glsl b/packages/engine/Source/Shaders/Materials/ElevationContourMaterial.glsl
@@ -1,7 +1,3 @@
-#ifdef GL_OES_standard_derivatives
-    #extension GL_OES_standard_derivatives : enable
-#endif
-
 uniform vec4 color;
 uniform float spacing;
 uniform float width;

diff --git a/packages/engine/Source/Shaders/Materials/GridMaterial.glsl b/packages/engine/Source/Shaders/Materials/GridMaterial.glsl
@@ -1,7 +1,3 @@
-#ifdef GL_OES_standard_derivatives
-    #extension GL_OES_standard_derivatives : enable
-#endif
-
 uniform vec4 color;
 uniform float cellAlpha;
 uniform vec2 lineCount;

diff --git a/packages/engine/Source/Shaders/Materials/PolylineArrowMaterial.glsl b/packages/engine/Source/Shaders/Materials/PolylineArrowMaterial.glsl
@@ -1,7 +1,3 @@
-#ifdef GL_OES_standard_derivatives
-#extension GL_OES_standard_derivatives : enable
-#endif
-
 uniform vec4 color;
 
 float getPointOnLine(vec2 p0, vec2 p1, float x)

diff --git a/packages/engine/Source/Shaders/Model/ModelFS.glsl b/packages/engine/Source/Shaders/Model/ModelFS.glsl
@@ -1,9 +1,3 @@
-#if defined(HAS_NORMALS) && !defined(HAS_TANGENTS) && !defined(LIGHTING_UNLIT)
-    #ifdef GL_OES_standard_derivatives
-    #extension GL_OES_standard_derivatives : enable
-    #endif
-#endif
-
 czm_modelMaterial defaultModelMaterial()
 {
     czm_modelMaterial material;