OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xlib: switch to c11 mutex functions

Browse Source 
The _glthread_LOCK/UNLOCK_MUTEX() macros are just wrappers around
the c11 mutex functions.  Let's start getting rid of those wrappers.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2014-03-01 10:21:07 -07:00
parent 657436da7e
commit 2706db701d
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesa/drivers/x11/xm_api.c
View File

@@ -74,7 +74,6 @@
#include "main/teximage.h"
#include "main/version.h"
#include "main/vtxfmt.h"
#include "glapi/glthread.h"
#include "swrast/swrast.h"
#include "swrast/s_renderbuffer.h"
#include "swrast_setup/swrast_setup.h"
@@ -88,7 +87,7 @@
/**
* Global X driver lock
*/
_glthread_Mutex _xmesa_lock;
mtx_t _xmesa_lock;
@@ -248,10 +247,10 @@ xmesa_get_window_size(XMesaDisplay *dpy, XMesaBuffer b,
{
Status stat;
_glthread_LOCK_MUTEX(_xmesa_lock);
mtx_lock(&_xmesa_lock);
XSync(b->xm_visual->display, 0); /* added for Chromium */
stat = get_drawable_size(dpy, b->frontxrb->pixmap, width, height);
_glthread_UNLOCK_MUTEX(_xmesa_lock);
mtx_unlock(&_xmesa_lock);
if (!stat) {
/* probably querying a window that's recently been destroyed */
@@ -892,7 +891,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
TNLcontext *tnl;
if (firstTime) {
_glthread_INIT_MUTEX(_xmesa_lock);
mtx_init(&_xmesa_lock, mtx_plain);
firstTime = GL_FALSE;
}
@@ -1336,28 +1335,28 @@ void XMesaSwapBuffers( XMesaBuffer b )
/* Copy Ximage (back buf) from client memory to server window */
#if defined(USE_XSHM)
if (b->shm) {
/*_glthread_LOCK_MUTEX(_xmesa_lock);*/
/*mtx_lock(&_xmesa_lock);*/
XShmPutImage( b->xm_visual->display, b->frontxrb->drawable,
b->swapgc,
b->backxrb->ximage, 0, 0,
0, 0, b->mesa_buffer.Width, b->mesa_buffer.Height,
False );
/*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
/*mtx_unlock(&_xmesa_lock);*/
}
else
#endif
{
/*_glthread_LOCK_MUTEX(_xmesa_lock);*/
/*mtx_lock(&_xmesa_lock);*/
XMesaPutImage( b->xm_visual->display, b->frontxrb->drawable,
b->swapgc,
b->backxrb->ximage, 0, 0,
0, 0, b->mesa_buffer.Width, b->mesa_buffer.Height );
/*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
/*mtx_unlock(&_xmesa_lock);*/
}
}
else if (b->backxrb->pixmap) {
/* Copy pixmap (back buf) to window (front buf) on server */
/*_glthread_LOCK_MUTEX(_xmesa_lock);*/
/*mtx_lock(&_xmesa_lock);*/
XMesaCopyArea( b->xm_visual->display,
b->backxrb->pixmap, /* source drawable */
b->frontxrb->drawable, /* dest. drawable */
@@ -1365,7 +1364,7 @@ void XMesaSwapBuffers( XMesaBuffer b )
0, 0, b->mesa_buffer.Width, b->mesa_buffer.Height,
0, 0 /* dest region */
);
/*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
/*mtx_unlock(&_xmesa_lock);*/
}
}
XSync( b->xm_visual->display, False );

4
src/mesa/drivers/x11/xm_dd.c
View File

@@ -54,9 +54,9 @@ finish_or_flush( struct gl_context *ctx )
{
const XMesaContext xmesa = XMESA_CONTEXT(ctx);
if (xmesa) {
_glthread_LOCK_MUTEX(_xmesa_lock);
mtx_lock(&_xmesa_lock);
XSync( xmesa->display, False );
_glthread_UNLOCK_MUTEX(_xmesa_lock);
mtx_unlock(&_xmesa_lock);
}
}

3
src/mesa/drivers/x11/xmesaP.h
View File

@@ -27,12 +27,13 @@
#define XMESAP_H
#include "c11/threads.h"
#include "xmesa.h"
#include "main/mtypes.h"
#include "swrast/s_context.h"
extern _glthread_Mutex _xmesa_lock;
extern mtx_t _xmesa_lock;
extern XMesaBuffer XMesaBufferList;