@zephyr3d/device 0.2.4 → 0.2.6

package/dist/builder/ast.js

@@ -1,7 +1,9 @@
 import { ShaderType } from '../base_types.js';
 import { semanticToAttrib } from '../gpuobject.js';
-import { PBPrimitiveTypeInfo, PBPrimitiveType, PBTextureType, PBAddressSpace, PBPointerTypeInfo, typeBool, typeF32, typeI32, typeU32, typeVoid } from './types.js';
+import { PBTextureType, PBPrimitiveTypeInfo, PBPrimitiveType, PBAddressSpace, PBPointerTypeInfo, typeBool, typeF32, typeI32, typeU32, typeVoid } from './types.js';
 import { PBASTError, PBTypeCastError, PBInternalError, PBParamTypeError } from './errors.js';
+import { getCurrentProgramBuilder } from './misc.js';
+import { ASSERT } from '@zephyr3d/base';
 
 const BuiltinInputStructNameVS = 'zVSInput';
 const BuiltinOutputStructNameVS = 'zVSOutput';
@@ -18,22 +20,22 @@ const BuiltinInputStructInstanceNameFS = 'zFSInputCpy';
 const BuiltinOutputStructInstanceNameFS = 'zFSOutputCpy';
 const BuiltinInputStructInstanceNameCS = 'zCSInputCpy';
 const BuiltinOutputStructInstanceNameCS = 'zCSOutputCpy';
-var DeclareType;
-(function(DeclareType) {
+/** @internal */ var DeclareType = /*#__PURE__*/ function(DeclareType) {
     DeclareType[DeclareType["DECLARE_TYPE_NONE"] = 0] = "DECLARE_TYPE_NONE";
     DeclareType[DeclareType["DECLARE_TYPE_IN"] = 1] = "DECLARE_TYPE_IN";
     DeclareType[DeclareType["DECLARE_TYPE_OUT"] = 2] = "DECLARE_TYPE_OUT";
     DeclareType[DeclareType["DECLARE_TYPE_WORKGROUP"] = 3] = "DECLARE_TYPE_WORKGROUP";
     DeclareType[DeclareType["DECLARE_TYPE_UNIFORM"] = 4] = "DECLARE_TYPE_UNIFORM";
     DeclareType[DeclareType["DECLARE_TYPE_STORAGE"] = 5] = "DECLARE_TYPE_STORAGE";
-})(DeclareType || (DeclareType = {}));
-var ShaderPrecisionType;
-(function(ShaderPrecisionType) {
+    return DeclareType;
+}({});
+/** @internal */ var ShaderPrecisionType = /*#__PURE__*/ function(ShaderPrecisionType) {
     ShaderPrecisionType[ShaderPrecisionType["NONE"] = 0] = "NONE";
     ShaderPrecisionType[ShaderPrecisionType["HIGH"] = 1] = "HIGH";
     ShaderPrecisionType[ShaderPrecisionType["MEDIUM"] = 2] = "MEDIUM";
     ShaderPrecisionType[ShaderPrecisionType["LOW"] = 3] = "LOW";
-})(ShaderPrecisionType || (ShaderPrecisionType = {}));
+    return ShaderPrecisionType;
+}({});
 /** @internal */ function getBuiltinParamName(shaderType) {
     switch(shaderType){
         case ShaderType.Vertex:
@@ -43,7 +45,7 @@ var ShaderPrecisionType;
         case ShaderType.Compute:
             return BuiltinParamNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinInputStructInstanceName(shaderType) {
@@ -55,7 +57,7 @@ var ShaderPrecisionType;
         case ShaderType.Compute:
             return BuiltinInputStructInstanceNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinOutputStructInstanceName(shaderType) {
@@ -67,7 +69,7 @@ var ShaderPrecisionType;
         case ShaderType.Compute:
             return BuiltinOutputStructInstanceNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinInputStructName(shaderType) {
@@ -79,7 +81,7 @@ var ShaderPrecisionType;
         case ShaderType.Compute:
             return BuiltinInputStructNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getBuiltinOutputStructName(shaderType) {
@@ -91,7 +93,7 @@ var ShaderPrecisionType;
         case ShaderType.Compute:
             return BuiltinOutputStructNameCS;
         default:
-            return null;
+            throw new Error(`Invalid shader type: ${shaderType}`);
     }
 }
 /** @internal */ function getTextureSampleType(type) {
@@ -124,7 +126,7 @@ var ShaderPrecisionType;
         case PBTextureType.UTEX_CUBE:
             return new PBPrimitiveTypeInfo(PBPrimitiveType.U32);
         default:
-            return null;
+            throw new Error(`Invalid texture type: ${type}`);
     }
 }
 /** @internal */ function genSamplerName(textureName, comparison) {
@@ -336,16 +338,16 @@ function unbracket(e) {
     getType() {
         return null;
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         return '';
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(_indent, _ctx) {
         return '';
     }
-    toWGSL(indent, ctx) {
+    toWGSL(_indent, _ctx) {
         return '';
     }
-    toString(deviceType) {
+    toString(_deviceType) {
         return this.constructor.name;
     }
 }
@@ -446,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);
             }
         }
@@ -462,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);
             }
         }
@@ -491,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);
                     }
