fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 17:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glsl: Fix up GL_ARB_compute_shader for GLSL ES 3.1

Browse source 
GL_ARB_compute_shader is limited for GLSL version 430.
This enables for GLSL ES version 310.

V2: Updated error string to also include GLSL 3.10

Signed-off-by: Marta Lofstedt <marta.lofstedt@linux.intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Marta Lofstedt 2015-08-10 13:04:42 +02:00 • committed by Tapani Pälli
parent 3df7856b46
commit 2438e2fe32
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/glsl_parser.yy
View file

@ -1519,11 +1519,10 @@ layout_qualifier_id:
"invalid %s of %d specified",
local_size_qualifiers[i], $3);
YYERROR;
} else if (!state->is_version(430, 0) &&
!state->ARB_compute_shader_enable) {
} else if (!state->has_compute_shader()) {
_mesa_glsl_error(& @3, state,
"%s qualifier requires GLSL 4.30 or "
"ARB_compute_shader",
"GLSL ES 3.10 or ARB_compute_shader",
local_size_qualifiers[i]);
YYERROR;
} else {

5
src/glsl/glsl_parser_extras.h
View file

@ -236,6 +236,11 @@ struct _mesa_glsl_parse_state {
return ARB_shading_language_420pack_enable || is_version(420, 0);
}
bool has_compute_shader() const
{
return ARB_compute_shader_enable || is_version(430, 310);
}
void process_version_directive(YYLTYPE *locp, int version,
const char *ident);