From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 23 Jun 2010 21:00:27 +0000 (-0700)
Subject: glcpp: Make standalone binary use preprocess().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=186e2634bfb8f624f3721673964e29428269cd47;p=mesa.git

glcpp: Make standalone binary use preprocess().

This prevents the two code paths from getting out of sync.  Also, future
work will need the shader source as a string anyway.

Unfortunately, this copies and pastes load_text_file from main.cpp, with
small changes (support for reading from stdin, talloc).
---

diff --git a/glcpp/glcpp.c b/glcpp/glcpp.c
index 8ba4661f784..cc87e14950b 100644
--- a/glcpp/glcpp.c
+++ b/glcpp/glcpp.c
@@ -21,24 +21,68 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "glcpp.h"
 
 extern int yydebug;
 
-int
-main (void)
+static char *
+load_text_file(void *ctx, const char *file_name)
 {
-	glcpp_parser_t *parser;
-	int ret;
+	char *text = NULL;
+	struct stat st;
+	ssize_t total_read = 0;
+	int fd = file_name == NULL ? STDIN_FILENO : open(file_name, O_RDONLY);
+
+	if (fd < 0) {
+		return NULL;
+	}
+
+	if (fstat(fd, & st) == 0) {
+		text = (char *) talloc_size(ctx, st.st_size + 1);
+		if (text != NULL) {
+			do {
+				ssize_t bytes = read(fd, text + total_read,
+						     st.st_size - total_read);
+				if (bytes < 0) {
+					text = NULL;
+					break;
+				}
+
+				if (bytes == 0) {
+					break;
+				}
+
+				total_read += bytes;
+			} while (total_read < st.st_size);
+
+			text[total_read] = '\0';
+		}
+	}
 
-	parser = glcpp_parser_create ();
+	close(fd);
 
-	ret = glcpp_parser_parse (parser);
+	return text;
+}
+
+int
+preprocess(void *talloc_ctx, const char **shader, char **info_log);
+
+int
+main (void)
+{
+	void *ctx = talloc(NULL, void*);
+	const char *shader = load_text_file(ctx, NULL);
+	char *info_log = talloc_strdup(ctx, "");
+	int ret = preprocess(ctx, &shader, &info_log);
 
-	printf("%s", parser->output);
-	fprintf(stderr, "%s", parser->info_log);
+	printf("%s", shader);
+	fprintf(stderr, "%s", info_log);
 
-	glcpp_parser_destroy (parser);
+	talloc_free(ctx);
 
 	return ret;
 }
diff --git a/glcpp/glcpp.h b/glcpp/glcpp.h
index bb0ac95aedf..2cfa98d2b1d 100644
--- a/glcpp/glcpp.h
+++ b/glcpp/glcpp.h
@@ -167,6 +167,9 @@ glcpp_parser_parse (glcpp_parser_t *parser);
 void
 glcpp_parser_destroy (glcpp_parser_t *parser);
 
+int
+preprocess(void *talloc_ctx, const char **shader, char **info_log);
+
 /* Functions for writing to the info log */
 
 void