From 8152820e1547baff868a50cdc8b53f4547df4d1e Mon Sep 17 00:00:00 2001
From: Kirn Kim <squrkidev@gmail.com>
Date: Wed, 18 Sep 2024 21:57:44 -0700
Subject: [PATCH 1/3] Reverting Firefox OIT Fix #4815

---
 packages/engine/Source/Scene/OIT.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/engine/Source/Scene/OIT.js b/packages/engine/Source/Scene/OIT.js
index 4f479831b49e..e8252a3a851a 100644
--- a/packages/engine/Source/Scene/OIT.js
+++ b/packages/engine/Source/Scene/OIT.js
@@ -145,19 +145,13 @@ 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,
-    },
-    flipY: false,
+    width: width,
+    height: height,
+    flipY: false
   });
 }
 

From 0eec19a119156e17dafaf4d992af4931beabf133 Mon Sep 17 00:00:00 2001
From: Kirn Kim <squrkidev@gmail.com>
Date: Tue, 24 Sep 2024 10:06:18 -0700
Subject: [PATCH 2/3] Reverting Firefox test failure fix [#5047]

---
 CHANGES.md                                        |  1 +
 CONTRIBUTORS.md                                   |  1 +
 packages/engine/Specs/Renderer/FramebufferSpec.js | 15 ++++-----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 93e8690b691e..1a4f3472546d 100644
--- 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]
 
 ### 1.121.1 - 2024-09-04
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 6838315c3902..a2f79f8461f9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -412,3 +412,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/Specs/Renderer/FramebufferSpec.js b/packages/engine/Specs/Renderer/FramebufferSpec.js
index c1dbe5f2c022..cf6c3fa0f668 100644
--- a/packages/engine/Specs/Renderer/FramebufferSpec.js
+++ b/packages/engine/Specs/Renderer/FramebufferSpec.js
@@ -591,22 +591,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,

From b3d95be155b7e404400a4f6576eb16d807084c87 Mon Sep 17 00:00:00 2001
From: Kirn Kim <squrkidev@gmail.com>
Date: Tue, 24 Sep 2024 14:23:17 -0700
Subject: [PATCH 3/3] Ran prettier on code

---
 packages/engine/Source/Scene/OIT.js               | 2 +-
 packages/engine/Specs/Renderer/FramebufferSpec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/engine/Source/Scene/OIT.js b/packages/engine/Source/Scene/OIT.js
index e8252a3a851a..ec7ddad8ce9d 100644
--- a/packages/engine/Source/Scene/OIT.js
+++ b/packages/engine/Source/Scene/OIT.js
@@ -151,7 +151,7 @@ function updateTextures(oit, context, width, height) {
     pixelDatatype: PixelDatatype.FLOAT,
     width: width,
     height: height,
-    flipY: false
+    flipY: false,
   });
 }
 
diff --git a/packages/engine/Specs/Renderer/FramebufferSpec.js b/packages/engine/Specs/Renderer/FramebufferSpec.js
index cf6c3fa0f668..bcfac7f68c22 100644
--- a/packages/engine/Specs/Renderer/FramebufferSpec.js
+++ b/packages/engine/Specs/Renderer/FramebufferSpec.js
@@ -594,12 +594,12 @@ describe(
       const colorTexture0 = new Texture({
         context: context,
         width: 1,
-        height: 1
+        height: 1,
       });
       const colorTexture1 = new Texture({
         context: context,
         width: 1,
-        height: 1
+        height: 1,
       });
       framebuffer = new Framebuffer({
         context: context,