const struct brw_stage_state *stage_state = &brw->gs.base;
/* BRW_NEW_GEOMETRY_PROGRAM */
bool active = brw->geometry_program;
- /* CACHE_NEW_GS_PROG */
- const struct brw_vec4_prog_data *prog_data = &brw->gs.prog_data->base;
+ /* BRW_NEW_GS_PROG_DATA */
+ const struct brw_vue_prog_data *prog_data = &brw->gs.prog_data->base;
if (active) {
int urb_entry_write_offset = 1;
(prog_data->base.dispatch_grf_start_reg <<
GEN6_GS_DISPATCH_START_GRF_SHIFT));
+ uint32_t dw7 = (brw->gs.prog_data->control_data_header_size_hwords <<
+ GEN7_GS_CONTROL_DATA_HEADER_SIZE_SHIFT) |
+ brw->gs.prog_data->dispatch_mode |
+ ((brw->gs.prog_data->invocations - 1) <<
+ GEN7_GS_INSTANCE_CONTROL_SHIFT) |
+ GEN6_GS_STATISTICS_ENABLE |
+ (brw->gs.prog_data->include_primitive_id ?
+ GEN7_GS_INCLUDE_PRIMITIVE_ID : 0) |
+ GEN7_GS_REORDER_TRAILING |
+ GEN7_GS_ENABLE;
+ uint32_t dw8 = brw->gs.prog_data->control_data_format <<
+ HSW_GS_CONTROL_DATA_FORMAT_SHIFT;
+
+ if (brw->gen < 9)
+ dw7 |= (brw->max_gs_threads / 2 - 1) << HSW_GS_MAX_THREADS_SHIFT;
+ else
+ dw8 |= brw->max_gs_threads - 1;
+
/* DW7 */
- OUT_BATCH(((brw->max_gs_threads / 2 - 1) << HSW_GS_MAX_THREADS_SHIFT) |
- (brw->gs.prog_data->control_data_header_size_hwords <<
- GEN7_GS_CONTROL_DATA_HEADER_SIZE_SHIFT) |
- (brw->gs.prog_data->dual_instanced_dispatch ?
- GEN7_GS_DISPATCH_MODE_DUAL_INSTANCE :
- GEN7_GS_DISPATCH_MODE_DUAL_OBJECT) |
- GEN6_GS_STATISTICS_ENABLE |
- (brw->gs.prog_data->include_primitive_id ?
- GEN7_GS_INCLUDE_PRIMITIVE_ID : 0) |
- GEN7_GS_REORDER_TRAILING |
- GEN7_GS_ENABLE);
+ OUT_BATCH(dw7);
/* DW8 */
- OUT_BATCH(brw->gs.prog_data->control_data_format <<
- HSW_GS_CONTROL_DATA_FORMAT_SHIFT);
+ OUT_BATCH(dw8);
/* DW9 / _NEW_TRANSFORM */
OUT_BATCH((ctx->Transform.ClipPlanesEnabled <<
const struct brw_tracked_state gen8_gs_state = {
.dirty = {
.mesa = _NEW_TRANSFORM,
- .brw = (BRW_NEW_CONTEXT |
- BRW_NEW_GEOMETRY_PROGRAM |
- BRW_NEW_BATCH),
- .cache = CACHE_NEW_GS_PROG
+ .brw = BRW_NEW_BATCH |
+ BRW_NEW_CONTEXT |
+ BRW_NEW_GEOMETRY_PROGRAM |
+ BRW_NEW_GS_PROG_DATA,
},
.emit = gen8_upload_gs_state,
};