From: Vinson Lee <vlee@vmware.com>
Date: Sun, 25 Jul 2010 04:10:45 +0000 (-0700)
Subject: nvfx: Move declaration before code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5603d2e4c4dd64f8d8ba265dde216bf42a9ac945;p=mesa.git

nvfx: Move declaration before code.
---

diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 6772d9bd516..ee41f03b9b8 100644
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -842,7 +842,6 @@ nvfx_fragprog_validate(struct nvfx_context *nvfx)
 	struct nouveau_channel* chan = nvfx->screen->base.channel;
 	struct nvfx_fragment_program *fp = nvfx->fragprog;
 	int update = 0;
-	int i;
 
 	if (!fp->translated)
 	{
@@ -895,6 +894,7 @@ nvfx_fragprog_validate(struct nvfx_context *nvfx)
 			{
 				struct nvfx_fragment_program_bo* fpbo = os_malloc_aligned(sizeof(struct nvfx_fragment_program) + fp->prog_size * fp->progs_per_bo, 16);
 				char *map, *buf;
+				int i;
 
 				if(fp->fpbo)
 				{
@@ -910,7 +910,7 @@ nvfx_fragprog_validate(struct nvfx_context *nvfx)
 
 				map = fpbo->bo->map;
 				buf = fpbo->insn;
-				for(int i = 0; i < fp->progs_per_bo; ++i)
+				for(i = 0; i < fp->progs_per_bo; ++i)
 				{
 					memcpy(buf, fp->insn, fp->insn_len * 4);
 					nvfx_fp_memcpy(map, fp->insn, fp->insn_len * 4);
@@ -931,6 +931,7 @@ nvfx_fragprog_validate(struct nvfx_context *nvfx)
 			uint32_t* map = pipe_buffer_map(&nvfx->pipe, constbuf, PIPE_TRANSFER_READ, &transfer);
 			uint32_t* fpmap = (uint32_t*)((char*)fp->fpbo->bo->map + offset);
 			uint32_t* buf = (uint32_t*)((char*)fp->fpbo->insn + offset);
+			int i;
 			for (i = 0; i < fp->nr_consts; ++i) {
 				unsigned off = fp->consts[i].offset;
 				unsigned idx = fp->consts[i].index * 4;