Mesa (gallium-0.2): draw: Fix build -- rename Size to NrTokens.

Michał Król michal at kemper.freedesktop.org
Tue Feb 10 14:19:22 UTC 2009


Module: Mesa
Branch: gallium-0.2
Commit: e3028baff2a313baac4a5aea494532605bb8f37a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3028baff2a313baac4a5aea494532605bb8f37a

Author: Michal Krol <michal at vmware.com>
Date:   Tue Feb 10 15:16:00 2009 +0100

draw: Fix build -- rename Size to NrTokens.

---

 src/gallium/auxiliary/draw/draw_pipe_pstipple.c |    2 +-
 src/gallium/auxiliary/draw/draw_vs_aos.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index b764d9c..a0f9716 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@ -256,7 +256,7 @@ pstip_transform_inst(struct tgsi_transform_context *ctx,
          struct tgsi_full_immediate immed;
          uint size = 4;
          immed = tgsi_default_full_immediate();
-         immed.Immediate.Size = 1 + size; /* one for the token itself */
+         immed.Immediate.NrTokens = 1 + size; /* one for the token itself */
          immed.u.Pointer = (void *) value;
          ctx->emit_immediate(ctx, &immed);
       }
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.c b/src/gallium/auxiliary/draw/draw_vs_aos.c
index 6817f29..0c693a4 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos.c
@@ -1870,7 +1870,7 @@ static boolean note_immediate( struct aos_compilation *cp,
    unsigned pos = cp->num_immediates++;
    unsigned j;
 
-   for (j = 0; j < imm->Immediate.Size; j++) {
+   for (j = 0; j < imm->Immediate.NrTokens - 1; j++) {
       cp->vaos->machine->immediate[pos][j] = imm->u.ImmediateFloat32[j].Float;
    }
 




More information about the mesa-commit mailing list