commit ddd6c80eaf97858d74d2e2effca558051fac5481
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:05:14 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:05:14 2013 +0000
tree d56bcc4809dbd8afdc02df36ae807b680f24c983
parent 779aa2618c1333c034768f3a4ca7826a14753b60

Add the ability to recover from a removed device (TDR or driver removal) to the D3D11 code path.

TRAC #22411

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1857 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 7fec8d5..be2a92a 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2092,7 +2092,7 @@
 
 GLenum Context::getResetStatus()
 {
-    if (mResetStatus == GL_NO_ERROR)
+    if (mResetStatus == GL_NO_ERROR && !mContextLost)
     {
         // mResetStatus will be set by the markContextLost callback
         // in the case a notification is sent
@@ -2103,6 +2103,8 @@
 
     if (mResetStatus != GL_NO_ERROR)
     {
+        ASSERT(mContextLost);
+
         if (mRenderer->testDeviceResettable())
         {
             mResetStatus = GL_NO_ERROR;