Engineering: Fix some crashes during deploying

gongminmin · Jul 1, 2019 · ee75e05 · ee75e05
1 parent f05c362
commit ee75e05
Show file tree

Hide file tree

Showing 6 changed files with 361 additions and 79 deletions.
diff --git a/DeployKlayGE.py b/DeployKlayGE.py
@@ -3,7 +3,7 @@
 
 from __future__ import print_function
 import os, sys
-from BLibUtil import *
+from Build import BuildInfo
 
 def CopyToDst(src_name, dst_dir):
 	print("Copy %s to %s" % (src_name, dst_dir))
@@ -57,9 +57,7 @@ def DeployKlayGE(target_dir, build_info, compiler_arch):
 		CopyToDst(fname, bin_dst_dir);
 
 	print("Deploying OpenAL...\n")
-	for fname in glob.iglob("KlayGE/bin/win_%s/OpenAL32.%s" % (compiler_arch, dll_suffix)):
-		CopyToDst(fname, bin_dst_dir);
-	for fname in glob.iglob("KlayGE/bin/win_%s/wrap_oal.%s" % (compiler_arch, dll_suffix)):
+	for fname in glob.iglob("KlayGE/bin/win_%s/OpenAL%s" % (compiler_arch, lib_suffix)):
 		CopyToDst(fname, bin_dst_dir);
 
 	print("Deploying assimp...\n")
@@ -70,6 +68,10 @@ def DeployKlayGE(target_dir, build_info, compiler_arch):
 	for fname in glob.iglob("KlayGE/bin/win_%s/FreeImage%s" % (compiler_arch, lib_suffix)):
 		CopyToDst(fname, bin_dst_dir);
 
+	print("Deploying zlib...\n")
+	for fname in glob.iglob("KlayGE/bin/win_%s/zlib%s" % (compiler_arch, lib_suffix)):
+		CopyToDst(fname, bin_dst_dir);
+
 	print("Deploying glloader...\n")
 	for fname in glob.iglob("KlayGE/bin/win_%s/glloader%s" % (compiler_arch, lib_suffix)):
 		CopyToDst(fname, bin_dst_dir);

diff --git a/KlayGE/Core/Include/KlayGE/RenderMaterial.hpp b/KlayGE/Core/Include/KlayGE/RenderMaterial.hpp
@@ -154,13 +154,15 @@ namespace KlayGE
 	private:
 		std::string name_;
 
+		bool is_sw_mode_ = false;
 		RenderEffectConstantBufferPtr cbuffer_;
-		RenderEffectParameter* albedo_tex_param_;
-		RenderEffectParameter* metalness_glossiness_tex_param_;
-		RenderEffectParameter* emissive_tex_param_;
-		RenderEffectParameter* normal_tex_param_;
-		RenderEffectParameter* height_tex_param_;
-		RenderEffectParameter* occlusion_tex_param_;
+		std::vector<uint32_t> sw_cbuffer_;
+		RenderEffectParameter* albedo_tex_param_ = nullptr;
+		RenderEffectParameter* metalness_glossiness_tex_param_ = nullptr;
+		RenderEffectParameter* emissive_tex_param_ = nullptr;
+		RenderEffectParameter* normal_tex_param_ = nullptr;
+		RenderEffectParameter* height_tex_param_ = nullptr;
+		RenderEffectParameter* occlusion_tex_param_ = nullptr;
 
 		bool transparent_ = false;
 		bool sss_ = false;