diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-02-10 19:22:57 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-02-10 19:22:57 +0000 |
commit | 9c9ba66fbae8089e9423f6b09ad1091cccf9b006 (patch) | |
tree | 81ecce3d6b19e5b77fcf31e5f081e1c546f398b9 /src/gallium/auxiliary/tgsi/tgsi_dump.c | |
parent | ebb864da9e98003be9ea388013ae4385d341e46f (diff) | |
parent | 1e8177ee178b131afa86d874b062a8ae3fae0cca (diff) |
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
Diffstat (limited to 'src/gallium/auxiliary/tgsi/tgsi_dump.c')
-rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_dump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c index 2ed8c2bf07..ab2b1f2c58 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_dump.c +++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c @@ -285,7 +285,7 @@ iter_immediate( ENM( imm->Immediate.DataType, immediate_type_names ); TXT( " { " ); - for (i = 0; i < imm->Immediate.Size - 1; i++) { + for (i = 0; i < imm->Immediate.NrTokens - 1; i++) { switch (imm->Immediate.DataType) { case TGSI_IMM_FLOAT32: FLT( imm->u.ImmediateFloat32[i].Float ); @@ -294,7 +294,7 @@ iter_immediate( assert( 0 ); } - if (i < imm->Immediate.Size - 2) + if (i < imm->Immediate.NrTokens - 2) TXT( ", " ); } TXT( " }" ); |