diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
| commit | 0fd65ec557757ec8760a96400a09b8a8a92a7b14 (patch) | |
| tree | 961d86d49281cf94e2dc85ffb88c6b1491036338 /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 68c12003597662f95eac07ddeee99637f7caa3e5 (diff) | |
| parent | 1b37f71714e2ca4af60bd050adbbb7969534dfd6 (diff) | |
| download | vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.gz vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.bz2 vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 7aa78d611..6cfa2d661 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -426,10 +426,11 @@ extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, _mesa_glsl_parse_state *state); /** - * Get the textual name of the specified shader target + * Get the textual name of the specified shader target (which is a + * gl_shader_type). */ extern const char * -_mesa_glsl_shader_target_name(gl_shader_type target); +_mesa_shader_type_to_string(unsigned target); #endif /* __cplusplus */ @@ -443,7 +444,7 @@ extern "C" { #endif extern const char * -_mesa_glsl_shader_target_name(GLenum type); +_mesa_shader_enum_to_string(GLenum type); extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, struct gl_context *gl_ctx); |