diff options
| author | Timothy Arceri <[email protected]> | 2019-03-05 16:07:12 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2019-03-06 13:10:02 +1100 |
| commit | 54522d05065d6ff1b37005c91e503b4d4f11ed67 (patch) | |
| tree | 62d28c6db61428cd5b0c9b257005fedd10d35571 /src/mesa | |
| parent | e16a27fcf867c8be5ba94470d78f76348f1e8c07 (diff) | |
nir: rename glsl_type_is_struct() -> glsl_type_is_struct_or_ifc()
Replace done using:
find ./src -type f -exec sed -i -- \
's/glsl_type_is_struct(/glsl_type_is_struct_or_ifc(/g' {} \;
Acked-by: Karol Herbst <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 256fdd8fc79..7e13b2ffe19 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -119,7 +119,7 @@ count_uniform_storage_slots(const struct glsl_type *type) * type is a composite type or an array where each element occupies * more than one slot than we need to recursively process it. */ - if (glsl_type_is_struct(type)) { + if (glsl_type_is_struct_or_ifc(type)) { unsigned location_count = 0; for (unsigned i = 0; i < glsl_get_length(type); i++) { @@ -135,7 +135,7 @@ count_uniform_storage_slots(const struct glsl_type *type) const struct glsl_type *element_type = glsl_get_array_element(type); if (glsl_type_is_array(element_type) || - glsl_type_is_struct(element_type)) { + glsl_type_is_struct_or_ifc(element_type)) { unsigned element_count = count_uniform_storage_slots(element_type); return element_count * glsl_get_length(type); } diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index dab98f18604..8ed7059a82e 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -273,7 +273,7 @@ st_nir_assign_uniform_locations(struct gl_context *ctx, */ unsigned comps; - if (glsl_type_is_struct(type)) { + if (glsl_type_is_struct_or_ifc(type)) { comps = 4; } else { comps = glsl_get_vector_elements(type); @@ -522,7 +522,7 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog, const struct glsl_type *type = glsl_without_array(var->type); for (unsigned int i = 0; i < var->num_state_slots; i++) { unsigned comps; - if (glsl_type_is_struct(type)) { + if (glsl_type_is_struct_or_ifc(type)) { /* Builtin struct require specical handling for now we just * make all members vec4. See st_nir_lower_builtin. */ |