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

glsl: Add support for parsing #version 140.

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-03-08 13:38:31 -08:00
parent 99cd475cc9
commit ac5a5b3243
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/glsl/glsl_parser.yy
View file

@ -264,6 +264,9 @@ version_statement:
case 130:
supported = state->Const.GLSL_130;
break;
case 140:
supported = state->Const.GLSL_140;
break;
default:
supported = false;
break;

2
src/glsl/glsl_parser_extras.cpp
View file

@ -94,6 +94,8 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *ctx,
&& (ctx->Const.GLSLVersion >= 120);
this->Const.GLSL_130 = (ctx->API == API_OPENGL)
&& (ctx->Const.GLSLVersion >= 130);
this->Const.GLSL_140 = (ctx->API == API_OPENGL)
&& (ctx->Const.GLSLVersion >= 140);
const unsigned lowest_version =
(ctx->API == API_OPENGLES2) || ctx->Extensions.ARB_ES2_compatibility

1
src/glsl/glsl_parser_extras.h
View file

@ -132,6 +132,7 @@ struct _mesa_glsl_parse_state {
unsigned GLSL_110:1;
unsigned GLSL_120:1;
unsigned GLSL_130:1;
unsigned GLSL_140:1;
/*@}*/
} Const;

2
src/mesa/main/getstring.c
View file

@ -53,6 +53,8 @@ shading_language_version(struct gl_context *ctx)
return (const GLubyte *) "1.20";
case 130:
return (const GLubyte *) "1.30";
case 140:
return (const GLubyte *) "1.40";
default:
_mesa_problem(ctx,
"Invalid GLSL version in shading_language_version()");