diff options
author | Chris Forbes <[email protected]> | 2014-09-07 19:29:50 +1200 |
---|---|---|
committer | Jordan Justen <[email protected]> | 2015-06-12 15:12:39 -0700 |
commit | 86855365b4059c60a9e1dcc0b7713941a2507bd0 (patch) | |
tree | 644b5c2b33562c34ade8e338af22102adcd60d97 | |
parent | e7f628c2fc5ef42672e3281e224226c3d47b1bac (diff) |
glsl: Add builtin barrier() function
[[email protected]: Add CS support]
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Ben Widawsky <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r-- | src/glsl/builtin_functions.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 97055d85d58..efab2991993 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -410,6 +410,13 @@ fp64(const _mesa_glsl_parse_state *state) return state->has_double(); } +static bool +barrier_supported(const _mesa_glsl_parse_state *state) +{ + return state->stage == MESA_SHADER_COMPUTE; + /* TODO: || stage->state == MESA_SHADER_TESS_CTRL; */ +} + /** @} */ /******************************************************************************/ @@ -654,6 +661,7 @@ private: const glsl_type *stream_type); ir_function_signature *_EndStreamPrimitive(builtin_available_predicate avail, const glsl_type *stream_type); + B0(barrier) B2(textureQueryLod); B1(textureQueryLevels); @@ -1933,6 +1941,7 @@ builtin_builder::create_builtins() _EndStreamPrimitive(gs_streams, glsl_type::uint_type), _EndStreamPrimitive(gs_streams, glsl_type::int_type), NULL); + add_function("barrier", _barrier(), NULL); add_function("textureQueryLOD", _textureQueryLod(glsl_type::sampler1D_type, glsl_type::float_type), @@ -4296,6 +4305,15 @@ builtin_builder::_EndStreamPrimitive(builtin_available_predicate avail, } ir_function_signature * +builtin_builder::_barrier() +{ + MAKE_SIG(glsl_type::void_type, barrier_supported, 0); + + body.emit(new(mem_ctx) ir_barrier()); + return sig; +} + +ir_function_signature * builtin_builder::_textureQueryLod(const glsl_type *sampler_type, const glsl_type *coord_type) { |