Merge remote-tracking branch 'origin/main' into issue-4921

CesiumGS · Sep 27, 2024 · b73f87e · b73f87e
2 parents 78fee99 + 3082d3e
commit b73f87e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/.slackbot.yml b/.slackbot.yml
@@ -6,6 +6,6 @@ releaseSchedule:
   - jjhembd, 8/1/2024
   - jjspace, 9/1/2024
   - ggetz, 10/1/2024
-  - jjhembd, 11/1/2024
+  - lukemckinstry, 11/1/2024
   - jjspace, 12/1/2024
 
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,6 +13,7 @@
 
 - Use first geometryBuffer if no best match found in I3SNode [#12132](https://github.com/CesiumGS/cesium/pull/12132)
 - Update type definitions to allow undefined for optional parameters [#12193](https://github.com/CesiumGS/cesium/pull/12193)
+- Reverts Firefox OIT temporary fix [#4815] and Firefox test failure fix [#5047]
 - Fixed noise in ambient occlusion post process. [#12201](https://github.com/CesiumGS/cesium/pull/12201)
 
 ##### Deprecated :hourglass_flowing_sand:

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -413,3 +413,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Adam Wirth](https://github.com/adamwirth)
 - [Javier Sanchez](https://github.com/jvrjsanchez)
 - [Jérôme Fayot](https://github.com/jfayot)
+- [Kirn Kim](https://github.com/squrki)
diff --git a/packages/engine/Source/Scene/OIT.js b/packages/engine/Source/Scene/OIT.js
@@ -145,18 +145,12 @@ function updateTextures(oit, context, width, height) {
     pixelDatatype: PixelDatatype.FLOAT,
   });
 
-  // Use zeroed arraybuffer instead of null to initialize texture
-  // to workaround Firefox. Only needed for the second color attachment.
-  const source = new Float32Array(width * height * 4);
   oit._revealageTexture = new Texture({
     context: context,
     pixelFormat: PixelFormat.RGBA,
     pixelDatatype: PixelDatatype.FLOAT,
-    source: {
-      arrayBufferView: source,
-      width: width,
-      height: height,
-    },
+    width: width,
+    height: height,
     flipY: false,
   });
 }

diff --git a/packages/engine/Specs/Renderer/FramebufferSpec.js b/packages/engine/Specs/Renderer/FramebufferSpec.js
@@ -588,22 +588,15 @@ describe(
         return;
       }
 
-      const source = new Uint8Array(4);
       const colorTexture0 = new Texture({
         context: context,
-        source: {
-          arrayBufferView: source,
-          width: 1,
-          height: 1,
-        },
+        width: 1,
+        height: 1,
       });
       const colorTexture1 = new Texture({
         context: context,
-        source: {
-          arrayBufferView: source,
-          width: 1,
-          height: 1,
-        },
+        width: 1,
+        height: 1,
       });
       framebuffer = new Framebuffer({
         context: context,