diff options
| author | Brian Paul <[email protected]> | 2008-11-11 14:42:41 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-11 14:42:41 -0700 |
| commit | 19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch) | |
| tree | 5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/mesa/shader/prog_print.c | |
| parent | 7f3d45758ccbbcff6428d57d26794960e3e9532c (diff) | |
| parent | 90246d3ea54f54d60593dce1b89f0226058a3c56 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/shader/prog_print.c')
| -rw-r--r-- | src/mesa/shader/prog_print.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c index ec260f18a9f..22b8f1de3c2 100644 --- a/src/mesa/shader/prog_print.c +++ b/src/mesa/shader/prog_print.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 + * Version: 7.3 * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -419,7 +419,7 @@ print_dst_reg(const struct prog_dst_register *dstReg, gl_prog_print_mode mode, { _mesa_printf("%s%s", reg_string((enum register_file) dstReg->File, - dstReg->Index, mode, GL_FALSE, prog), + dstReg->Index, mode, dstReg->RelAddr, prog), writemask_string(dstReg->WriteMask)); if (dstReg->CondMask != COND_TR) { |