diff --git a/src/core/cgp/cgp_pipeline.js b/src/core/cgp/cgp_pipeline.js
index ec21315bd..52960e3fe 100644
--- a/src/core/cgp/cgp_pipeline.js
+++ b/src/core/cgp/cgp_pipeline.js
@@ -128,7 +128,7 @@ export default class Pipeline
             if (this.#pipeCfg.depthStencil.depthWriteEnabled != this.#cgp.stateDepthWrite())
             {
                 needsRebuildReason = "depth changed";
-                this.#pipeCfg.depthStencil.depthWriteEnabled = this.#cgp.stateDepthWrite();
+                this.#pipeCfg.depthStencil.depthWriteEnabled = !!this.#cgp.stateDepthWrite();
             }
 
             if (this.#pipeCfg.fragment.targets[0].blend != this.#cgp.stateBlend())
@@ -137,15 +137,6 @@ export default class Pipeline
                 this.#pipeCfg.fragment.targets[0].blend = this.#cgp.stateBlend();
             }
 
-            // "fragment": {
-            //     "module": shader.gpuShaderModule,
-            //     "entryPoint": "myFSMain",
-            //     "targets": [
-            //         {
-            //             "format": this._cgp.presentationFormat,
-            //             "blend":
-            //         },
-
             if (this.#cgp.stateDepthTest() === false)
             {
                 if (this.#pipeCfg.depthStencil.depthCompare != "never")
@@ -372,7 +363,7 @@ export default class Pipeline
                 // "triangle-strip"
             },
             "depthStencil": {
-                "depthWriteEnabled": this.#cgp.stateDepthTest(),
+                "depthWriteEnabled": this.#cgp.stateDepthWrite(),
                 "depthCompare": this.#cgp.stateDepthFunc(),
                 "format": "depth24plus",
             },