From 803f755edeabd1b0af3d8f4ebf2005333e152ad4 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 26 Jul 2013 13:37:29 -0700 Subject: [PATCH] glsl: Less const for glsl_type convenience accessors The second 'const' says that the pointer itself is constant. This in unenforcible in C++, so GCC emits a warning (see) below for each of these functions in every file that includes glsl_types.h. It's a lot of warning spam. ../../../src/glsl/glsl_types.h:176:58: warning: type qualifiers ignored on function return type [-Wignored-qualifiers] Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke Cc: mesa-stable@lists.freedesktop.org --- src/glsl/glsl_types.cpp | 8 ++++---- src/glsl/glsl_types.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 9d3691b54fe..8324b8ade7a 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -281,7 +281,7 @@ glsl_type::glsl_type(const glsl_type *array, unsigned length) : } -const glsl_type *const +const glsl_type * glsl_type::vec(unsigned components) { if (components == 0 || components > 4) @@ -294,7 +294,7 @@ glsl_type::vec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::ivec(unsigned components) { if (components == 0 || components > 4) @@ -307,7 +307,7 @@ glsl_type::ivec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::uvec(unsigned components) { if (components == 0 || components > 4) @@ -320,7 +320,7 @@ glsl_type::uvec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::bvec(unsigned components) { if (components == 0 || components > 4) diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index cb5208029f7..8172309a763 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -170,10 +170,10 @@ struct glsl_type { * Convenience accessors for vector types (shorter than get_instance()). * @{ */ - static const glsl_type *const vec(unsigned components); - static const glsl_type *const ivec(unsigned components); - static const glsl_type *const uvec(unsigned components); - static const glsl_type *const bvec(unsigned components); + static const glsl_type *vec(unsigned components); + static const glsl_type *ivec(unsigned components); + static const glsl_type *uvec(unsigned components); + static const glsl_type *bvec(unsigned components); /**@}*/ /** -- 2.30.2