aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-11-19 16:14:44 -0800
committerKeith Whitwell <[email protected]>2009-11-19 16:14:44 -0800
commit8db59a1fa329b28ba375d54d6d6d5df06f411a6e (patch)
tree3d94723a6985026a7bcde12860a40547b9283307
parent1b9eda4c74c83cc0ffa98f2885660c80cdff2a65 (diff)
i965g: setup nr_attrs should track nr fragment shader inputs
This would be equivalent to taking the nr outputs of the vp varient
-rw-r--r--src/gallium/drivers/i965/brw_sf.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/i965/brw_sf.c b/src/gallium/drivers/i965/brw_sf.c
index 52fb2cd42d5..e75f447a036 100644
--- a/src/gallium/drivers/i965/brw_sf.c
+++ b/src/gallium/drivers/i965/brw_sf.c
@@ -124,8 +124,12 @@ static enum pipe_error upload_sf_prog(struct brw_context *brw)
/* Populate the key, noting state dependencies:
*/
- /* CACHE_NEW_VS_PROG */
- key.nr_attrs = brw->curr.vertex_shader->info.file_max[TGSI_FILE_OUTPUT] + 1;
+
+ /* XXX: Add one to turn the max value into a count, then add
+ * another one to account for the position input.
+ */
+ /* PIPE_NEW_FRAGMENT_SHADER */
+ key.nr_attrs = brw->curr.vertex_shader->info.file_max[TGSI_FILE_INPUT] + 2;
/* XXX: this is probably where the mapping between vertex shader