diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_primitive_restart.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index e9265388fc9..b5cfbbc4c6f 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c @@ -194,9 +194,21 @@ haswell_upload_cut_index(struct brw_context *brw) ctx->Array._PrimitiveRestart ? HSW_CUT_INDEX_ENABLE : 0; /* BRW_NEW_INDEX_BUFFER */ + unsigned cut_index; + if (brw->ib.ib) { + cut_index = _mesa_primitive_restart_index(ctx, brw->ib.type); + } else { + /* There's no index buffer, but primitive restart may still apply + * to glDrawArrays and such. FIXED_INDEX mode only applies to drawing + * operations that use an index buffer, so we can ignore it and use + * the GL restart index directly. + */ + cut_index = ctx->Array.RestartIndex; + } + BEGIN_BATCH(2); OUT_BATCH(_3DSTATE_VF << 16 | cut_index_setting | (2 - 2)); - OUT_BATCH(_mesa_primitive_restart_index(ctx, brw->ib.type)); + OUT_BATCH(cut_index); ADVANCE_BATCH(); } |