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

glsl: Don't return a value from check_builtin_array_max_size

Browse Source 
That last consumer of the return value was changed to not use it by the
previous commit.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2013-03-15 14:33:01 -07:00
parent 666fafc144
commit 2c333a878c
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/ast.h
View File

@@ -864,7 +864,7 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
void void
emit_function(_mesa_glsl_parse_state *state, ir_function *f); emit_function(_mesa_glsl_parse_state *state, ir_function *f);
extern bool extern void
check_builtin_array_max_size(const char *name, unsigned size, check_builtin_array_max_size(const char *name, unsigned size,
YYLTYPE loc, struct _mesa_glsl_parse_state *state); YYLTYPE loc, struct _mesa_glsl_parse_state *state);

5
src/glsl/ast_to_hir.cpp
View File

@@ -904,7 +904,7 @@ get_scalar_boolean_operand(exec_list *instructions,
* If name refers to a builtin array whose maximum allowed size is less than * If name refers to a builtin array whose maximum allowed size is less than
* size, report an error and return true. Otherwise return false. * size, report an error and return true. Otherwise return false.
*/ */
bool void
check_builtin_array_max_size(const char *name, unsigned size, check_builtin_array_max_size(const char *name, unsigned size,
YYLTYPE loc, struct _mesa_glsl_parse_state *state) YYLTYPE loc, struct _mesa_glsl_parse_state *state)
{ {
@@ -918,7 +918,6 @@ check_builtin_array_max_size(const char *name, unsigned size,
_mesa_glsl_error(&loc, state, "`gl_TexCoord' array size cannot " _mesa_glsl_error(&loc, state, "`gl_TexCoord' array size cannot "
"be larger than gl_MaxTextureCoords (%u)\n", "be larger than gl_MaxTextureCoords (%u)\n",
state->Const.MaxTextureCoords); state->Const.MaxTextureCoords);
return true;
} else if (strcmp("gl_ClipDistance", name) == 0 } else if (strcmp("gl_ClipDistance", name) == 0
&& size > state->Const.MaxClipPlanes) { && size > state->Const.MaxClipPlanes) {
/* From section 7.1 (Vertex Shader Special Variables) of the /* From section 7.1 (Vertex Shader Special Variables) of the
@@ -933,9 +932,7 @@ check_builtin_array_max_size(const char *name, unsigned size,
_mesa_glsl_error(&loc, state, "`gl_ClipDistance' array size cannot " _mesa_glsl_error(&loc, state, "`gl_ClipDistance' array size cannot "
"be larger than gl_MaxClipDistances (%u)\n", "be larger than gl_MaxClipDistances (%u)\n",
state->Const.MaxClipPlanes); state->Const.MaxClipPlanes);
return true;
} }
return false;
} }
/** /**