diff options
| author | Emil Velikov <[email protected]> | 2018-09-05 17:09:10 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-10-03 13:38:05 +0100 |
| commit | fa9df82f67c7dda41bd3c9aab1487ec10fadca96 (patch) | |
| tree | e4da8cd3baee6c27675dd51374f18d7ea4412f05 /src/mesa/main | |
| parent | d081ad2aa25c5673ec1927fca81e6ac65de4b1b1 (diff) | |
mesa: fold _glapi_check_multithread() back into _mesa_make_current
With commit c6c0f947142, back in 2006 Brian removed the
_glapi_check_multithread() call from core mesa - _mesa_make_current.
It was done to remove fairly awkward #ifdef guard which caused subtle
differences in core mesa.
Since that guard is long gone, we can drop the duplication and
reintroduce the call in core.
Note that the function is was missing when using EGL + classic dri HW
drivers. Yet on TLS builds it's a no-op, so we're safe.
Any non TLS users - more or less anything !Linux (or even musl on Linux
up-to semi-recently) may have experienced problems.
v2: don't remove the call from swrast - move it to core (Eric)
Cc: Eric Anholt <[email protected]>
Cc: Brian Paul <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d82015dc936..492f01de957 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1698,7 +1698,10 @@ _mesa_make_current( struct gl_context *newCtx, _mesa_flush(curCtx); } - /* We used to call _glapi_check_multithread() here. Now do it in drivers */ + /* Call this periodically to detect when the user has begun using + * GL rendering from multiple threads. + */ + _glapi_check_multithread(); if (!newCtx) { _glapi_set_dispatch(NULL); /* none current */ |