From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 14 Jun 2015 18:14:22 +0000 (+0200)
Subject: glsl: allow barrier() in tessellation control shaders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=799afadf51ad1ff0775a1bf7b4f3954a8d368b09;p=mesa.git

glsl: allow barrier() in tessellation control shaders

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index efab2991993..2175c66cbd7 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -413,8 +413,8 @@ fp64(const _mesa_glsl_parse_state *state)
 static bool
 barrier_supported(const _mesa_glsl_parse_state *state)
 {
-   return state->stage == MESA_SHADER_COMPUTE;
-   /* TODO: || stage->state == MESA_SHADER_TESS_CTRL; */
+   return state->stage == MESA_SHADER_COMPUTE ||
+          state->stage == MESA_SHADER_TESS_CTRL;
 }
 
 /** @} */