commit 87fbe1c2534b8684758b44585494066d83793743
author Corentin Wallez <cwallez@chromium.org> Wed Aug 03 14:41:42 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Aug 26 12:41:33 2016 +0000
tree ce859f9d1d694dce8fa21ab3860d11f11b2e3745
parent 4c4c8e7252a7fec399e9e78b9f2242c7ec5c7ea5

ContextImpl: only expose getResetStatus for robustness

This will allow each backend to implement this method separately. The
current set of ContextImpl methods used for robustness are slightly
D3D-centric.

BUG=angleproject:1463

Change-Id: I101f8ada2c49de4cf110db48b1e8380c52b50fb2
Reviewed-on: https://chromium-review.googlesource.com/365829
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 5c032bf..c79f3b7 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -486,19 +486,6 @@
     mCurrentSurface = nullptr;
 }
 
-// NOTE: this function should not assume that this context is current!
-void Context::markContextLost()
-{
-    if (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT)
-        mResetStatus = GL_UNKNOWN_CONTEXT_RESET_EXT;
-    mContextLost = true;
-}
-
-bool Context::isContextLost()
-{
-    return mContextLost;
-}
-
 GLuint Context::createBuffer()
 {
     return mResourceManager->createBuffer();
@@ -1955,32 +1942,55 @@
     }
 }
 
+// NOTE: this function should not assume that this context is current!
+void Context::markContextLost()
+{
+    if (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT)
+        mResetStatus = GL_UNKNOWN_CONTEXT_RESET_EXT;
+    mContextLost     = true;
+}
+
+bool Context::isContextLost()
+{
+    return mContextLost;
+}
+
 GLenum Context::getResetStatus()
 {
-    //TODO(jmadill): needs MANGLE reworking
-    if (mResetStatus == GL_NO_ERROR && !mContextLost)
+    // Even if the application doesn't want to know about resets, we want to know
+    // as it will allow us to skip all the calls.
+    if (mResetStrategy == GL_NO_RESET_NOTIFICATION_EXT)
     {
-        // mResetStatus will be set by the markContextLost callback
-        // in the case a notification is sent
-        if (mImplementation->testDeviceLost())
+        if (!mContextLost && mImplementation->getResetStatus() != GL_NO_ERROR)
         {
-            mImplementation->notifyDeviceLost();
+            mContextLost = true;
         }
+
+        // EXT_robustness, section 2.6: If the reset notification behavior is
+        // NO_RESET_NOTIFICATION_EXT, then the implementation will never deliver notification of
+        // reset events, and GetGraphicsResetStatusEXT will always return NO_ERROR.
+        return GL_NO_ERROR;
     }
 
-    GLenum status = mResetStatus;
-
-    if (mResetStatus != GL_NO_ERROR)
+    // The GL_EXT_robustness spec says that if a reset is encountered, a reset
+    // status should be returned at least once, and GL_NO_ERROR should be returned
+    // once the device has finished resetting.
+    if (!mContextLost)
     {
-        ASSERT(mContextLost);
+        ASSERT(mResetStatus == GL_NO_ERROR);
+        mResetStatus = mImplementation->getResetStatus();
 
-        if (mImplementation->testDeviceResettable())
+        if (mResetStatus != GL_NO_ERROR)
         {
-            mResetStatus = GL_NO_ERROR;
+            mContextLost = true;
         }
     }
+    else if (mResetStatus != GL_NO_ERROR)
+    {
+        mResetStatus = mImplementation->getResetStatus();
+    }
 
-    return status;
+    return mResetStatus;
 }
 
 bool Context::isResetNotificationEnabled()