Mesa (radeon-rewrite): radeon: on update drawable don' t firevertices as it might be call from GetLock

Jerome Glisse glisse at kemper.freedesktop.org
Mon May 25 14:07:32 UTC 2009


Module: Mesa
Branch: radeon-rewrite
Commit: 9dee2f20a204f375eb4321092cf5dea6476c1c24
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9dee2f20a204f375eb4321092cf5dea6476c1c24

Author: Jerome Glisse <glisse at freedesktop.org>
Date:   Mon May 25 16:05:45 2009 +0200

radeon: on update drawable don't firevertices as it might be call from GetLock

To avoid locking bug we shouldn't not call firevertices from this path
as it's call from radeon get lock.

---

 src/mesa/drivers/dri/radeon/radeon_common.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index e2e0ba0..466eda7 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -769,9 +769,7 @@ void radeon_draw_buffer(GLcontext *ctx, struct gl_framebuffer *fb)
 
 	/* Set state we know depends on drawable parameters:
 	 */
-	if (ctx->Driver.Scissor)
-		ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
-				    ctx->Scissor.Width, ctx->Scissor.Height);
+	radeonUpdateScissor(ctx);
 	radeon->NewGLState |= _NEW_SCISSOR;
 
 	if (ctx->Driver.DepthRange)




More information about the mesa-commit mailing list