2
0
Эх сурвалжийг харах

fixed hxsl should not rename input var when there's a conflict

Nicolas Cannasse 2 жил өмнө
parent
commit
f90a996f2d
1 өөрчлөгдсөн 10 нэмэгдсэн , 2 устгасан
  1. 10 2
      hxsl/Linker.hx

+ 10 - 2
hxsl/Linker.hx

@@ -139,8 +139,16 @@ class Linker {
 							return a;
 					k++;
 				}
-				vname += k;
-				key += k;
+				if( v.kind == Input ) {
+					// it's not allowed to rename an input var, let's rename existing var instead
+					varMap.remove(key);
+					varMap.set(key + k, v2);
+					v2.v.name += k;
+					v2.path += k;
+				} else {
+					vname += k;
+					key += k;
+				}
 			} else {
 				v2.merged.push(v);
 				mergeVar(key, v, v2.v, p, v2.rootShaderName);