@@ -536,12 +538,12 @@ function unbracket(e) {
     }
     getAddressSpace() {
         switch(this.value.$declareType){
-            case DeclareType.DECLARE_TYPE_UNIFORM:
+            case 4:
                 return PBAddressSpace.UNIFORM;
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 5:
                 return PBAddressSpace.STORAGE;
-            case DeclareType.DECLARE_TYPE_IN:
-            case DeclareType.DECLARE_TYPE_OUT:
+            case 1:
+            case 2:
                 return null;
             default:
                 return this.value.$global ? PBAddressSpace.PRIVATE : PBAddressSpace.FUNCTION;
@@ -550,24 +552,24 @@ function unbracket(e) {
     getType() {
         return this.value.$typeinfo;
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         return this.name;
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(_indent, _ctx) {
         return this.name;
     }
     toWGSL(indent, ctx) {
-        if (this.value.$declareType === DeclareType.DECLARE_TYPE_IN) {
+        if (this.value.$declareType === 1) {
             const structName = getBuiltinInputStructInstanceName(ctx.type);
             return ctx.global[structName][this.name].$ast.toWGSL(indent, ctx);
-        } else if (this.value.$declareType === DeclareType.DECLARE_TYPE_OUT) {
+        } else if (this.value.$declareType === 2) {
             const structName = getBuiltinOutputStructInstanceName(ctx.type);
             return ctx.global[structName][this.name].$ast.toWGSL(indent, ctx);
         } else {
             return this.name;
         }
     }
-    toString(deviceType) {
+    toString(_deviceType) {
         return this.name;
     }
 }
@@ -704,45 +706,41 @@ function unbracket(e) {
     isReference() {
         return true;
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         let prefix = '';
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
-            case DeclareType.DECLARE_TYPE_OUT:
-            case DeclareType.DECLARE_TYPE_UNIFORM:
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 1:
+            case 2:
+            case 4:
+            case 5:
                 throw new Error('invalid declare type');
             default:
                 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) {
+    toWebGL2(_indent, _ctx) {
         let prefix = '';
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
-            case DeclareType.DECLARE_TYPE_OUT:
-            case DeclareType.DECLARE_TYPE_UNIFORM:
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 1:
+            case 2:
+            case 4:
+            case 5:
                 throw new Error('invalid declare type');
             default:
                 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) {
+    toWGSL(_indent, _ctx) {
         let prefix;
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
-            case DeclareType.DECLARE_TYPE_OUT:
-            case DeclareType.DECLARE_TYPE_UNIFORM:
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 1:
+            case 2:
+            case 4:
+            case 5:
                 throw new Error('invalid declare type');
             default:
                 {
@@ -755,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);
@@ -773,6 +769,7 @@ function unbracket(e) {
     /** @internal */ type;
     /** @internal */ args;
     /** @internal */ constExp;
+    /** @internal */ convertedArgs;
     constructor(type, args){
         super();
         this.type = type;
@@ -787,6 +784,18 @@ function unbracket(e) {
             }
             this.constExp &&= !(arg instanceof ASTExpression) || arg.isConstExp();
         }
+        const deviceType = getCurrentProgramBuilder().getDevice().type;
+        const overloads = this.type.getConstructorOverloads(deviceType);
+        for (const overload of overloads){
+            const convertedArgs = convertArgs(this.args, overload);
+            if (convertedArgs) {
+                this.convertedArgs = convertedArgs;
+                break;
+            }
+        }
+        if (!this.convertedArgs) {
+            throw new Error(`no matching overload function found for type ${this.type.toTypeName(deviceType)}`);
+        }
     }
     getType() {
         return this.type;
@@ -802,48 +811,18 @@ function unbracket(e) {
         return null;
     }
     toWebGL(indent, ctx) {
-        console.assert(!this.type.isArrayType(), 'array constructor not supported in webgl1 device');
-        console.assert(this.type.isConstructible(), `type '${this.type.toTypeName('webgl')}' is not constructible`);
-        const overloads = this.type.getConstructorOverloads('webgl');
-        for (const overload of overloads){
-            const convertedArgs = convertArgs(this.args, overload);
-            if (convertedArgs) {
-                const c = convertedArgs.args.map((arg)=>unbracket(arg.toWebGL(indent, ctx))).join(',');
-                return `${convertedArgs.name}(${c})`;
-            }
-        }
-        throw new Error(`no matching overload function found for type ${this.type.toTypeName('webgl')}`);
+        const c = this.convertedArgs.args.map((arg)=>unbracket(arg.toWebGL(indent, ctx))).join(',');
+        return `${this.convertedArgs.name}(${c})`;
     }
     toWebGL2(indent, ctx) {
-        console.assert(this.type.isConstructible(), `type '${this.type.toTypeName('webgl2')}' is not constructible`, true);
-        const overloads = this.type.getConstructorOverloads('webgl2');
-        for (const overload of overloads){
-            const convertedArgs = convertArgs(this.args, overload);
-            if (convertedArgs) {
-                const c = convertedArgs.args.map((arg)=>unbracket(arg.toWebGL2(indent, ctx))).join(',');
-                return `${convertedArgs.name}(${c})`;
-            }
-        }
-        throw new Error(`no matching overload function found for type ${this.type.toTypeName('webgl2')}`);
+        const c = this.convertedArgs.args.map((arg)=>unbracket(arg.toWebGL2(indent, ctx))).join(',');
+        return `${this.convertedArgs.name}(${c})`;
     }
     toWGSL(indent, ctx) {
-        /*
-    console.assert(
-      this.type.isConstructible(),
-      `type '${this.type.toTypeName('webgpu')}' is not constructible`,
-      true
-    );
-    */ const overloads = this.type.getConstructorOverloads('webgpu');
-        for (const overload of overloads){
-            const convertedArgs = convertArgs(this.args, overload);
-            if (convertedArgs) {
-                const c = convertedArgs.args.map((arg)=>unbracket(arg.toWGSL(indent, ctx))).join(',');
-                return `${convertedArgs.name}(${c})`;
-            }
-        }
-        throw new Error(`no matching overload function found for type ${this.type.toTypeName('webgpu')}`);
+        const c = this.convertedArgs.args.map((arg)=>unbracket(arg.toWGSL(indent, ctx))).join(',');
+        return `${this.convertedArgs.name}(${c})`;
     }
-    toString(deviceType) {
+    toString(_deviceType) {
         return 'constructor';
     }
 }
@@ -881,21 +860,21 @@ function unbracket(e) {
     getAddressSpace() {
         return null;
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         switch(this.type.primitiveType){
             case PBPrimitiveType.F32:
                 return toFixed(this.value);
             case PBPrimitiveType.I32:
                 return toInt(this.value);
             case PBPrimitiveType.U32:
-                return toUint(this.value);
+                return `${toUint(this.value)}u`;
             case PBPrimitiveType.BOOL:
                 return String(!!this.value);
             default:
                 throw new Error('Invalid scalar type');
         }
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(_indent, _ctx) {
         switch(this.type.primitiveType){
             case PBPrimitiveType.F32:
                 return toFixed(this.value);
@@ -909,7 +888,7 @@ function unbracket(e) {
                 throw new Error('Invalid scalar type');
         }
     }
-    toWGSL(indent, ctx) {
+    toWGSL(_indent, _ctx) {
         switch(this.type.primitiveType){
             case PBPrimitiveType.F32:
                 return toFixed(this.value);
@@ -923,7 +902,7 @@ function unbracket(e) {
                 throw new Error('Invalid scalar type');
         }
     }
-    toString(deviceType) {
+    toString(_deviceType) {
         return `${this.value}`;
     }
 }
@@ -959,14 +938,14 @@ function unbracket(e) {
         return this.source.getAddressSpace();
     }
     toWebGL(indent, ctx) {
-        return `${this.source.toWebGL(indent, ctx)}.${this.field}`;
+        return this.source instanceof ASTScalar ? `(${this.source.toWebGL(indent, ctx)}).${this.field}` : `${this.source.toWebGL(indent, ctx)}.${this.field}`;
     }
     toWebGL2(indent, ctx) {
-        return `${this.source.toWebGL2(indent, ctx)}.${this.field}`;
+        return this.source instanceof ASTScalar ? `(${this.source.toWebGL(indent, ctx)}).${this.field}` : `${this.source.toWebGL(indent, ctx)}.${this.field}`;
     }
     toWGSL(indent, ctx) {
         const source = this.source.isPointer() ? new ASTReferenceOf(this.source) : this.source;
-        return `${source.toWGSL(indent, ctx)}.${this.field}`;
+        return source instanceof ASTScalar ? `(${source.toWGSL(indent, ctx)}).${this.field}` : `${source.toWGSL(indent, ctx)}.${this.field}`;
     }
     toString(deviceType) {
         const source = this.source.isPointer() ? new ASTReferenceOf(this.source) : this.source;
@@ -1027,7 +1006,7 @@ function unbracket(e) {
     /** @internal */ type;
     constructor(value){
         super();
-        console.assert(value.isReference(), 'no pointer type for non-reference values', true);
+        ASSERT(value.isReference(), 'no pointer type for non-reference values');
         this.value = value;
         this.type = new PBPointerTypeInfo(value.getType(), value.getAddressSpace());
     }
@@ -1050,10 +1029,10 @@ function unbracket(e) {
     getAddressSpace() {
         return this.value.getAddressSpace();
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         throw new Error('GLSL does not support pointer type');
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(_indent, _ctx) {
         throw new Error('GLSL does not support pointer type');
     }
     toWGSL(indent, ctx) {
@@ -1407,12 +1386,20 @@ function unbracket(e) {
         if (this.rvalue instanceof ASTCallFunction) {
             this.rvalue.isStatement = false;
         }
+        const ltype = this.lvalue.getType();
+        const valueTypeLeft = ltype.isPointerType() ? ltype.pointerType : ltype;
+        const rtype = this.checkScalarType(this.rvalue, valueTypeLeft);
+        const rvalueIsPtr = rtype && rtype.isPointerType();
+        const valueTypeRight = rvalueIsPtr ? rtype.pointerType : rtype;
+        if (!valueTypeLeft.isCompatibleType(valueTypeRight)) {
+            throw new PBTypeCastError(this.rvalue instanceof ASTExpression ? this.rvalue.toString(rtype.isPointerType() ? 'webgpu' : 'webgl') : `${this.rvalue}`, rtype, ltype);
+        }
     }
     getType() {
         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)) {
@@ -1429,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)) {
@@ -1512,35 +1499,35 @@ function unbracket(e) {
     }
 }
 /** @internal */ class ASTDiscard extends ShaderAST {
-    toWebGL(indent, ctx) {
+    toWebGL(indent, _ctx) {
         return `${indent}discard;\n`;
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(indent, _ctx) {
         return `${indent}discard;\n`;
     }
-    toWGSL(indent, ctx) {
+    toWGSL(indent, _ctx) {
         return `${indent}discard;\n`;
     }
 }
 /** @internal */ class ASTBreak extends ShaderAST {
-    toWebGL(indent, ctx) {
+    toWebGL(indent, _ctx) {
         return `${indent}break;\n`;
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(indent, _ctx) {
         return `${indent}break;\n`;
     }
-    toWGSL(indent, ctx) {
+    toWGSL(indent, _ctx) {
         return `${indent}break;\n`;
     }
 }
 /** @internal */ class ASTContinue extends ShaderAST {
-    toWebGL(indent, ctx) {
+    toWebGL(indent, _ctx) {
         return `${indent}continue;\n`;
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(indent, _ctx) {
         return `${indent}continue;\n`;
     }
-    toWGSL(indent, ctx) {
+    toWGSL(indent, _ctx) {
         return `${indent}continue;\n`;
     }
 }
@@ -1637,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;
@@ -1656,7 +1643,7 @@ function unbracket(e) {
         const args = thisArgs.map((arg)=>unbracket(arg.toWGSL(indent, ctx)));
         return `${this.isStatement ? indent : ''}${this.name}(${args.join(',')})${this.isStatement ? ';\n' : ''}`;
     }
-    toString(deviceType) {
+    toString(_deviceType) {
         return `${this.name}(...)`;
     }
 }
@@ -1670,6 +1657,7 @@ function unbracket(e) {
         this.value = exp;
         this.group = 0;
         this.binding = 0;
+        this.blockName = '';
     }
     isReference() {
         return true;
@@ -1682,7 +1670,7 @@ function unbracket(e) {
         let builtin = false;
         let valueType = this.value.getType();
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
+            case 1:
                 if (ctx.type === ShaderType.Vertex) {
                     prefix = 'attribute ';
                     ctx.defines.push(`#define ${this.value.name} ${semanticToAttrib(ctx.vertexAttributes[this.value.value.$location])}\n`);
@@ -1691,7 +1679,7 @@ function unbracket(e) {
                 // ctx.defines.push(`#define ${this.value.$str} ch_varying_${this.value.$location}\n`);
                 }
                 break;
-            case DeclareType.DECLARE_TYPE_OUT:
+            case 2:
                 if (ctx.type === ShaderType.Vertex) {
                     prefix = 'varying ';
                 // ctx.defines.push(`#define ${this.value.$str} ch_varying_${this.value.$location}\n`);
@@ -1705,22 +1693,23 @@ function unbracket(e) {
                     }
                 }
                 break;
-            case DeclareType.DECLARE_TYPE_UNIFORM:
+            case 4:
                 prefix = 'uniform ';
                 valueType = ctx.typeReplacement?.get(this.value.value) || valueType;
                 break;
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 5:
                 throw new Error(`invalid variable declare type: ${this.value.name}`);
         }
         if (!builtin) {
             return `${indent}${prefix}${valueType.toTypeName('webgl', this.value.name)};\n`;
         }
+        return '';
     }
     toWebGL2(indent, ctx) {
         let prefix = '';
         let valueType = this.value.getType();
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
+            case 1:
                 if (ctx.type === ShaderType.Fragment && valueType.isPrimitiveType() && valueType.isInteger()) {
                     prefix = 'flat in ';
                 } else {
@@ -1730,7 +1719,7 @@ function unbracket(e) {
                     ctx.defines.push(`#define ${this.value.name} ${semanticToAttrib(ctx.vertexAttributes[this.value.value.$location])}\n`);
                 }
                 break;
-            case DeclareType.DECLARE_TYPE_OUT:
+            case 2:
                 if (ctx.type === ShaderType.Vertex) {
                     if (valueType.isPrimitiveType() && valueType.isInteger()) {
                         prefix = 'flat out ';
@@ -1741,7 +1730,7 @@ function unbracket(e) {
                     prefix = `layout(location = ${this.value.value.$location}) out `;
                 }
                 break;
-            case DeclareType.DECLARE_TYPE_UNIFORM:
+            case 4:
                 if (valueType.isStructType()) {
                     /*
           if (valueType.layout !== 'std140') {
@@ -1752,42 +1741,38 @@ function unbracket(e) {
                     valueType = ctx.typeReplacement?.get(this.value.value) || valueType;
                     return `${indent}uniform ${valueType.toTypeName('webgl2', this.value.name)};\n`;
                 }
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            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;
         const isBlock = this.value.getType().isPrimitiveType() || this.value.getType().isStructType() || this.value.getType().isArrayType();
         switch(this.value.value.$declareType){
-            case DeclareType.DECLARE_TYPE_IN:
-            case DeclareType.DECLARE_TYPE_OUT:
+            case 1:
+            case 2:
                 // prefix = `@location(${this.value.value.$location}) var<out> `;
                 throw new Error(`Internal error`);
-            case DeclareType.DECLARE_TYPE_UNIFORM:
+            case 4:
                 prefix = `@group(${this.group}) @binding(${this.binding}) var${isBlock ? '<uniform>' : ''} `;
                 break;
-            case DeclareType.DECLARE_TYPE_STORAGE:
+            case 5:
                 prefix = `@group(${this.group}) @binding(${this.binding}) var<storage, ${this.value.value.$readonly ? 'read' : 'read_write' //this.value.isWritable() || this.value.getType().haveAtomicMembers() ? 'read_write' : 'read'
                 }> `;
                 break;
-            case DeclareType.DECLARE_TYPE_WORKGROUP:
+            case 3:
                 prefix = `var<workgroup> `;
                 break;
             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) {
@@ -1952,12 +1937,14 @@ function unbracket(e) {
     /** @internal */ start;
     /** @internal */ end;
     /** @internal */ open;
-    constructor(init, start, end, open){
+    /** @internal */ reverse;
+    constructor(init, start, end, open, reverse){
         super();
         this.init = init;
         this.start = start;
         this.end = end;
         this.open = open;
+        this.reverse = reverse;
         this.statements = [];
         if (this.start instanceof ASTCallFunction) {
             this.start.isStatement = false;
@@ -1970,8 +1957,8 @@ function unbracket(e) {
         const init = this.init.getType().toTypeName('webgl', this.init.name);
         const start = unbracket(this.start.toWebGL(indent, ctx));
         const end = unbracket(this.end.toWebGL(indent, ctx));
-        const comp = this.open ? '<' : '<=';
-        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name}++) {\n`;
+        const comp = this.open ? this.reverse ? '>' : '<' : this.reverse ? '>=' : '<=';
+        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name}${this.reverse ? '--' : '++'}) {\n`;
         str += super.toWebGL(indent + '  ', ctx);
         str += `${indent}}\n`;
         return str;
@@ -1980,8 +1967,8 @@ function unbracket(e) {
         const init = this.init.getType().toTypeName('webgl2', this.init.name);
         const start = unbracket(this.start.toWebGL2(indent, ctx));
         const end = unbracket(this.end.toWebGL2(indent, ctx));
-        const comp = this.open ? '<' : '<=';
-        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name}++) {\n`;
+        const comp = this.open ? this.reverse ? '>' : '<' : this.reverse ? '>=' : '<=';
+        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name}${this.reverse ? '--' : '++'}) {\n`;
         str += super.toWebGL2(indent + '  ', ctx);
         str += `${indent}}\n`;
         return str;
@@ -1991,8 +1978,8 @@ function unbracket(e) {
         const start = unbracket(this.start.toWGSL(indent, ctx));
         const end = unbracket(this.end.toWGSL(indent, ctx));
         const incr = new ASTScalar(1, this.init.getType()).toWGSL(indent, ctx);
-        const comp = this.open ? '<' : '<=';
-        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name} = ${this.init.name} + ${incr}) {\n`;
+        const comp = this.open ? this.reverse ? '> ' : '<' : this.reverse ? '>=' : '<=';
+        let str = `${indent}for (${init} = ${start}; ${this.init.name} ${comp} ${end}; ${this.init.name} = ${this.init.name} ${this.reverse ? '-' : '+'} ${incr}) {\n`;
         str += super.toWGSL(indent + '  ', ctx);
         str += `${indent}}\n`;
         return str;
@@ -2007,7 +1994,7 @@ function unbracket(e) {
             this.condition.isStatement = false;
         }
     }
-    toWebGL(indent, ctx) {
+    toWebGL(_indent, _ctx) {
         throw new Error(`No do-while() loop support for WebGL1.0 device`);
     }
     toWebGL2(indent, ctx) {
@@ -2052,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;
@@ -2074,7 +2054,7 @@ function unbracket(e) {
     getType() {
         return this.type;
     }
-    toWebGL(indent, ctx) {
+    toWebGL(indent, _ctx) {
         if (!this.builtin) {
             let str = `${indent}struct ${this.type.structName} {\n`;
             for (const arg of this.type.structMembers){
@@ -2086,7 +2066,7 @@ function unbracket(e) {
             return '';
         }
     }
-    toWebGL2(indent, ctx) {
+    toWebGL2(indent, _ctx) {
         if (!this.builtin) {
             let str = `${indent}struct ${this.type.structName} {\n`;
             for (const arg of this.type.structMembers){
@@ -2098,7 +2078,7 @@ function unbracket(e) {
             return '';
         }
     }
-    toWGSL(indent, ctx) {
+    toWGSL(indent, _ctx) {
         if (!this.builtin) {
             let str = `${indent}struct ${this.type.structName} {\n`;
             str += this.type.structMembers.map((arg, i)=>{