summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen7_sol_state.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-02-13 10:00:14 -0800
committerEric Anholt <eric@anholt.net>2012-02-21 11:53:37 -0800
commit9f3d3216cf25d8ffed4d72fbce6feacbc2990e4b (patch)
tree44ea9993bdd0726ac7adebffe0bb58b25b8667b6 /src/mesa/drivers/dri/i965/gen7_sol_state.c
parentb5c409363cfd144b1caad50b77ccc7591de42af2 (diff)
downloadexternal_mesa3d-9f3d3216cf25d8ffed4d72fbce6feacbc2990e4b.zip
external_mesa3d-9f3d3216cf25d8ffed4d72fbce6feacbc2990e4b.tar.gz
external_mesa3d-9f3d3216cf25d8ffed4d72fbce6feacbc2990e4b.tar.bz2
i965: Make the userclip flag for the VUE map come from VS prog data.
This reduces recomputation of state based on non-clipping-related transform changes, and is a step toward removing VUE map recomputation. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_sol_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen7_sol_state.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c
index 110c166..134153e 100644
--- a/src/mesa/drivers/dri/i965/gen7_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c
@@ -241,9 +241,8 @@ upload_sol_state(struct brw_context *brw)
bool active = xfb_obj->Active && !xfb_obj->Paused;
struct brw_vue_map vue_map;
- /* _NEW_TRANSFORM, CACHE_NEW_VS_PROG */
- brw_compute_vue_map(&vue_map, intel, ctx->Transform.ClipPlanesEnabled != 0,
- brw->vs.prog_data->outputs_written);
+ /* CACHE_NEW_VS_PROG */
+ brw_compute_vue_map(&vue_map, intel, brw->vs.prog_data);
if (active) {
upload_3dstate_so_buffers(brw);
@@ -264,8 +263,7 @@ const struct brw_tracked_state gen7_sol_state = {
.dirty = {
.mesa = (_NEW_RASTERIZER_DISCARD |
_NEW_LIGHT |
- _NEW_TRANSFORM_FEEDBACK |
- _NEW_TRANSFORM),
+ _NEW_TRANSFORM_FEEDBACK),
.brw = (BRW_NEW_BATCH |
BRW_NEW_VERTEX_PROGRAM),
.cache = CACHE_NEW_VS_PROG,