diff options
| author | Iago Toral Quiroga <[email protected]> | 2015-04-23 11:06:12 +0200 |
|---|---|---|
| committer | Samuel Iglesias Gonsalvez <[email protected]> | 2015-09-25 08:39:22 +0200 |
| commit | 2cacebaad3da88853e9b0d19522d24e11a7f4f91 (patch) | |
| tree | edfa15bf9e43dc14a490700aedc77bd380ee7632 | |
| parent | 586142658e2927a68ce02c44d3bdcaa628cac717 (diff) | |
glsl: Rename atomic counter functions
Shader Storage Buffer Object will add new atomic functions that are not
associated with counters, so better have atomic counter-specific functions
explicitly include the word "counter" in their names.
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 7e77c9321b3..ede9dd867df 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -737,9 +737,9 @@ private: B1(interpolateAtOffset) B1(interpolateAtSample) - ir_function_signature *_atomic_intrinsic(builtin_available_predicate avail); - ir_function_signature *_atomic_op(const char *intrinsic, - builtin_available_predicate avail); + ir_function_signature *_atomic_counter_intrinsic(builtin_available_predicate avail); + ir_function_signature *_atomic_counter_op(const char *intrinsic, + builtin_available_predicate avail); B1(min3) B1(max3) @@ -872,13 +872,13 @@ void builtin_builder::create_intrinsics() { add_function("__intrinsic_atomic_read", - _atomic_intrinsic(shader_atomic_counters), + _atomic_counter_intrinsic(shader_atomic_counters), NULL); add_function("__intrinsic_atomic_increment", - _atomic_intrinsic(shader_atomic_counters), + _atomic_counter_intrinsic(shader_atomic_counters), NULL); add_function("__intrinsic_atomic_predecrement", - _atomic_intrinsic(shader_atomic_counters), + _atomic_counter_intrinsic(shader_atomic_counters), NULL); add_image_functions(false); @@ -2541,16 +2541,16 @@ builtin_builder::create_builtins() NULL); add_function("atomicCounter", - _atomic_op("__intrinsic_atomic_read", - shader_atomic_counters), + _atomic_counter_op("__intrinsic_atomic_read", + shader_atomic_counters), NULL); add_function("atomicCounterIncrement", - _atomic_op("__intrinsic_atomic_increment", - shader_atomic_counters), + _atomic_counter_op("__intrinsic_atomic_increment", + shader_atomic_counters), NULL); add_function("atomicCounterDecrement", - _atomic_op("__intrinsic_atomic_predecrement", - shader_atomic_counters), + _atomic_counter_op("__intrinsic_atomic_predecrement", + shader_atomic_counters), NULL); add_function("min3", @@ -4841,7 +4841,7 @@ builtin_builder::_interpolateAtSample(const glsl_type *type) } ir_function_signature * -builtin_builder::_atomic_intrinsic(builtin_available_predicate avail) +builtin_builder::_atomic_counter_intrinsic(builtin_available_predicate avail) { ir_variable *counter = in_var(glsl_type::atomic_uint_type, "counter"); MAKE_INTRINSIC(glsl_type::uint_type, avail, 1, counter); @@ -4849,8 +4849,8 @@ builtin_builder::_atomic_intrinsic(builtin_available_predicate avail) } ir_function_signature * -builtin_builder::_atomic_op(const char *intrinsic, - builtin_available_predicate avail) +builtin_builder::_atomic_counter_op(const char *intrinsic, + builtin_available_predicate avail) { ir_variable *counter = in_var(glsl_type::atomic_uint_type, "atomic_counter"); MAKE_SIG(glsl_type::uint_type, avail, 1, counter); |