From f0857fe87b6e8985cb1d0ec46c1a358c4cf37c29 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 16 Oct 2017 11:59:31 +1100 Subject: mesa: use simple mtx in core mesa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Results from x11perf -copywinwin10 on Eric's SKL: 4.33338% ± 0.905054% (n=40) Reviewed-by: Marek Olšák Reviewed-by: Nicolai Hähnle Tested-by: Yogesh Marathe --- src/mesa/main/fbobject.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/mesa/main/fbobject.c') diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 9a2c7ebbcf7..81165630d0d 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -89,9 +89,9 @@ delete_dummy_framebuffer(struct gl_framebuffer *fb) void _mesa_init_fbobjects(struct gl_context *ctx) { - mtx_init(&DummyFramebuffer.Mutex, mtx_plain); - mtx_init(&DummyRenderbuffer.Mutex, mtx_plain); - mtx_init(&IncompleteFramebuffer.Mutex, mtx_plain); + simple_mtx_init(&DummyFramebuffer.Mutex, mtx_plain); + simple_mtx_init(&DummyRenderbuffer.Mutex, mtx_plain); + simple_mtx_init(&IncompleteFramebuffer.Mutex, mtx_plain); DummyFramebuffer.Delete = delete_dummy_framebuffer; DummyRenderbuffer.Delete = delete_dummy_renderbuffer; IncompleteFramebuffer.Delete = delete_dummy_framebuffer; @@ -558,7 +558,7 @@ _mesa_FramebufferRenderbuffer_sw(struct gl_context *ctx, { struct gl_renderbuffer_attachment *att; - mtx_lock(&fb->Mutex); + simple_mtx_lock(&fb->Mutex); att = get_attachment(ctx, fb, attachment, NULL); assert(att); @@ -584,7 +584,7 @@ _mesa_FramebufferRenderbuffer_sw(struct gl_context *ctx, invalidate_framebuffer(fb); - mtx_unlock(&fb->Mutex); + simple_mtx_unlock(&fb->Mutex); } @@ -3296,7 +3296,7 @@ _mesa_framebuffer_texture(struct gl_context *ctx, struct gl_framebuffer *fb, { FLUSH_VERTICES(ctx, _NEW_BUFFERS); - mtx_lock(&fb->Mutex); + simple_mtx_lock(&fb->Mutex); if (texObj) { if (attachment == GL_DEPTH_ATTACHMENT && texObj == fb->Attachment[BUFFER_STENCIL].Texture && @@ -3355,7 +3355,7 @@ _mesa_framebuffer_texture(struct gl_context *ctx, struct gl_framebuffer *fb, invalidate_framebuffer(fb); - mtx_unlock(&fb->Mutex); + simple_mtx_unlock(&fb->Mutex); } -- cgit v1.2.3