From 19e92e236f442880962c4717f6659468b7dec32f Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 18 Feb 2009 21:16:26 -0500 Subject: [PATCH] Should be an array of structs, not an array of pointers to structs. --- mojoshader.h | 4 ++-- mojoshader_assembler.c | 4 ++-- mojoshader_internal.h | 2 +- mojoshader_preprocessor.c | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mojoshader.h b/mojoshader.h index f75d5119..d8625d33 100644 --- a/mojoshader.h +++ b/mojoshader.h @@ -791,7 +791,7 @@ typedef void (*MOJOSHADER_includeClose)(const char *data, */ const MOJOSHADER_preprocessData *MOJOSHADER_preprocess(const char *filename, const char *source, unsigned int sourcelen, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_includeOpen include_open, MOJOSHADER_includeClose include_close, @@ -874,7 +874,7 @@ const MOJOSHADER_parseData *MOJOSHADER_assemble(const char *filename, const char **comments, unsigned int comment_count, const MOJOSHADER_symbol *symbols, unsigned int symbol_count, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_includeOpen include_open, MOJOSHADER_includeClose include_close, diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c index 0f700cfe..30d7e904 100644 --- a/mojoshader_assembler.c +++ b/mojoshader_assembler.c @@ -1405,7 +1405,7 @@ static void parse_token(Context *ctx, const Token token) static Context *build_context(const char *filename, const char *source, unsigned int sourcelen, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_includeOpen include_open, MOJOSHADER_includeClose include_close, @@ -1709,7 +1709,7 @@ const MOJOSHADER_parseData *MOJOSHADER_assemble(const char *filename, const char **comments, unsigned int comment_count, const MOJOSHADER_symbol *symbols, unsigned int symbol_count, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_includeOpen include_open, MOJOSHADER_includeClose include_close, diff --git a/mojoshader_internal.h b/mojoshader_internal.h index 0b3ac5fd..989b587a 100644 --- a/mojoshader_internal.h +++ b/mojoshader_internal.h @@ -415,7 +415,7 @@ Preprocessor *preprocessor_start(const char *fname, const char *source, unsigned int sourcelen, MOJOSHADER_includeOpen open_callback, MOJOSHADER_includeClose close_callback, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_malloc m, MOJOSHADER_free f, void *d); diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c index 8e4d9b4f..558a01ad 100644 --- a/mojoshader_preprocessor.c +++ b/mojoshader_preprocessor.c @@ -606,7 +606,7 @@ Preprocessor *preprocessor_start(const char *fname, const char *source, unsigned int sourcelen, MOJOSHADER_includeOpen open_callback, MOJOSHADER_includeClose close_callback, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_malloc m, MOJOSHADER_free f, void *d) { @@ -637,8 +637,8 @@ Preprocessor *preprocessor_start(const char *fname, const char *source, { for (i = 0; i < define_count; i++) { - define_include_len += strlen(defines[i]->identifier); - define_include_len += strlen(defines[i]->definition); + define_include_len += strlen(defines[i].identifier); + define_include_len += strlen(defines[i].definition); define_include_len += 10; // "#define" } // for define_include_len++; // for null terminator. @@ -651,8 +651,8 @@ Preprocessor *preprocessor_start(const char *fname, const char *source, char *ptr = define_include; for (i = 0; i < define_count; i++) { - ptr += sprintf(ptr, "#define %s %s\n", defines[i]->identifier, - defines[i]->definition); + ptr += sprintf(ptr, "#define %s %s\n", defines[i].identifier, + defines[i].definition); } // for } // else } // if @@ -1357,7 +1357,7 @@ static const MOJOSHADER_preprocessData out_of_mem_data_preprocessor = { const MOJOSHADER_preprocessData *MOJOSHADER_preprocess(const char *filename, const char *source, unsigned int sourcelen, - const MOJOSHADER_preprocessorDefine **defines, + const MOJOSHADER_preprocessorDefine *defines, unsigned int define_count, MOJOSHADER_includeOpen include_open, MOJOSHADER_includeClose include_close,