Mesa (gallium-0.2): nv50: indentation for TEX is a little overenthusiastic

[Ben Skeggs]

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

Author: Ben Skeggs <skeggsb at gmail.com>
Date:   Mon Jan  5 13:41:12 2009 +1100

nv50: indentation for TEX is a little overenthusiastic

---

 src/gallium/drivers/nv50/nv50_program.c |   41 +++++++++++++++++-------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 566d18c..b205cdb 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -1187,28 +1187,28 @@ nv50_program_tx_insn(struct nv50_pc *pc, const union tgsi_full_token *tok)
 		}
 		break;
 	case TGSI_OPCODE_TEX:
-		{
-			struct nv50_reg *t[4];
-			struct nv50_program_exec *e;
+	{
+		struct nv50_reg *t[4];
+		struct nv50_program_exec *e;
 
-			alloc_temp4(pc, t, 0);
-			emit_mov(pc, t[0], src[0][0]);
-			emit_mov(pc, t[1], src[0][1]);
+		alloc_temp4(pc, t, 0);
+		emit_mov(pc, t[0], src[0][0]);
+		emit_mov(pc, t[1], src[0][1]);
 
-			e = exec(pc);
-			e->inst[0] = 0xf6400000;
-			set_long(pc, e);
-			e->inst[1] |= 0x0000c004;
-			set_dst(pc, t[0], e);
-			emit(pc, e);
+		e = exec(pc);
+		e->inst[0] = 0xf6400000;
+		set_long(pc, e);
+		e->inst[1] |= 0x0000c004;
+		set_dst(pc, t[0], e);
+		emit(pc, e);
 
-			if (mask & (1 << 0)) emit_mov(pc, dst[0], t[0]);
-			if (mask & (1 << 1)) emit_mov(pc, dst[1], t[1]);
-			if (mask & (1 << 2)) emit_mov(pc, dst[2], t[2]);
-			if (mask & (1 << 3)) emit_mov(pc, dst[3], t[3]);
+		if (mask & (1 << 0)) emit_mov(pc, dst[0], t[0]);
+		if (mask & (1 << 1)) emit_mov(pc, dst[1], t[1]);
+		if (mask & (1 << 2)) emit_mov(pc, dst[2], t[2]);
+		if (mask & (1 << 3)) emit_mov(pc, dst[3], t[3]);
 
-			free_temp4(pc, t);
-		}
+		free_temp4(pc, t);
+	}
 		break;
 	case TGSI_OPCODE_XPD:
 		temp = alloc_temp(pc, NULL);
@@ -1595,8 +1595,13 @@ nv50_program_validate_code(struct nv50_context *nv50, struct nv50_program *p)
 	if (!upload)
 		return;
 
+	NOUVEAU_ERR("-------\n");
 	up = ptr = MALLOC(p->exec_size * 4);
 	for (e = p->exec_head; e; e = e->next) {
+		NOUVEAU_ERR("0x%08x\n", e->inst[0]);
+		if (is_long(e))
+			NOUVEAU_ERR("0x%08x\n", e->inst[1]);
+
 		*(ptr++) = e->inst[0];
 		if (is_long(e))
 			*(ptr++) = e->inst[1];