fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: use ctx->GLThread.enabled now that it's correct

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14000>
This commit is contained in:
Marek Olšák 2021-11-29 14:04:42 -05:00
parent d052612317
commit e49d9c0fed
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/main/dlist.c
View file

@ -13512,7 +13512,7 @@ _mesa_NewList(GLuint name, GLenum mode)
ctx->CurrentServerDispatch = ctx->Save;
_glapi_set_dispatch(ctx->CurrentServerDispatch);
if (ctx->MarshalExec == NULL) {
if (!ctx->GLThread.enabled) {
ctx->CurrentClientDispatch = ctx->CurrentServerDispatch;
}
}
@ -13724,7 +13724,7 @@ _mesa_EndList(void)
ctx->CurrentServerDispatch = ctx->Exec;
_glapi_set_dispatch(ctx->CurrentServerDispatch);
if (ctx->MarshalExec == NULL) {
if (!ctx->GLThread.enabled) {
ctx->CurrentClientDispatch = ctx->CurrentServerDispatch;
}
}
@ -13766,7 +13766,7 @@ _mesa_CallList(GLuint list)
if (save_compile_flag) {
ctx->CurrentServerDispatch = ctx->Save;
_glapi_set_dispatch(ctx->CurrentServerDispatch);
if (ctx->MarshalExec == NULL) {
if (!ctx->GLThread.enabled) {
ctx->CurrentClientDispatch = ctx->CurrentServerDispatch;
}
}
@ -13952,7 +13952,7 @@ _mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
if (save_compile_flag) {
ctx->CurrentServerDispatch = ctx->Save;
_glapi_set_dispatch(ctx->CurrentServerDispatch);
if (ctx->MarshalExec == NULL) {
if (!ctx->GLThread.enabled) {
ctx->CurrentClientDispatch = ctx->CurrentServerDispatch;
}
}

2
src/mesa/state_tracker/st_draw.c
View file

@ -109,7 +109,7 @@ prepare_draw(struct st_context *st, struct gl_context *ctx, uint64_t state_mask,
*/
if (unlikely(st->pin_thread_counter != ST_L3_PINNING_DISABLED &&
/* no glthread */
ctx->CurrentClientDispatch != ctx->MarshalExec &&
!ctx->GLThread.enabled &&
/* do it occasionally */
++st->pin_thread_counter % 512 == 0)) {
st->pin_thread_counter = 0;

4
src/mesa/vbo/vbo_exec_api.c
View file

@ -849,7 +849,7 @@ _mesa_Begin(GLenum mode)
/* We may have been called from a display list, in which case we should
* leave dlist.c's dispatch table in place.
*/
if (ctx->CurrentClientDispatch == ctx->MarshalExec) {
if (ctx->GLThread.enabled) {
ctx->CurrentServerDispatch = ctx->Exec;
} else if (ctx->CurrentClientDispatch == ctx->OutsideBeginEnd) {
ctx->CurrentClientDispatch = ctx->Exec;
@ -908,7 +908,7 @@ _mesa_End(void)
ctx->Exec = ctx->OutsideBeginEnd;
if (ctx->CurrentClientDispatch == ctx->MarshalExec) {
if (ctx->GLThread.enabled) {
ctx->CurrentServerDispatch = ctx->Exec;
} else if (ctx->CurrentClientDispatch == ctx->BeginEnd) {
ctx->CurrentClientDispatch = ctx->Exec;