aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-06-14 20:14:22 +0200
committerMarek Olšák <[email protected]>2015-07-23 00:59:28 +0200
commit799afadf51ad1ff0775a1bf7b4f3954a8d368b09 (patch)
tree5a343ed93ce9bd6eb40f442ade3e0db4bf30d424 /src
parentdf16e0dd63dfeb7d5086339113ff7d7197010847 (diff)
glsl: allow barrier() in tessellation control shaders
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/glsl/builtin_functions.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}
/** @} */