diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2014-07-15 11:26:45 +0200 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2014-09-19 15:01:15 +0200 |
| commit | 7ccd47d644962cbb6424a2e75de3b5317cbda62b (patch) | |
| tree | aa48ba899886c61f1e9c3b427e39888578dd4046 /src/mesa/drivers/dri/i965/brw_binding_tables.c | |
| parent | 5ac8294f9be525c03bdfa97ea123a333d71406b5 (diff) | |
| download | external_mesa3d-7ccd47d644962cbb6424a2e75de3b5317cbda62b.zip external_mesa3d-7ccd47d644962cbb6424a2e75de3b5317cbda62b.tar.gz external_mesa3d-7ccd47d644962cbb6424a2e75de3b5317cbda62b.tar.bz2 | |
i965/gen6/gs: Upload binding table for user-provided geometry shaders.
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_binding_tables.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_binding_tables.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index 30a54ef..709cb9c 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(); } |