fix(texture): unable to force destory texture(#457)

Orillusion · Dec 12, 2024 · 3d62dc6 · 3d62dc6
1 parent e8257bc
commit 3d62dc6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@orillusion/core",
-    "version": "0.8.4",
+    "version": "0.8.5-dev.1",
     "author": "Orillusion",
     "description": "Orillusion WebGPU Engine",
     "type": "module",

diff --git a/src/core/geometry/GeometryVertexBuffer.ts b/src/core/geometry/GeometryVertexBuffer.ts
@@ -262,15 +262,15 @@ export class GeometryVertexBuffer {
 
     }
 
-    public destroy(force?: boolean) {
+    public destroy() {
         this.vertexCount = null;
         this.geometryType = null;
         this._vertexBufferLayouts = null;
         this._attributeSlotLayouts = null;
         this._attributeLocation = null;
 
         if (this.vertexGPUBuffer)
-            this.vertexGPUBuffer.destroy(force);
+            this.vertexGPUBuffer.destroy();
         this.vertexGPUBuffer = null;
     }
 }
diff --git a/src/gfx/graphics/webGpu/core/buffer/GPUBufferBase.ts b/src/gfx/graphics/webGpu/core/buffer/GPUBufferBase.ts
@@ -463,7 +463,7 @@ export class GPUBufferBase {
         }
     }
 
-    public destroy(force?: boolean) {
+    public destroy() {
         if (this.memoryNodes) {
             this.memoryNodes.forEach((v) => {
                 v.destroy();

diff --git a/src/gfx/graphics/webGpu/shader/RenderShaderPass.ts b/src/gfx/graphics/webGpu/shader/RenderShaderPass.ts
@@ -955,17 +955,6 @@ export class RenderShaderPass extends ShaderPassBase {
                     texture.destroy(force);
                 } else {
                     texture.destroy(false);
-                    let table = Reference.getInstance().getReference(texture);
-                    if (table) {
-                        let list = [];
-                        table.forEach((v, k) => {
-                            if (`name` in v) {
-                                list.push(v[`name`]);
-                            } else {
-                                list.push(`NaN`);
-                            }
-                        });
-                    }
                 }
             }
         }
@@ -981,7 +970,7 @@ export class RenderShaderPass extends ShaderPassBase {
         this._destFS = null;
         this._vsShaderModule = null;
         this._fsShaderModule = null;
-        this.materialDataUniformBuffer.destroy(force);;
+        this.materialDataUniformBuffer.destroy();;
         this.materialDataUniformBuffer = null;
     }
 

diff --git a/src/gfx/graphics/webGpu/shader/Shader.ts b/src/gfx/graphics/webGpu/shader/Shader.ts
@@ -233,8 +233,8 @@ export class Shader {
         }
     }
 
-    public destroy() {
-        this.getDefaultColorShader().destroy();
+    public destroy(force?: boolean) {
+        this.getDefaultColorShader().destroy(force);
     }
 
     public clone() {

diff --git a/src/materials/Material.ts b/src/materials/Material.ts
@@ -191,7 +191,7 @@ export class Material {
     destroy(force: boolean) {
         this.name = null;
         this.instanceID = null;
-        this._shader.destroy();
+        this._shader.destroy(force);
         this._shader = null;
     }