Sfoglia il codice sorgente

fix subclassing with constants

Nicolas Cannasse 11 anni fa
parent
commit
65d61d01d0
2 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. 1 1
      hxsl/Macros.hx
  2. 4 0
      hxsl/Shader.hx

+ 1 - 1
hxsl/Macros.hx

@@ -181,7 +181,7 @@ class Macros {
 				expr : macro {
 					constBits = 0;
 					{$a{ exprs }};
-					super.updateConstants(globals);
+					updateConstantsFinal(globals);
 				},
 			}),
 			access : [AOverride],

+ 4 - 0
hxsl/Shader.hx

@@ -25,6 +25,10 @@ class Shader {
 	}
 
 	public function updateConstants( globals : Globals ) {
+		throw "assert";
+	}
+
+	function updateConstantsFinal( globals : Globals ) {
 		for( c in shader.consts )
 			if( c.globalId > 0 ) {
 				var v : Dynamic = globals.fastGet(c.globalId);