diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-25 09:37:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-25 09:37:58 +0200 |
| commit | 1245204b2091d108a8688ff7f749f2c6cc830381 (patch) | |
| tree | c903bf477d9ddf666685494f3b035680d5d41580 /mesalib/src/mesa/program/program.c | |
| parent | b299d73bb416e2a26a642a54d5a15ea9fa30df33 (diff) | |
| parent | 14718f10dcda487178690de9a51cc5acdf21e468 (diff) | |
| download | vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.tar.gz vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.tar.bz2 vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 25 Sep 2013
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; |