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

glsl: Refactor #version validation to be more future-proof.

Browse source 
The previous implementation required a flag in _mesa_glsl_parse_state
and line of code to initialize it for every version of the shading
language we intend to support.  As we look to add 150, 330, 400, 410,
420, and beyond, this gets rather unwieldy.

This patch retains the switch statement (to reject, say, #version 111),
but removes all the bits.  Code to check for ctx->API == API_OPENGL_CORE
could easily be added to the 110 and 120 cases to reject those.

v2: Use _mesa_is_desktop_gl to preserve the existing behavior in the
    presence of the new API_OPENGL_CORE enumeration.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
This commit is contained in:
Kenneth Graunke 2012-07-31 01:28:35 -07:00
parent 19bd5936af
commit 3a90dc22d1
3 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/glsl/glsl_parser.yy
View file

@ -29,6 +29,7 @@
#include "ast.h"
#include "glsl_parser_extras.h"
#include "glsl_types.h"
#include "main/context.h"
#define YYLEX_PARAM state->scanner
@ -259,19 +260,25 @@ version_statement:
switch ($2) {
case 100:
state->es_shader = true;
supported = state->Const.GLSL_100ES;
supported = state->ctx->API == API_OPENGLES2 ||
state->ctx->Extensions.ARB_ES2_compatibility;
break;
case 110:
supported = state->Const.GLSL_110;
break;
case 120:
supported = state->Const.GLSL_120;
break;
/* FINISHME: Once the OpenGL 3.0 'forward compatible' context or
* the OpenGL 3.2 Core context is supported, this logic will need
* change. Older versions of GLSL are no longer supported
* outside the compatibility contexts of 3.x.
*/
case 130:
supported = state->Const.GLSL_130;
break;
case 140:
supported = state->Const.GLSL_140;
case 150:
case 330:
case 400:
case 410:
case 420:
supported = _mesa_is_desktop_gl(state->ctx) &&
((unsigned) $2) <= state->ctx->Const.GLSLVersion;
break;
default:
supported = false;

14
src/glsl/glsl_parser_extras.cpp
View file

@ -85,23 +85,11 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;
/* Note: Once the OpenGL 3.0 'forward compatible' context or the OpenGL 3.2
* Core context is supported, this logic will need change. Older versions of
* GLSL are no longer supported outside the compatibility contexts of 3.x.
*/
this->Const.GLSL_100ES = (ctx->API == API_OPENGLES2)
|| ctx->Extensions.ARB_ES2_compatibility;
bool is_desktop_gl = _mesa_is_desktop_gl(ctx);
this->Const.GLSL_110 = is_desktop_gl;
this->Const.GLSL_120 = is_desktop_gl && (ctx->Const.GLSLVersion >= 120);
this->Const.GLSL_130 = is_desktop_gl && (ctx->Const.GLSLVersion >= 130);
this->Const.GLSL_140 = is_desktop_gl && (ctx->Const.GLSLVersion >= 140);
const unsigned lowest_version =
(ctx->API == API_OPENGLES2) || ctx->Extensions.ARB_ES2_compatibility
? 100 : 110;
const unsigned highest_version =
is_desktop_gl ? ctx->Const.GLSLVersion : 100;
_mesa_is_desktop_gl(ctx) ? ctx->Const.GLSLVersion : 100;
char *supported = ralloc_strdup(this, "");
for (unsigned ver = lowest_version; ver <= highest_version; ver += 10) {

17
src/glsl/glsl_parser_extras.h
View file

@ -122,23 +122,6 @@ struct _mesa_glsl_parse_state {
/* ARB_draw_buffers */
unsigned MaxDrawBuffers;
/**
* Set of GLSL versions supported by the current context
*
* Knowing that version X is supported doesn't mean that versions before
* X are also supported. Version 1.00 is only supported in an ES2
* context or when GL_ARB_ES2_compatibility is supported. In an OpenGL
* 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not
* supported.
*/
/*@{*/
unsigned GLSL_100ES:1;
unsigned GLSL_110:1;
unsigned GLSL_120:1;
unsigned GLSL_130:1;
unsigned GLSL_140:1;
/*@}*/
} Const;
/**