From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 14 Feb 2008 21:22:22 +0000 (-0700)
Subject: gallium: fix some "instruction"/"declaration" mix-ups in tgsi_exec_prepare().
X-Git-Tag: android-x86-1.6~16^2~1465^2~390^2~2618^2~22
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a3e59d2363cba6dd2c1edc08d1afffd25b53ea3;p=android-x86%2Fexternal-mesa.git

gallium: fix some "instruction"/"declaration" mix-ups in tgsi_exec_prepare().
---

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index 7801f959727..37e60070686 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -158,13 +158,13 @@ tgsi_exec_prepare( struct tgsi_exec_machine *mach )
          if (numDeclarations == maxDeclarations) {
             declarations = REALLOC(declarations,
                                    maxDeclarations
-                                   * sizeof(struct tgsi_full_instruction),
+                                   * sizeof(struct tgsi_full_declaration),
                                    (maxDeclarations + 10)
-                                   * sizeof(struct tgsi_full_instruction));
+                                   * sizeof(struct tgsi_full_declaration));
             maxDeclarations += 10;
          }
          memcpy(declarations + numDeclarations,
-                &parse.FullToken.FullInstruction,
+                &parse.FullToken.FullDeclaration,
                 sizeof(declarations[0]));
          numDeclarations++;
          break;