From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 16 Oct 2019 21:12:43 +0000 (-0400)
Subject: st/mesa: call the reset callback if glGetGraphicsResetStatus returns a failure
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93707457b61d276570b5e76154b073a053f63cb5;p=mesa.git

st/mesa: call the reset callback if glGetGraphicsResetStatus returns a failure

so that we immediately set the no-op dispatch

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
---

diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c
index 81e5338f795..36f7f2320c8 100644
--- a/src/mesa/state_tracker/st_cb_flush.c
+++ b/src/mesa/state_tracker/st_cb_flush.c
@@ -136,6 +136,18 @@ gl_reset_status_from_pipe_reset_status(enum pipe_reset_status status)
 }
 
 
+static void
+st_device_reset_callback(void *data, enum pipe_reset_status status)
+{
+   struct st_context *st = data;
+
+   assert(status != PIPE_NO_RESET);
+
+   st->reset_status = status;
+   _mesa_set_context_lost_dispatch(st->ctx);
+}
+
+
 /**
  * Query information about GPU resets observed by this context
  *
@@ -152,24 +164,14 @@ st_get_graphics_reset_status(struct gl_context *ctx)
       st->reset_status = PIPE_NO_RESET;
    } else {
       status = st->pipe->get_device_reset_status(st->pipe);
+      if (status != PIPE_NO_RESET)
+         st_device_reset_callback(st, status);
    }
 
    return gl_reset_status_from_pipe_reset_status(status);
 }
 
 
-static void
-st_device_reset_callback(void *data, enum pipe_reset_status status)
-{
-   struct st_context *st = data;
-
-   assert(status != PIPE_NO_RESET);
-
-   st->reset_status = status;
-   _mesa_set_context_lost_dispatch(st->ctx);
-}
-
-
 void
 st_install_device_reset_callback(struct st_context *st)
 {