diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_clip_state.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c index 5ba3a807603..8ae19c8d370 100644 --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c +++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c @@ -177,6 +177,11 @@ upload_clip_state(struct brw_context *brw) if (!is_drawing_points(brw) && !is_drawing_lines(brw)) dw2 |= GEN6_CLIP_XY_TEST; + /* BRW_NEW_VUE_MAP_GEOM_OUT */ + const int max_vp_index = + (brw->vue_map_geom_out.slots_valid & VARYING_BIT_VIEWPORT) != 0 ? + ctx->Const.MaxViewports : 1; + BEGIN_BATCH(4); OUT_BATCH(_3DSTATE_CLIP << 16 | (4 - 2)); OUT_BATCH(dw1); @@ -186,7 +191,7 @@ upload_clip_state(struct brw_context *brw) OUT_BATCH(U_FIXED(0.125, 3) << GEN6_CLIP_MIN_POINT_WIDTH_SHIFT | U_FIXED(255.875, 3) << GEN6_CLIP_MAX_POINT_WIDTH_SHIFT | (_mesa_geometric_layers(fb) > 0 ? 0 : GEN6_CLIP_FORCE_ZERO_RTAINDEX) | - ((ctx->Const.MaxViewports - 1) & GEN6_CLIP_MAX_VP_INDEX_MASK)); + ((max_vp_index - 1) & GEN6_CLIP_MAX_VP_INDEX_MASK)); ADVANCE_BATCH(); } @@ -201,7 +206,8 @@ const struct brw_tracked_state gen6_clip_state = { BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_META_IN_PROGRESS | BRW_NEW_PRIMITIVE | - BRW_NEW_RASTERIZER_DISCARD, + BRW_NEW_RASTERIZER_DISCARD | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = upload_clip_state, }; @@ -218,7 +224,8 @@ const struct brw_tracked_state gen7_clip_state = { BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_META_IN_PROGRESS | BRW_NEW_PRIMITIVE | - BRW_NEW_RASTERIZER_DISCARD, + BRW_NEW_RASTERIZER_DISCARD | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = upload_clip_state, }; |