X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fglcpp%2Fglcpp.h;h=8aaa551d128b538f11c59a4727cb869d27e5674d;hb=3b888f534cd42065b01ede8b9c646a2be0015509;hp=0bebdb9ae8c00f918dcd00218cf1a911612e48f4;hpb=1ffc1cd86186ae5d03bb28a1e041c4a57761515e;p=mesa.git

diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index 0bebdb9ae8c..8aaa551d128 100644
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
@@ -25,8 +25,11 @@
 #define GLCPP_H
 
 #include <stdint.h>
+#include <stdbool.h>
 
-#include <talloc.h>
+#include "main/mtypes.h"
+
+#include "../ralloc.h"
 
 #include "program/hash_table.h"
 
@@ -174,13 +177,20 @@ struct glcpp_parser {
 	token_node_t *lex_from_node;
 	char *output;
 	char *info_log;
+	size_t output_length;
+	size_t info_log_length;
 	int error;
+	bool has_new_line_number;
+	int new_line_number;
+	bool has_new_source_number;
+	int new_source_number;
+	bool is_gles;
 };
 
 struct gl_extensions;
 
 glcpp_parser_t *
-glcpp_parser_create (const struct gl_extensions *extensions);
+glcpp_parser_create (const struct gl_extensions *extensions, int api);
 
 int
 glcpp_parser_parse (glcpp_parser_t *parser);
@@ -189,8 +199,8 @@ void
 glcpp_parser_destroy (glcpp_parser_t *parser);
 
 int
-preprocess(void *talloc_ctx, const char **shader, char **info_log,
-	   const struct gl_extensions *extensions);
+glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
+	   const struct gl_extensions *extensions, struct gl_context *g_ctx);
 
 /* Functions for writing to the info log */