Revert r1829: Fix failure to recover from GPU hang.

It's causing trouble with Aura. Locking the screen seems to generate the display mode change device status and Aura cannot recover. http://crbug.com/178148 Review URL: https://codereview.appspot.com/7398052 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1834 736b8ea6-26fd-11df-bfd4-992fa37f6226

Revert r1829: Fix failure to recover from GPU hang.
2576f07c · apatrick@chromium.org · 8390870a · 2576f07c · 2576f07c
Commit 2576f07c authored Feb 25, 2013 by apatrick@chromium.org
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

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

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 1833
+#define BUILD_REVISION 1834
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

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