Mesa (master): nv30: fix breakage due to 10 texcoord support on nv40

Luca Barbieri lb at kemper.freedesktop.org
Sat Sep 11 19:12:56 UTC 2010


Module: Mesa
Branch: master
Commit: 95555ed03e95f7472ad1f6c4b43e0aa7aaa13f93
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=95555ed03e95f7472ad1f6c4b43e0aa7aaa13f93

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Sat Sep 11 21:11:03 2010 +0200

nv30: fix breakage due to 10 texcoord support on nv40

---

 src/gallium/drivers/nvfx/nvfx_vertprog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 6914e73..6ddfca1 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -878,7 +878,7 @@ nvfx_vertprog_prepare(struct nvfx_context* nvfx, struct nvfx_vpc *vpc)
 
 	/* hope 0xf is (0, 0, 0, 1) initialized; otherwise, we are _probably_ not required to do this */
 	memset(vpc->vp->generic_to_fp_input, 0x0f, sizeof(vpc->vp->generic_to_fp_input));
-	for(int i = 0; i < 10; ++i) {
+	for(int i = 0; i < num_texcoords; ++i) {
 		if(sem_layout[i] == 0xff)
 			continue;
 		//printf("vp: GENERIC[%i] to fpreg %i\n", sem_layout[i], NVFX_FP_OP_INPUT_SRC_TC(0) + i);
@@ -886,7 +886,7 @@ nvfx_vertprog_prepare(struct nvfx_context* nvfx, struct nvfx_vpc *vpc)
 	}
 
 	vpc->vp->sprite_fp_input = -1;
-	for(int i = 0; i < 10; ++i)
+	for(int i = 0; i < num_texcoords; ++i)
 	{
 		if(sem_layout[i] == 0xff)
 		{




More information about the mesa-commit mailing list