OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert everything from the talloc API to the ralloc API.

Browse Source
This commit is contained in:
Kenneth Graunke
2011-01-21 14:32:31 -08:00
parent dc55254f5b
commit d3073f58c1
67 changed files with 590 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/glsl/glcpp/pp.c
View File

@@ -33,16 +33,15 @@ glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
va_list ap;
parser->error = 1;
parser->info_log = talloc_asprintf_append(parser->info_log,
"%u:%u(%u): "
ralloc_asprintf_append(&parser->info_log, "%u:%u(%u): "
"preprocessor error: ",
locp->source,
locp->first_line,
locp->first_column);
va_start(ap, fmt);
parser->info_log = talloc_vasprintf_append(parser->info_log, fmt, ap);
ralloc_vasprintf_append(&parser->info_log, fmt, ap);
va_end(ap);
parser->info_log = talloc_strdup_append(parser->info_log, "\n");
ralloc_strcat(&parser->info_log, "\n");
}
void
@@ -50,16 +49,15 @@ glcpp_warning (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
{
va_list ap;
parser->info_log = talloc_asprintf_append(parser->info_log,
"%u:%u(%u): "
ralloc_asprintf_append(&parser->info_log, "%u:%u(%u): "
"preprocessor warning: ",
locp->source,
locp->first_line,
locp->first_column);
va_start(ap, fmt);
parser->info_log = talloc_vasprintf_append(parser->info_log, fmt, ap);
ralloc_vasprintf_append(&parser->info_log, fmt, ap);
va_end(ap);
parser->info_log = talloc_strdup_append(parser->info_log, "\n");
ralloc_strcat(&parser->info_log, "\n");
}
/* Searches backwards for '^ *#' from a given starting point. */
@@ -92,7 +90,7 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
{
int in_continued_line = 0;
int extra_newlines = 0;
char *clean = talloc_strdup(ctx, "");
char *clean = ralloc_strdup(ctx, "");
const char *search_start = shader;
const char *newline;
while ((newline = strchr(search_start, '\n')) != NULL) {
@@ -122,27 +120,27 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
}
if (in_continued_line) {
/* Copy everything before the \ */
clean = talloc_strndup_append(clean, shader, backslash - shader);
ralloc_strncat(&clean, shader, backslash - shader);
shader = newline + 1;
extra_newlines++;
}
} else if (in_continued_line) {
/* Copy everything up to and including the \n */
clean = talloc_strndup_append(clean, shader, newline - shader + 1);
ralloc_strncat(&clean, shader, newline - shader + 1);
shader = newline + 1;
/* Output extra newlines to make line numbers match */
for (; extra_newlines > 0; extra_newlines--)
clean = talloc_strdup_append(clean, "\n");
ralloc_strcat(&clean, "\n");
in_continued_line = 0;
}
search_start = newline + 1;
}
clean = talloc_strdup_append(clean, shader);
ralloc_strcat(&clean, shader);
return clean;
}
int
preprocess(void *talloc_ctx, const char **shader, char **info_log,
preprocess(void *ralloc_ctx, const char **shader, char **info_log,
const struct gl_extensions *extensions, int api)
{
int errors;
@@ -156,9 +154,9 @@ preprocess(void *talloc_ctx, const char **shader, char **info_log,
if (parser->skip_stack)
glcpp_error (&parser->skip_stack->loc, parser, "Unterminated #if\n");
*info_log = talloc_strdup_append(*info_log, parser->info_log);
ralloc_strcat(info_log, parser->info_log);
talloc_steal(talloc_ctx, parser->output);
ralloc_steal(ralloc_ctx, parser->output);
*shader = parser->output;
errors = parser->error;