fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Rename atomic counter functions

Browse source 
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 <t_arceri@yahoo.com.au>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Iago Toral Quiroga 2015-04-23 11:06:12 +02:00 • committed by Samuel Iglesias Gonsalvez
parent 586142658e
commit 2cacebaad3
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/glsl/builtin_functions.cpp
View file

@ -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);