projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/gen6: Stencil/hiz needs an offset for LOD > 0
[mesa.git]
/
src
/
mesa
/
drivers
/
x11
/
xm_dd.c
diff --git
a/src/mesa/drivers/x11/xm_dd.c
b/src/mesa/drivers/x11/xm_dd.c
index c0dcb61e234ebd4955d67a0a7f1d99857e951fc1..10634fe73c0e76c2fbe7dbbc3c69f01d252fc543 100644
(file)
--- a/
src/mesa/drivers/x11/xm_dd.c
+++ b/
src/mesa/drivers/x11/xm_dd.c
@@
-54,9
+54,9
@@
finish_or_flush( struct gl_context *ctx )
{
const XMesaContext xmesa = XMESA_CONTEXT(ctx);
if (xmesa) {
{
const XMesaContext xmesa = XMESA_CONTEXT(ctx);
if (xmesa) {
-
_glthread_LOCK_MUTEX(
_xmesa_lock);
+
mtx_lock(&
_xmesa_lock);
XSync( xmesa->display, False );
XSync( xmesa->display, False );
-
_glthread_UNLOCK_MUTEX(
_xmesa_lock);
+
mtx_unlock(&
_xmesa_lock);
}
}
}
}
@@
-841,7
+841,7
@@
xmesa_init_driver_functions( XMesaVisual xmvisual,
if (TEST_META_FUNCS) {
driver->Clear = _mesa_meta_Clear;
driver->CopyPixels = _mesa_meta_CopyPixels;
if (TEST_META_FUNCS) {
driver->Clear = _mesa_meta_Clear;
driver->CopyPixels = _mesa_meta_CopyPixels;
- driver->BlitFramebuffer = _mesa_meta_BlitFramebuffer;
+ driver->BlitFramebuffer = _mesa_meta_
and_swrast_
BlitFramebuffer;
driver->DrawPixels = _mesa_meta_DrawPixels;
driver->Bitmap = _mesa_meta_Bitmap;
}
driver->DrawPixels = _mesa_meta_DrawPixels;
driver->Bitmap = _mesa_meta_Bitmap;
}