From 7ccd47d644962cbb6424a2e75de3b5317cbda62b Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 15 Jul 2014 11:26:45 +0200 Subject: [PATCH] i965/gen6/gs: Upload binding table for user-provided geometry shaders. Acked-by: Kenneth Graunke Reviewed-by: Jordan Justen --- src/mesa/drivers/dri/i965/brw_binding_tables.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index 30a54ef1734..709cb9c7b82 100644 --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c +++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c @@ -215,7 +215,10 @@ gen6_upload_binding_table_pointers(struct brw_context *brw) GEN6_BINDING_TABLE_MODIFY_PS | (4 - 2)); OUT_BATCH(brw->vs.base.bind_bo_offset); /* vs */ - OUT_BATCH(brw->ff_gs.bind_bo_offset); /* gs */ + if (brw->ff_gs.prog_active) + OUT_BATCH(brw->ff_gs.bind_bo_offset); /* gs */ + else + OUT_BATCH(brw->gs.base.bind_bo_offset); /* gs */ OUT_BATCH(brw->wm.base.bind_bo_offset); /* wm/ps */ ADVANCE_BATCH(); } -- 2.11.0