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

main, glsl: Bump max known desktop glsl version to 4.50

Browse source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jordan Justen 2014-11-24 13:56:29 -08:00
parent 307d22abb0
commit cd1b0f04be
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/glsl/glsl_parser_extras.cpp
View file

@ -51,7 +51,7 @@ glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version)
static const unsigned known_desktop_glsl_versions[] =
{ 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440 };
{ 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450 };
_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
@ -142,6 +142,12 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
this->user_structures = NULL;
this->num_user_structures = 0;
/* supported_versions should be large enough to support the known desktop
* GLSL versions plus 2 GLES versions (ES2 & ES3)
*/
STATIC_ASSERT((ARRAY_SIZE(known_desktop_glsl_versions) + 2) ==
ARRAY_SIZE(this->supported_versions));
/* Populate the list of supported GLSL versions */
/* FINISHME: Once the OpenGL 3.0 'forward compatible' context or
* the OpenGL 3.2 Core context is supported, this logic will need
@ -169,8 +175,6 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
this->supported_versions[this->num_supported_versions].es = true;
this->num_supported_versions++;
}
assert(this->num_supported_versions
<= ARRAY_SIZE(this->supported_versions));
/* Create a string for use in error messages to tell the user which GLSL
* versions are supported.

2
src/glsl/glsl_parser_extras.h
View file

@ -217,7 +217,7 @@ struct _mesa_glsl_parse_state {
struct {
unsigned ver;
bool es;
} supported_versions[12];
} supported_versions[14];
bool es_shader;
unsigned language_version;

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

@ -58,6 +58,12 @@ shading_language_version(struct gl_context *ctx)
return (const GLubyte *) "4.10";
case 420:
return (const GLubyte *) "4.20";
case 430:
return (const GLubyte *) "4.30";
case 440:
return (const GLubyte *) "4.40";
case 450:
return (const GLubyte *) "4.50";
default:
_mesa_problem(ctx,
"Invalid GLSL version in shading_language_version()");