summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2016-11-15 00:37:42 -0800
committerKenneth Graunke <kenneth@whitecape.org>2016-11-19 11:39:58 -0800
commitc87b5dee119da9696d9c1897dc7c96144b9ced7a (patch)
tree484a52353c54cf786684bbeda78a6cafff38f179
parent639af2a7c637e39b2d30f9891f67da76af50cab7 (diff)
i965: Make URB code use prog_data for GS/tessellation enable checks.
If geometry/tessellation shaders are disabled, prog_data will be NULL (see brw_state_upload.c). This consolidates dirty bits a little. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/gen7_urb.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index eb811b45659..983078837ac 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -192,10 +192,10 @@ upload_urb(struct brw_context *brw)
const struct brw_vue_prog_data *vs_vue_prog_data =
brw_vue_prog_data(brw->vs.base.prog_data);
const unsigned vs_size = MAX2(vs_vue_prog_data->urb_entry_size, 1);
- /* BRW_NEW_GEOMETRY_PROGRAM, BRW_NEW_GS_PROG_DATA */
- const bool gs_present = brw->geometry_program;
- /* BRW_NEW_TESS_PROGRAMS */
- const bool tess_present = brw->tess_eval_program;
+ /* BRW_NEW_GS_PROG_DATA */
+ const bool gs_present = brw->gs.base.prog_data;
+ /* BRW_NEW_TES_PROG_DATA */
+ const bool tess_present = brw->tes.base.prog_data;
gen7_upload_urb(brw, vs_size, gs_present, tess_present);
}
@@ -450,8 +450,6 @@ const struct brw_tracked_state gen7_urb = {
.mesa = 0,
.brw = BRW_NEW_CONTEXT |
BRW_NEW_URB_SIZE |
- BRW_NEW_GEOMETRY_PROGRAM |
- BRW_NEW_TESS_PROGRAMS |
BRW_NEW_GS_PROG_DATA |
BRW_NEW_TCS_PROG_DATA |
BRW_NEW_TES_PROG_DATA |