Module: Mesa Branch: main Commit: 49cc6edf840394d28b1d9a726eb82f66ac35c305 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49cc6edf840394d28b1d9a726eb82f66ac35c305
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Thu Apr 13 10:43:07 2023 +0200 mesa: remove unused bools ShareGroupReset and DisjointOperation where only set in the code removed in the previous commit. Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22290> --- src/mesa/main/get.c | 6 +----- src/mesa/main/mtypes.h | 20 -------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index ad90c44987d..02aafff7d6f 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1333,11 +1333,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu /* GL_EXT_disjoint_timer_query */ case GL_GPU_DISJOINT_EXT: { - simple_mtx_lock(&ctx->Shared->Mutex); - v->value_int = ctx->Shared->DisjointOperation; - /* Reset state as expected by the spec. */ - ctx->Shared->DisjointOperation = false; - simple_mtx_unlock(&ctx->Shared->Mutex); + v->value_int = 0; } break; /* GL_ARB_sample_locations */ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 29c95c036c1..386927ac586 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2482,32 +2482,12 @@ struct gl_shared_state */ simple_mtx_t ShaderIncludeMutex; - /** - * Some context in this share group was affected by a GPU reset - * - * On the next call to \c glGetGraphicsResetStatus, contexts that have not - * been affected by a GPU reset must also return - * \c GL_INNOCENT_CONTEXT_RESET_ARB. - * - * Once this field becomes true, it is never reset to false. - */ - bool ShareGroupReset; - /** EXT_external_objects */ struct _mesa_HashTable *MemoryObjects; /** EXT_semaphore */ struct _mesa_HashTable *SemaphoreObjects; - /** - * 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; - /** * Whether at least one image has been imported or exported, excluding * the default framebuffer. If this is false, glFlush can be executed
