GLuint nr_prims,
const struct _mesa_index_buffer *ib)
{
- struct intel_context *intel = intel_context(ctx);
+ struct brw_context *brw = brw_context(ctx);
/* Otherwise Haswell can do it all. */
- if (intel->is_haswell)
+ if (brw->gen >= 8 || brw->is_haswell)
return true;
if (!can_cut_index_handle_restart_index(ctx, ib)) {
static void
haswell_upload_cut_index(struct brw_context *brw)
{
- struct intel_context *intel = &brw->intel;
- struct gl_context *ctx = &intel->ctx;
+ struct gl_context *ctx = &brw->ctx;
/* Don't trigger on Ivybridge */
- if (!intel->is_haswell)
+ if (!brw->is_haswell)
return;
const unsigned cut_index_setting =
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();
}