Fix failure to recover from device hang.

Sometimes IDirect3DDevice9Ex::CheckDeviceState returns S_PRESENT_MODE_CHANGED when the GPU has hung. It's not consistent, maybe one time out of two when I hang the GPU while running WebGL Aquarium. This unfortunately means that changes to display mode will cause ANGLE to report context lost. Other ideas appreciated. Review URL: https://codereview.appspot.com/7305093 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1829 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix failure to recover from device hang.
cc05a562 · apatrick@chromium.org · 216e289f · cc05a562 · cc05a562
Commit cc05a562 authored Feb 19, 2013 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

version.h src/common/version.h +1 -1

Display.cpp src/libEGL/Display.cpp +3 -1

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1828
+#define BUILD_REVISION 1829

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -910,7 +910,9 @@ bool Display::testDeviceLost()
 {
    if (mDeviceEx)
    {
-        return FAILED(mDeviceEx->CheckDeviceState(NULL));
+        // Sometimes CheckDeviceState returns S_PRESENT_MODE_CHANGED when the GPU has hung.
+        HRESULT result = mDeviceEx->CheckDeviceState(NULL);
+        return FAILED(result) || result == S_PRESENT_MODE_CHANGED;
    }
    else if (mDevice)
    {