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

slang: Update after glsl pp changes.

Browse source
This commit is contained in:
Michal Krol 2009-12-20 13:53:53 +01:00
parent 9c15948125
commit ec73cd011d
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/shader/slang/slang_compile.c
View file

@ -2584,6 +2584,7 @@ compile_with_grammar(const char *source,
unsigned int shader_type,
unsigned int parsing_builtin)
{
struct sl_pp_purify_options options;
struct sl_pp_context *context;
struct sl_pp_token_info *tokens;
unsigned char *prod;
@ -2591,18 +2592,23 @@ compile_with_grammar(const char *source,
unsigned int version;
unsigned int maxVersion;
int result;
struct sl_pp_purify_options options;
char errmsg[200] = "";
unsigned int errline = 0;
struct sl_pp_token_info *intokens;
unsigned int tokens_eaten;
context = sl_pp_context_create();
memset(&options, 0, sizeof(options));
context = sl_pp_context_create(source, &options);
if (!context) {
slang_info_log_error(infolog, "out of memory");
return GL_FALSE;
}
if (sl_pp_version(context, &version)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
return GL_FALSE;
}
if (sl_pp_context_add_extension(context, "ARB_draw_buffers", "GL_ARB_draw_buffers") ||
sl_pp_context_add_extension(context, "ARB_texture_rectangle", "GL_ARB_texture_rectangle")) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
@ -2619,29 +2625,12 @@ compile_with_grammar(const char *source,
}
#endif
memset(&options, 0, sizeof(options));
if (sl_pp_tokenise(context, source, &options, &intokens)) {
if (sl_pp_process(context, &tokens)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
return GL_FALSE;
}
if (sl_pp_version(context, intokens, &version, &tokens_eaten)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(intokens);
return GL_FALSE;
}
if (sl_pp_process(context, &intokens[tokens_eaten], &tokens)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(intokens);
return GL_FALSE;
}
free(intokens);
/* For the time being we care about only a handful of tokens. */
{
const struct sl_pp_token_info *src = tokens;