diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index b73c0d0ad1d..f7a69a0e235 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -464,7 +464,7 @@ intel_miptree_create_layout(struct brw_context *brw, intel_miptree_wants_hiz_buffer(brw, mt)))) { uint32_t stencil_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD; if (brw->gen == 6) { - stencil_flags |= MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD | + stencil_flags |= MIPTREE_LAYOUT_GEN6_HIZ_STENCIL | MIPTREE_LAYOUT_TILING_ANY; } @@ -497,8 +497,8 @@ intel_miptree_create_layout(struct brw_context *brw, } } - if (layout_flags & MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD) - mt->array_layout = ALL_SLICES_AT_EACH_LOD; + if (layout_flags & MIPTREE_LAYOUT_GEN6_HIZ_STENCIL) + mt->array_layout = GEN6_HIZ_STENCIL; /* * Obey HALIGN_16 constraints for Gen8 and Gen9 buffers which are @@ -1790,7 +1790,7 @@ intel_hiz_miptree_buf_create(struct brw_context *brw, uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD; if (brw->gen == 6) - layout_flags |= MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD; + layout_flags |= MIPTREE_LAYOUT_GEN6_HIZ_STENCIL; if (!buf) return NULL; @@ -2380,7 +2380,7 @@ intel_update_r8stencil(struct brw_context *brw, const uint32_t r8stencil_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD | MIPTREE_LAYOUT_TILING_Y | MIPTREE_LAYOUT_DISABLE_AUX; - assert(brw->gen > 6); /* Handle MIPTREE_LAYOUT_FORCE_ALL_SLICE_AT_LOD */ + assert(brw->gen > 6); /* Handle MIPTREE_LAYOUT_GEN6_HIZ_STENCIL */ mt->r8stencil_mt = intel_miptree_create(brw, src->target, MESA_FORMAT_R_UINT8, @@ -3287,6 +3287,7 @@ intel_miptree_get_isl_surf(struct brw_context *brw, surf->array_pitch_span = ISL_ARRAY_PITCH_SPAN_FULL; break; case ALL_SLICES_AT_EACH_LOD: + case GEN6_HIZ_STENCIL: surf->array_pitch_span = ISL_ARRAY_PITCH_SPAN_COMPACT; break; default: |