load dxilconv7 too

megai2 · Sep 7, 2019 · b5edeed · b5edeed
1 parent ada5fd4
commit b5edeed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/d912pxy/d912pxy_device_init.cpp b/d912pxy/d912pxy_device_init.cpp
@@ -407,6 +407,10 @@ ComPtr<ID3D12Device> d912pxy_device::SelectSuitableGPU()
 
 		//megai2: stack up sanity a bit
 		h_d3dcompiler_47 = LoadLibrary(d912pxy_helper::GetFilePath(FP_W7_D3DCOMPILER)->w);
+		HMODULE dxilconv7 = LoadLibrary(d912pxy_helper::GetFilePath(FP_W7_DXILCONV7)->w);
+
+		if (!dxilconv7)
+			LOG_ERR_THROW2(-1, "dxilconv7 missing or can't be loaded (win10)");
 	}
 	else {
 		h_d3dcompiler_47 = LoadLibrary(L"d3dcompiler_47.dll");

diff --git a/d912pxy/d912pxy_fwdecl.h b/d912pxy/d912pxy_fwdecl.h
@@ -264,6 +264,7 @@ typedef enum d912pxy_file_path_id {
 	FP_CONFIG,
 	FP_W7_D3DCOMPILER,
 	FP_W7_D3D12,
+	FP_W7_DXILCONV7,
 	FP_VFS_PREFIX
 } d912pxy_file_path_id;
 
@@ -292,6 +293,7 @@ static const d912pxy_file_path d912pxy_file_paths_default[] = {
 	FP_DEF("./d912pxy/config.ini"),
 	FP_DEF("./d912pxy/12on7/d3dcompiler_47_v10.dll"),
 	FP_DEF("./d912pxy/12on7/d3d12.dll"),
+	FP_DEF("./d912pxy/12on7/dxilconv7.dll"),
 	FP_DEF("."),
 };