[r1626] Вместо D3DCompiler_43.dll используем d3dcompiler_47.dll.

gynkms · Jun 18, 2016 · 41c31e4 · 41c31e4
1 parent 9bc1b38
commit 41c31e4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/build.bat b/build.bat
@@ -368,12 +368,12 @@ IF /I "%NAME%" == "MPC-BE" (
   IF /I "%ARCH%" == "x64" (
     COPY /Y /V "%~1_%ARCH%\mpc-be64.exe"                     "%PCKG_NAME%\mpc-be64.exe" >NUL
     COPY /Y /V "%~1_%ARCH%\MPCBEShellExt64.dll"              "%PCKG_NAME%\MPCBEShellExt64.dll" >NUL
-    COPY /Y /V "..\distrib\DirectX\x64\D3DCompiler_43.dll"   "%PCKG_NAME%\D3DCompiler_43.dll" >NUL
+    COPY /Y /V "..\distrib\DirectX\x64\d3dcompiler_47.dll"   "%PCKG_NAME%\d3dcompiler_47.dll" >NUL
     COPY /Y /V "..\distrib\DirectX\x64\d3dx9_43.dll"         "%PCKG_NAME%\d3dx9_43.dll" >NUL
   ) ELSE (
     COPY /Y /V "%~1_%ARCH%\mpc-be.exe"                       "%PCKG_NAME%\mpc-be.exe" >NUL
     COPY /Y /V "%~1_%ARCH%\MPCBEShellExt.dll"                "%PCKG_NAME%\MPCBEShellExt.dll" >NUL
-    COPY /Y /V "..\distrib\DirectX\x86\D3DCompiler_43.dll"   "%PCKG_NAME%\D3DCompiler_43.dll" >NUL
+    COPY /Y /V "..\distrib\DirectX\x86\d3dcompiler_47.dll"   "%PCKG_NAME%\d3dcompiler_47.dll" >NUL
     COPY /Y /V "..\distrib\DirectX\x86\d3dx9_43.dll"         "%PCKG_NAME%\d3dx9_43.dll" >NUL
   )
   COPY /Y /V "%~1_%ARCH%\mpciconlib.dll"           "%PCKG_NAME%\*.dll" >NUL

diff --git a/distrib/DirectX/x64/D3DCompiler_43.dll b/distrib/DirectX/x64/D3DCompiler_43.dll
diff --git a/distrib/DirectX/x64/d3dcompiler_47.dll b/distrib/DirectX/x64/d3dcompiler_47.dll
diff --git a/distrib/DirectX/x86/D3DCompiler_43.dll b/distrib/DirectX/x86/D3DCompiler_43.dll
diff --git a/distrib/DirectX/x86/d3dcompiler_47.dll b/distrib/DirectX/x86/d3dcompiler_47.dll
diff --git a/distrib/mpc-be_setup.iss b/distrib/mpc-be_setup.iss
@@ -191,8 +191,8 @@ Name: reset_settings;           Description: {cm:tsk_ResetSettings};     GroupDe
 [Files]
 Source: "{#bindir}\{#mpcbe_exe}";            DestDir: "{app}"; Flags: ignoreversion;                                   Components: main
 Source: "{#bindir}\mpciconlib.dll";          DestDir: "{app}"; Flags: ignoreversion;                                   Components: mpciconlib
-Source: "{#dxdir}\D3DCompiler_43.dll";       DestDir: "{app}"; Flags: ignoreversion;                                   Components: main;          Check : not D3DX9DLLExists();
-Source: "{#dxdir}\d3dx9_43.dll";             DestDir: "{app}"; Flags: ignoreversion;                                   Components: main;          Check : not D3DX9DLLExists();
+Source: "{#dxdir}\d3dcompiler_47.dll";       DestDir: "{app}"; Flags: ignoreversion;                                   Components: main;          Check : not D3DCompiler_47_DLLExists();
+Source: "{#dxdir}\d3dx9_43.dll";             DestDir: "{app}"; Flags: ignoreversion;                                   Components: main;          Check : not D3DX9_43_DLLExists();
 Source: "{#bindir_x64}\MPCBEShellExt64.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete regserver noregerror; Components: mpcbeshellext; Check : IsWin64
 Source: "{#bindir_x86}\MPCBEShellExt.dll";   DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete regserver noregerror; Components: mpcbeshellext;
 #ifdef localize
@@ -337,9 +337,17 @@ begin
   end;
 end;
 
-function D3DX9DLLExists(): Boolean;
+function D3DX9_43_DLLExists(): Boolean;
 begin
-  if FileExists(ExpandConstant('{sys}\D3DX9_43.dll')) then
+  if FileExists(ExpandConstant('{sys}\d3dx9_43.dll')) then
+    Result := True
+  else
+    Result := False;
+end;
+
+function D3DCompiler_47_DLLExists(): Boolean;
+begin
+  if FileExists(ExpandConstant('{sys}\d3dcompiler_47.dll')) then
     Result := True
   else
     Result := False;

diff --git a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp
@@ -29,7 +29,7 @@ HINSTANCE GetD3dcompilerDll()
 	static HINSTANCE s_hD3dcompilerDll = NULL;
 
 	if (s_hD3dcompilerDll == NULL) {
-		s_hD3dcompilerDll = LoadLibrary(L"D3dcompiler_43.dll"); // Microsoft DirectX SDK (June 2010)
+		s_hD3dcompilerDll = LoadLibrary(L"d3dcompiler_47.dll"); // Windows Kits\8.1\Redist\D3D\[x86|x64]\d3dcompiler_47.dll
 	}
 
 	return s_hD3dcompilerDll;