Ver Fonte

minor shader cache init fix

Nicolas Cannasse há 2 anos atrás
pai
commit
55029a0bea
2 ficheiros alterados com 8 adições e 2 exclusões
  1. 7 2
      h3d/impl/ShaderCache.hx
  2. 1 0
      hxsl/CacheFileBuilder.hx

+ 7 - 2
h3d/impl/ShaderCache.hx

@@ -4,8 +4,8 @@ class ShaderCache {
 
 
 	var file : String;
 	var file : String;
 	var outputFile : String;
 	var outputFile : String;
-	var data : Map<String, haxe.io.Bytes> = null;
-	var sources : Map<String, String> = [];
+	var data : Map<String, haxe.io.Bytes>;
+	var sources : Map<String, String>;
 	var sourceFile : String;
 	var sourceFile : String;
 	public var keepSource : Bool;
 	public var keepSource : Bool;
 
 
@@ -18,6 +18,11 @@ class ShaderCache {
 	public function disableSave() {
 	public function disableSave() {
 		outputFile = null;
 		outputFile = null;
 	}
 	}
+	
+	public function initEmpty() {
+		data = [];
+		sources = [];
+	}
 
 
 	function load() {
 	function load() {
 		data = new Map();
 		data = new Map();

+ 1 - 0
hxsl/CacheFileBuilder.hx

@@ -234,6 +234,7 @@ class CacheFileBuilder {
 				builder.platforms.push(NXBinaries);
 				builder.platforms.push(NXBinaries);
 			case "-build-cache":
 			case "-build-cache":
 				builder.shaderCache = new h3d.impl.ShaderCache(getArg());
 				builder.shaderCache = new h3d.impl.ShaderCache(getArg());
+				builder.shaderCache.initEmpty();
 			case "-build-cache-source":
 			case "-build-cache-source":
 				builder.shaderCache.keepSource = true;
 				builder.shaderCache.keepSource = true;
 			case "-build-cache-config":
 			case "-build-cache-config":