Bug 1021265. Fix DisplayLink version expansion code. r=Bas,a=lawrence
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Mon, 10 Nov 2014 16:11:42 -0500
changeset 226016 252c3ab238d0
parent 226015 fa1706ebf845
child 226017 1e8f0a8c4474
push id4106
push userjmuizelaar@mozilla.com
push date2014-11-10 21:15 +0000
treeherdermozilla-beta@252c3ab238d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBas, lawrence
bugs1021265
milestone34.0
Bug 1021265. Fix DisplayLink version expansion code. r=Bas,a=lawrence GFX_DRIVER_VERSION(8,6,..) expands to 8.0006.... but ParseVersion(8.6,...) gives 8.5000... This was an unfortunate error. Having better static typing of versions would have helped here.
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1523,17 +1523,17 @@ bool DoesD3D11DeviceWork(ID3D11Device *d
     gfxWindowsPlatform::GetDLLVersion(L"dlumd32.dll", displayLinkModuleVersionString);
     uint64_t displayLinkModuleVersion;
     if (!ParseDriverVersion(displayLinkModuleVersionString, &displayLinkModuleVersion)) {
 #if defined(MOZ_CRASHREPORTER)
       CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("DisplayLink: could not parse version\n"));
 #endif
       return false;
     }
-    if (displayLinkModuleVersion <= GFX_DRIVER_VERSION(8,6,1,36484)) {
+    if (displayLinkModuleVersion <= V(8,6,1,36484)) {
 #if defined(MOZ_CRASHREPORTER)
       CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("DisplayLink: too old version\n"));
 #endif
       return false;
     }
   }
 
   if (GetModuleHandleW(L"atidxx32.dll")) {