986811 - Use the latest d3dcompiler dll if available

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Masatoshi Kimura [:emk]]

On Windows 8.1, d3dcompiler_47.dll is available from the system directory.

Comment 1

[Masatoshi Kimura [:emk]]

Attachment: patch

Comment 2

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8395196 [details] [diff] [review]
patch

Review of attachment 8395196 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/gl/GLLibraryEGL.cpp
@@ +112,5 @@
>  
>  #ifndef MOZ_D3DCOMPILER_DLL
>  #error MOZ_D3DCOMPILER_DLL should have been defined by the Makefile
>  #endif
> +        if (!LoadLibrarySystem32(L"d3dcompiler_47.dll")) {

We should go down a fallback list of drivers we want to try to load:
_47, then _46, then I guess just the _43 that we ship with.

Comment 3

[Masatoshi Kimura [:emk]]

Attachment: patch v2

(In reply to Jeff Gilbert [:jgilbert PTO through Mar26] from comment #2)
> We should go down a fallback list of drivers we want to try to load:
> _47, then _46, then I guess just the _43 that we ship with.

_46 will never be in the system directory. It doesn't make sense to test the version. _43 and lower will be in the directory if DirectX End User Runtime is installed, but we ship at least _43. So it doesn't make sense to test those lower versions either.
So this code will test as follows:
1. Try _47 in the system directory first (for Win 8.1).
2. Then try the whatever version we shipped with.
I added a comment to clarify that.

Comment 4

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8395296 [details] [diff] [review]
patch v2

Review of attachment 8395296 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/gl/GLLibraryEGL.cpp
@@ +115,5 @@
>  #endif
> +        // Windows 8.1 has d3dcompiler_47.dll in the system directory.
> +        // Try it first. Note that _46 will never be in the system
> +        // directory and we ship with at least _43. So there is no point
> +        // trying _46 and _43 in the system directory.

Thanks for the comment!

Comment 5

[Masatoshi Kimura [:emk]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/91a4c3026e8a

Comment 6

[Carsten Book [:Tomcat]]

(In reply to Masatoshi Kimura [:emk] from comment #5)
> https://hg.mozilla.org/integration/mozilla-inbound/rev/91a4c3026e8a

sorry had to backout for build failures like https://tbpl.mozilla.org/php/getParsedLog.php?id=36723648&tree=Mozilla-Inbound

Comment 7

[Masatoshi Kimura [:emk]]

Argh, relanded with |#ifdef XP_WIN| added.
https://hg.mozilla.org/integration/mozilla-inbound/rev/1a7225121967

Try run: https://tbpl.mozilla.org/?tree=Try&rev=edc31ebea363

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/1a7225121967