Browse Source

prevent clashing between linker vars and local vars (close #1124)

Nicolas Cannasse 2 years ago
parent
commit
7016c246e7
1 changed files with 2 additions and 3 deletions
  1. 2 3
      hxsl/Linker.hx

+ 2 - 3
hxsl/Linker.hx

@@ -148,9 +148,8 @@ class Linker {
 				return v2;
 			}
 		}
-		var vid = allVars.length + 1;
 		var v2 : TVar = {
-			id : vid,
+			id : hxsl.Tools.allocVarId(),
 			name : vname,
 			type : v.type,
 			kind : v.kind,
@@ -161,7 +160,7 @@ class Linker {
 		a.v = v2;
 		a.merged = [v];
 		a.path = key;
-		a.id = vid;
+		a.id = v2.id;
 		a.parent = parent;
 		a.instanceIndex = curInstance;
 		a.rootShaderName = shaderName;