From da3ca69afadb142c1591c75c2bfd345c8d4337de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 22 Jan 2019 09:37:58 +0200 Subject: [PATCH] nir: cleanup glsl_get_struct_field_offset, glsl_get_explicit_stride MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Take away const qualifier from return type of these functions as -Wignored-qualifiers points out it is ignored for these cases. Signed-off-by: Tapani Pälli Reviewed-by: Kenneth Graunke Reviewed-by: Bas Nieuwenhuizen --- src/compiler/nir_types.cpp | 4 ++-- src/compiler/nir_types.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index 356252276b4..7ea5ef9b831 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -71,14 +71,14 @@ glsl_get_struct_field(const glsl_type *type, unsigned index) return type->fields.structure[index].type; } -const int +int glsl_get_struct_field_offset(const struct glsl_type *type, unsigned index) { return type->fields.structure[index].offset; } -const unsigned +unsigned glsl_get_explicit_stride(const struct glsl_type *type) { return type->explicit_stride; diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h index d17671b9400..15891ce43be 100644 --- a/src/compiler/nir_types.h +++ b/src/compiler/nir_types.h @@ -46,10 +46,10 @@ const char *glsl_get_type_name(const struct glsl_type *type); const struct glsl_type *glsl_get_struct_field(const struct glsl_type *type, unsigned index); -const int glsl_get_struct_field_offset(const struct glsl_type *type, - unsigned index); +int glsl_get_struct_field_offset(const struct glsl_type *type, + unsigned index); -const unsigned glsl_get_explicit_stride(const struct glsl_type *type); +unsigned glsl_get_explicit_stride(const struct glsl_type *type); const struct glsl_type *glsl_get_array_element(const struct glsl_type *type); const struct glsl_type *glsl_without_array(const struct glsl_type *type); const struct glsl_type *glsl_without_array_or_matrix(const struct glsl_type *type); -- 2.30.2