diff options
| author | Paul Berry <[email protected]> | 2012-08-01 18:36:57 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-12-06 12:13:21 -0800 |
| commit | d9bfaa104ed4debeff6c7d69daf4d9cc85cadb8d (patch) | |
| tree | 0b66292a5b90fc357089ba57d7f290d3a92f2911 | |
| parent | 53e572f15cb394a8d4f2cd5856dd2a06b6ccd3f0 (diff) | |
glsl: Make a function to express a GLSL version ir human-readable form.
This will be useful in generating more helpful error messages,
especially with the addition of GLSL 3.00 ES support.
[v2, idr]: Rename ctx parameter to mem_ctx
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Acked-by: Carl Worth <[email protected]>
| -rw-r--r-- | src/glsl/glsl_parser.yy | 6 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 10 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 407dbbeebcc..03e05ff1bf3 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -290,10 +290,8 @@ version_statement: state->language_version = $2; state->version_string = - ralloc_asprintf(state, "GLSL%s %d.%02d", - state->es_shader ? " ES" : "", - state->language_version / 100, - state->language_version % 100); + glsl_compute_version_string(state, state->es_shader, + state->language_version); if (!supported) { _mesa_glsl_error(& @2, state, "%s is not supported. " diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index f1fdd3a4752..3e192037e0d 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -37,6 +37,16 @@ extern "C" { #include "ir_optimization.h" #include "loop_analysis.h" +/** + * Format a short human-readable description of the given GLSL version. + */ +const char * +glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version) +{ + return ralloc_asprintf(mem_ctx, "GLSL%s %d.%02d", is_es ? " ES" : "", + version / 100, version % 100); +} + _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx) : ctx(_ctx) diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 0b208f6ca94..5bad5a94d3c 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -56,6 +56,9 @@ struct glsl_switch_state { bool is_switch_innermost; // if switch stmt is closest to break, ... }; +const char * +glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version); + struct _mesa_glsl_parse_state { _mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx); |