Mesa (master): nv30: find first unused texcoord rather than bailing if first is used
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Sun Sep 1 19:00:05 UTC 2013
Module: Mesa
Branch: master
Commit: 3282697621241e646247b85327c50747416a766b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3282697621241e646247b85327c50747416a766b
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Sep 1 12:38:52 2013 -0400
nv30: find first unused texcoord rather than bailing if first is used
This fixes shaders produced by supertuxkart.
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/gallium/drivers/nv30/nvfx_fragprog.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nv30/nvfx_fragprog.c b/src/gallium/drivers/nv30/nvfx_fragprog.c
index 1231862..a734330 100644
--- a/src/gallium/drivers/nv30/nvfx_fragprog.c
+++ b/src/gallium/drivers/nv30/nvfx_fragprog.c
@@ -976,9 +976,8 @@ nvfx_fragprog_assign_generic(struct nv30_context *nvfx, struct nvfx_fpc *fpc,
fpc->r_input[idx] = nvfx_reg(NVFXSR_INPUT, hw);
return TRUE;
}
- return FALSE;
}
- return TRUE;
+ return FALSE;
default:
return TRUE;
}
More information about the mesa-commit
mailing list