OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: rename global/local to private/function memory

Browse Source 
the naming is a bit confusing no matter how you look at it. Within SPIR-V
"global" memory is memory accessible from all threads. glsl "global" memory
normally refers to shader thread private memory declared at global scope. As
we already use "shared" for memory shared across all thrads of a work group
the solution where everybody could be happy with is to rename "global" to
"private" and use "global" later for memory usually stored within system
accessible memory (be it VRAM or system RAM if keeping SVM in mind).
glsl "local" memory is memory only accessible within a function, while SPIR-V
"local" memory is memory accessible within the same workgroup.

v2: rename local to function as well
v3: rename vtn_variable_mode_local as well

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Karol Herbst
2018-10-23 23:26:22 +02:00
parent 401dca1c73
commit d0c6ef2793
33 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -310,16 +310,16 @@ nir_visitor::visit(ir_variable *ir)
case ir_var_auto:
case ir_var_temporary:
if (is_global)
var->data.mode = nir_var_global;
var->data.mode = nir_var_private;
else
var->data.mode = nir_var_local;
var->data.mode = nir_var_function;
break;
case ir_var_function_in:
case ir_var_function_out:
case ir_var_function_inout:
case ir_var_const_in:
var->data.mode = nir_var_local;
var->data.mode = nir_var_function;
break;
case ir_var_shader_in:
@@ -448,7 +448,7 @@ nir_visitor::visit(ir_variable *ir)
var->interface_type = ir->get_interface_type();
if (var->data.mode == nir_var_local)
if (var->data.mode == nir_var_function)
nir_function_impl_add_variable(impl, var);
else
nir_shader_add_variable(shader, var);
@@ -1454,7 +1454,7 @@ nir_visitor::visit(ir_expression *ir)
* sense, we'll just turn it into a load which will probably
* eventually end up as an SSA definition.
*/
assert(this->deref->mode == nir_var_global);
assert(this->deref->mode == nir_var_private);
op = nir_intrinsic_load_deref;
}