From: Tapani Pälli <tapani.palli@intel.com>
Date: Mon, 20 Nov 2017 06:31:40 +0000 (+0200)
Subject: mesa: add DisjointOperation to gl_shared_state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80d96ca4c862dcf275b93e603916193094c59d6e;p=mesa.git

mesa: add DisjointOperation to gl_shared_state

This state will be used by EXT_disjoint_timer_query. As first
usage, patch sets DisjointOperation true when gpu reset happens.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b372921e9f0..0aac49402e8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3310,6 +3310,14 @@ struct gl_shared_state
    /** EXT_external_objects */
    struct _mesa_HashTable *MemoryObjects;
 
+   /**
+    * Some context in this share group was affected by a disjoint
+    * operation. This operation can be anything that has effects on
+    * values of timer queries in such manner that they become invalid for
+    * performance metrics. As example gpu reset, counter overflow or gpu
+    * frequency changes.
+    */
+   bool DisjointOperation;
 };
 
 
diff --git a/src/mesa/main/robustness.c b/src/mesa/main/robustness.c
index a61c07f125f..e7d7007da48 100644
--- a/src/mesa/main/robustness.c
+++ b/src/mesa/main/robustness.c
@@ -145,6 +145,7 @@ _mesa_GetGraphicsResetStatusARB( void )
        */
       if (status != GL_NO_ERROR) {
          ctx->Shared->ShareGroupReset = true;
+         ctx->Shared->DisjointOperation = true;
       } else if (ctx->Shared->ShareGroupReset && !ctx->ShareGroupReset) {
          status = GL_INNOCENT_CONTEXT_RESET_ARB;
       }