diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-25 09:36:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-25 09:36:22 +0200 |
| commit | 14718f10dcda487178690de9a51cc5acdf21e468 (patch) | |
| tree | 756b76a52c4382e58e5e552e468d93d453c3ae86 /mesalib/src/mesa/program/program.c | |
| parent | e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (diff) | |
| download | vcxsrv-14718f10dcda487178690de9a51cc5acdf21e468.tar.gz vcxsrv-14718f10dcda487178690de9a51cc5acdf21e468.tar.bz2 vcxsrv-14718f10dcda487178690de9a51cc5acdf21e468.zip | |
fontconfig mesa git update 25 Sep 2013
fontconfig commit 102864d0dba46c99b22c912454c1f58731287405
mesa commit 59157d1c96f33ca56d9aba6cff75145d732dbbab
Diffstat (limited to 'mesalib/src/mesa/program/program.c')
| -rw-r--r-- | mesalib/src/mesa/program/program.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c index 2529c1305..093d37297 100644 --- a/mesalib/src/mesa/program/program.c +++ b/mesalib/src/mesa/program/program.c @@ -72,10 +72,10 @@ _mesa_init_program(struct gl_context *ctx) ASSERT(ctx->Const.FragmentProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS)); /* If this fails, increase prog_instruction::TexSrcUnit size */ - ASSERT(MAX_TEXTURE_UNITS <= (1 << 5)); + STATIC_ASSERT(MAX_TEXTURE_UNITS <= (1 << 5)); /* If this fails, increase prog_instruction::TexSrcTarget size */ - ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4)); + STATIC_ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4)); ctx->Program.ErrorPos = -1; ctx->Program.ErrorString = _mesa_strdup(""); @@ -477,7 +477,6 @@ _mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog) if (prog->Parameters) clone->Parameters = _mesa_clone_parameter_list(prog->Parameters); memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams)); - memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams)); clone->IndirectRegisterFiles = prog->IndirectRegisterFiles; clone->NumInstructions = prog->NumInstructions; clone->NumTemporaries = prog->NumTemporaries; |