KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: Remove the remains of GLX_MESA_multithread_makecurrent 

This hasn't actually been exported for a while. I think I probably broke
this in

    commit 63a6b719d9
    Author: Adam Jackson <ajax@redhat.com>
    Date:   Tue Dec 5 11:10:09 2017 -0500

        glx: GLX_MESA_multithread_makecurrent is direct-only

in which I made it no longer default to having client support, but
failed to instruct dri{2,3,sw} to enable it. In any case, it was never
widely used, there is no EGL equivalent, and we've had zero complaints
about it getting nerfed.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17473>
This commit is contained in:
Adam Jackson 2022-07-11 16:11:53 -04:00 committed by Marge Bot
parent d528289c74
commit 92b2e479b8
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/glx/glxclient.h
View File

@ -424,11 +424,6 @@ struct glx_context
int server_minor; /**< Minor version number. */
/*@} */
/**
* Number of threads we're currently current in.
*/
unsigned long thread_refcount;
/**
* GLX_ARB_create_context_no_error setting for this context.
* This needs to be kept here to enforce shared context rules.

17
src/glx/glxcurrent.c
View File

@ -202,10 +202,8 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
}
if (oldGC != &dummyContext) {
if (--oldGC->thread_refcount == 0) {
oldGC->vtable->unbind(oldGC, gc);
oldGC->currentDpy = NULL;
}
oldGC->vtable->unbind(oldGC, gc);
oldGC->currentDpy = NULL;
}
if (gc) {
@ -224,18 +222,15 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
return GL_FALSE;
}
if (gc->thread_refcount == 0) {
gc->currentDpy = dpy;
gc->currentDrawable = draw;
gc->currentReadable = read;
}
gc->thread_refcount++;
gc->currentDpy = dpy;
gc->currentDrawable = draw;
gc->currentReadable = read;
__glXSetCurrentContext(gc);
} else {
__glXSetCurrentContextNull();
}
if (oldGC->thread_refcount == 0 && oldGC != &dummyContext && oldGC->xid == None) {
if (oldGC->currentDpy == NULL && oldGC != &dummyContext && oldGC->xid == None) {
/* We are switching away from a context that was
* previously destroyed, so we need to free the memory
* for the old handle. */

1
src/glx/glxextensions.c
View File

@ -105,7 +105,6 @@ static const struct extension_info known_glx_extensions[] = {
{ GLX(ATI_pixel_format_float), N, N },
{ GLX(INTEL_swap_event), N, N },
{ GLX(MESA_copy_sub_buffer), N, N },
{ GLX(MESA_multithread_makecurrent), N, Y },
{ GLX(MESA_query_renderer), N, Y },
{ GLX(MESA_swap_control), N, Y },
{ GLX(NV_float_buffer), N, N },

1
src/glx/glxextensions.h
View File

@ -61,7 +61,6 @@ enum
INTEL_swap_event_bit,
MESA_copy_sub_buffer_bit,
MESA_depth_float_bit,
MESA_multithread_makecurrent_bit,
MESA_query_renderer_bit,
MESA_swap_control_bit,
MESA_swap_frame_usage_bit,