Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Should be an array of structs, not an array of pointers to structs.
  • Loading branch information
icculus committed Feb 19, 2009
1 parent 046dfd9 commit 19e92e2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions mojoshader.h
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions mojoshader_assembler.c
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion mojoshader_internal.h
Expand Up @@ -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);

Expand Down
12 changes: 6 additions & 6 deletions mojoshader_preprocessor.c
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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<space><space><newline>"
} // for
define_include_len++; // for null terminator.
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 19e92e2

Please sign in to comment.