From: Tom Stellard <thomas.stellard@amd.com>
Date: Wed, 16 Nov 2016 21:21:15 +0000 (+0000)
Subject: mesa: Add missing call to _mesa_unlock_debug_state(ctx); v2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=929fcee47e46781c57f2a354ce0a013915c033d1;p=mesa.git

mesa: Add missing call to _mesa_unlock_debug_state(ctx); v2

cd724208d3e1e3307f84a794f2c1fc83b69ccf8a added a call to
_mesa_lock_debug_state(ctx) but wasn't unlocking the debug state.

This fixes a hang in glsl-fs-loop piglit test with MESA_DEBUG=context.

v2:
  - Remove unrelated changes.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c
index 4e9209b2377..48dbbb31e5a 100644
--- a/src/mesa/main/debug_output.c
+++ b/src/mesa/main/debug_output.c
@@ -1282,12 +1282,14 @@ _mesa_init_debug_output(struct gl_context *ctx)
        */
       struct gl_debug_state *debug = _mesa_lock_debug_state(ctx);
       if (!debug) {
-         return;
+         goto done;
       }
       debug->DebugOutput = GL_TRUE;
       debug->LogToStderr = GL_TRUE;
       ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT;
    }
+done:
+   _mesa_unlock_debug_state(ctx);
 }