@zephyr3d/device 0.2.5 → 0.2.6

package/dist/builder/ast.js

@@ -45,7 +45,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case ShaderType.Compute:
             return BuiltinParamNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinInputStructInstanceName(shaderType) {
@@ -57,7 +57,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case ShaderType.Compute:
             return BuiltinInputStructInstanceNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinOutputStructInstanceName(shaderType) {
@@ -69,7 +69,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case ShaderType.Compute:
             return BuiltinOutputStructInstanceNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinInputStructName(shaderType) {
@@ -81,7 +81,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case ShaderType.Compute:
             return BuiltinInputStructNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinOutputStructName(shaderType) {
@@ -93,7 +93,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case ShaderType.Compute:
             return BuiltinOutputStructNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getTextureSampleType(type) {
@@ -126,7 +126,7 @@ const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
         case PBTextureType.UTEX_CUBE:
             return new PBPrimitiveTypeInfo(PBPrimitiveType.U32);
         default:
-            return null;
+            throw new Error(`Invalid texture type: ${type}`);
     }
 }
 /** @internal */ function genSamplerName(textureName, comparison) {
@@ -448,7 +448,7 @@ function unbracket(e) {
         const body = ctx.types.map((val)=>val.toWebGL(indent, ctx)).join('') + this.uniforms.map((uniform)=>uniform.toWebGL(indent, ctx)).join('') + ctx.inputs.map((input)=>input.toWebGL(indent, ctx)).join('') + ctx.outputs.map((output)=>output.toWebGL(indent, ctx)).join('') + super.toWebGL(indent, ctx);
         for (const k of ctx.builtins){
             const info = builtinVariables.webgl[k];
-            if (info.extension) {
+            if ('extension' in info) {
                 ctx.extensions.add(info.extension);
             }
         }
@@ -464,7 +464,7 @@ function unbracket(e) {
         const body = ctx.types.map((val)=>val.toWebGL2(indent, ctx)).join('') + this.uniforms.map((uniform)=>uniform.toWebGL2(indent, ctx)).join('') + ctx.inputs.map((input)=>input.toWebGL2(indent, ctx)).join('') + ctx.outputs.map((output)=>output.toWebGL2(indent, ctx)).join('') + super.toWebGL2(indent, ctx);
         for (const k of ctx.builtins){
             const info = builtinVariables.webgl2[k];
-            if (info.extension) {
+            if ('extension' in info) {
                 ctx.extensions.add(info.extension);
             }
         }
@@ -493,7 +493,7 @@ function unbracket(e) {
             if (type instanceof ASTStructDefine && structNames.indexOf(type.type.structName) >= 0) {
                 for(let i = type.type.structMembers.length - 1; i >= 0; i--){
                     const member = type.type.structMembers[i];
-                    if (allBuiltins.indexOf(member.name) >= 0 && usedBuiltins.indexOf(member.name) < 0) {
+                    if ('name' in member && allBuiltins.indexOf(member.name) >= 0 && usedBuiltins.indexOf(member.name) < 0) {
                         type.type.structMembers.splice(i, 1);
                         type.prefix.splice(i, 1);
                     }
@@ -718,9 +718,7 @@ function unbracket(e) {
                 prefix = this.value.constExp && !this.value.isWritable() && !this.getType().isStructType() ? 'const ' : '';
                 break;
         }
-        {
-            return `${prefix}${this.getType().toTypeName('webgl', this.value.name)}`;
-        }
+        return `${prefix}${this.getType().toTypeName('webgl', this.value.name)}`;
     }
     toWebGL2(_indent, _ctx) {
         let prefix = '';
@@ -734,9 +732,7 @@ function unbracket(e) {
                 prefix = this.value.constExp && !this.value.isWritable() && !this.getType().isStructType() ? 'const ' : '';
                 break;
         }
-        {
-            return `${prefix}${this.getType().toTypeName('webgl2', this.value.name)}`;
-        }
+        return `${prefix}${this.getType().toTypeName('webgl2', this.value.name)}`;
     }
     toWGSL(_indent, _ctx) {
         let prefix;
@@ -757,15 +753,13 @@ function unbracket(e) {
                     break;
                 }
         }
-        {
-            // const decl = this.value.value.$global ? this.getType().toTypeName('webgpu', this.value.name) : this.value.name;
-            const type = this.getType();
-            if (type.isPointerType() && (this.value.isWritable() || this.value.ref.isWritable())) {
-                type.writable = true;
-            }
-            const decl = type.toTypeName('webgpu', this.value.name);
-            return `${prefix}${decl}`;
+        // const decl = this.value.value.$global ? this.getType().toTypeName('webgpu', this.value.name) : this.value.name;
+        const type = this.getType();
+        if (type.isPointerType() && (this.value.isWritable() || this.value.ref.isWritable())) {
+            type.writable = true;
         }
+        const decl = type.toTypeName('webgpu', this.value.name);
+        return `${prefix}${decl}`;
     }
     toString(deviceType) {
         return this.value.toString(deviceType);
@@ -780,7 +774,7 @@ function unbracket(e) {
         super();
         this.type = type;
         this.args = args;
-        this.convertedArgs = null;
+        this.constExp = true;
         for (const arg of args){
             if (arg === null || arg === undefined) {
                 throw new Error('invalid constructor argument');
@@ -793,8 +787,9 @@ function unbracket(e) {
         const deviceType = getCurrentProgramBuilder().getDevice().type;
         const overloads = this.type.getConstructorOverloads(deviceType);
         for (const overload of overloads){
-            this.convertedArgs = convertArgs(this.args, overload);
-            if (this.convertedArgs) {
+            const convertedArgs = convertArgs(this.args, overload);
+            if (convertedArgs) {
+                this.convertedArgs = convertedArgs;
                 break;
             }
         }
@@ -1404,7 +1399,7 @@ function unbracket(e) {
         return null;
     }
     toWebGL(indent, ctx) {
-        let rhs = null;
+        let rhs;
         const ltype = this.lvalue.getType();
         const rtype = this.checkScalarType(this.rvalue, ltype);
         if (!ltype.isCompatibleType(rtype)) {
@@ -1421,7 +1416,7 @@ function unbracket(e) {
         return `${indent}${this.lvalue.toWebGL(indent, ctx)} = ${rhs};\n`;
     }
     toWebGL2(indent, ctx) {
-        let rhs = null;
+        let rhs;
         const ltype = this.lvalue.getType();
         const rtype = this.checkScalarType(this.rvalue, ltype);
         if (!ltype.isCompatibleType(rtype)) {
@@ -1629,7 +1624,7 @@ function unbracket(e) {
     toWGSL(indent, ctx) {
         let thisArgs = this.args;
         if (this.func) {
-            let argsNew;
+            let argsNew = null;
             const convertedArgs = convertArgs(thisArgs, this.func.funcType);
             if (convertedArgs) {
                 argsNew = convertedArgs.args;
@@ -1662,6 +1657,7 @@ function unbracket(e) {
         this.value = exp;
         this.group = 0;
         this.binding = 0;
+        this.blockName = '';
     }
     isReference() {
         return true;
@@ -1707,6 +1703,7 @@ function unbracket(e) {
         if (!builtin) {
             return `${indent}${prefix}${valueType.toTypeName('webgl', this.value.name)};\n`;
         }
+        return '';
     }
     toWebGL2(indent, ctx) {
         let prefix = '';
@@ -1747,9 +1744,7 @@ function unbracket(e) {
             case 5:
                 throw new Error(`invalid variable declare type: ${this.value.name}`);
         }
-        {
-            return `${indent}${prefix}${this.value.getType().toTypeName('webgl2', this.value.name)};\n`;
-        }
+        return `${indent}${prefix}${this.value.getType().toTypeName('webgl2', this.value.name)};\n`;
     }
     toWGSL(indent, ctx) {
         let prefix;
@@ -1772,14 +1767,12 @@ function unbracket(e) {
             default:
                 prefix = `${this.value.getType().isPointerType() ? 'let' : 'var'}${this.value.value.$global && !this.value.getType().isPointerType() ? '<private>' : ''} `;
         }
-        {
-            const type = this.value.getType();
-            const structName = type.isStructType() ? type.structName : null;
-            if (structName && ctx.types.findIndex((val)=>val instanceof ASTStructDefine && val.type.structName === structName) < 0) {
-                return '';
-            } else {
-                return `${indent}${prefix}${type.toTypeName('webgpu', this.value.name)};\n`;
-            }
+        const type = this.value.getType();
+        const structName = type.isStructType() ? type.structName : null;
+        if (structName && ctx.types.findIndex((val)=>val instanceof ASTStructDefine && val.type.structName === structName) < 0) {
+            return '';
+        } else {
+            return `${indent}${prefix}${type.toTypeName('webgpu', this.value.name)};\n`;
         }
     }
     toString(deviceType) {
@@ -2046,14 +2039,7 @@ function unbracket(e) {
         str += super.toWGSL(indent + '  ', ctx);
         str += `${indent}}\n`;
         return str;
-    /*
-    let str = `${indent}loop {\n`;
-    const newIndent = indent + '  ';
-    str += `${newIndent}if (!(${unbracket(this.condition.toWGSL(indent, ctx))})) { break; }\n`;
-    str += super.toWGSL(newIndent, ctx);
-    str += `${indent}}\n`;
-    return str;
-    */ }
+    }
 }
 /** @internal */ class ASTStructDefine extends ShaderAST {
     /** @internal */ type;