diff options
author | Thomas Helland <[email protected]> | 2017-05-20 00:14:52 +0200 |
---|---|---|
committer | Thomas Helland <[email protected]> | 2017-09-26 18:25:00 +0200 |
commit | cad323f898fef3c8c1d07152919c3d3c88a26955 (patch) | |
tree | 207fc194462738efc410d485e905f223f6a883fa /src/compiler/glsl/glcpp/glcpp.h | |
parent | 584a2a22ea40cdc030db5b1d70b23dddcc06a556 (diff) |
glsl: Change the parser to use the string buffer
Signed-off-by: Thomas Helland <[email protected]>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
V2: Pointed out by Timothy
- Fix pp.c reralloc size issue and comment
V3 - Use vprintf instead of printf where we should
- Fixes failing make-check tests
V4 - Use buffer_append_char in a couple places
- Use append_char in even more places
Diffstat (limited to 'src/compiler/glsl/glcpp/glcpp.h')
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h index 2804636c30e..9d997cd9240 100644 --- a/src/compiler/glsl/glcpp/glcpp.h +++ b/src/compiler/glsl/glcpp/glcpp.h @@ -33,6 +33,8 @@ #include "util/hash_table.h" +#include "util/string_buffer.h" + #define yyscan_t void* /* Some data types used for parser values. */ @@ -199,10 +201,8 @@ struct glcpp_parser { int skipping; token_list_t *lex_from_list; token_node_t *lex_from_node; - char *output; - char *info_log; - size_t output_length; - size_t info_log_length; + struct _mesa_string_buffer *output; + struct _mesa_string_buffer *info_log; int error; glcpp_extension_iterator extensions; const struct gl_extensions *extension_list; |