fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 16:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Less const for glsl_type convenience accessors

Browse source 
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 <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 803f755ede)
This commit is contained in:
Ian Romanick 2013-07-26 13:37:29 -07:00
parent 8a27c824ec
commit 5154c93fa8
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/glsl_types.cpp
View file

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

8
src/glsl/glsl_types.h
View file

@ -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);
/**@}*/
/**