diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 3c37fe3bf09..575f04f8648 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -979,21 +979,9 @@ intel_miptree_create_for_bo(struct brw_context *brw, mt->offset = offset; mt->tiling = tiling; - if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX)) { + if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX)) intel_miptree_choose_aux_usage(brw, mt); - /* Since CCS_E can compress more than just clear color, we create the - * CCS for it up-front. For CCS_D which only compresses clears, we - * create the CCS on-demand when a clear occurs that wants one. - */ - if (mt->aux_usage == ISL_AUX_USAGE_CCS_E) { - if (!intel_miptree_alloc_ccs(brw, mt)) { - intel_miptree_release(&mt); - return NULL; - } - } - } - return mt; } @@ -1129,6 +1117,17 @@ intel_miptree_create_for_dri_image(struct brw_context *brw, } } + /* Since CCS_E can compress more than just clear color, we create the CCS + * for it up-front. For CCS_D which only compresses clears, we create the + * CCS on-demand when a clear occurs that wants one. + */ + if (mt->aux_usage == ISL_AUX_USAGE_CCS_E) { + if (!intel_miptree_alloc_ccs(brw, mt)) { + intel_miptree_release(&mt); + return NULL; + } + } + return mt; } |