Module: Mesa
Branch: master
Commit: 8e5808fc0c9d9da19a0c7f683c156386d4648842
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e5808fc0c9d9da19a0c7f683c156386d4648842
Author: Jason Ekstrand <jason.ekstr...@intel.com>
Date: Wed Aug 2 11:07:36 2017 -0700
i965/miptree: Call alloc_aux in create_for_bo
Originally, I had moved it to the caller to make some things easier when
adding the CCS modifier. However, this broke DRI2 because
intel_process_dri2_buffer calls intel_miptree_create_for_bo but never
calls intel_miptree_alloc_aux. Also, in hindsight, it should be pretty
easy to make the CCS modifier stuff work even if create_for_bo allocates
the CCS when DISABLE_AUX is not set.
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
Cc: "17.2" <mesa-sta...@lists.freedesktop.org>
---
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 149e632877..237f580fac 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -839,9 +839,15 @@ intel_miptree_create_for_bo(struct brw_context *brw,
mt->bo = bo;
mt->offset = offset;
- if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX))
+ if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX)) {
intel_miptree_choose_aux_usage(brw, mt);
+ if (!intel_miptree_alloc_aux(brw, mt)) {
+ intel_miptree_release(&mt);
+ return NULL;
+ }
+ }
+
return mt;
}
@@ -978,11 +984,6 @@ intel_miptree_create_for_dri_image(struct brw_context *brw,
if (is_winsys_image)
image->bo->cache_coherent = false;
- if (!intel_miptree_alloc_aux(brw, mt)) {
- intel_miptree_release(&mt);
- return NULL;
- }
-
return mt;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
