[Mesa-dev] [PATCH 05/17] i965/miptree: Drop the name param from alloc_aux_buffer

Nanley Chery nanleychery at gmail.com
Thu May 3 19:03:52 UTC 2018


A name of "aux-miptree" should be sufficient.
---
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 9 ++++-----
 1 file changed, 4 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 e70c9ff1ef4..566ead0d5c8 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1660,7 +1660,6 @@ intel_miptree_copy_teximage(struct brw_context *brw,
 
 static struct intel_miptree_aux_buffer *
 intel_alloc_aux_buffer(struct brw_context *brw,
-                       const char *name,
                        const struct isl_surf *aux_surf,
                        uint32_t alloc_flags,
                        bool wants_memset,
@@ -1690,7 +1689,7 @@ intel_alloc_aux_buffer(struct brw_context *brw,
     * Therefore one can pass the ISL dimensions in terms of bytes instead of
     * trying to recalculate based on different format block sizes.
     */
-   buf->bo = brw_bo_alloc_tiled(brw->bufmgr, name, buf->size,
+   buf->bo = brw_bo_alloc_tiled(brw->bufmgr, "aux-miptree", buf->size,
                                 I915_TILING_Y, buf->pitch, alloc_flags);
    if (!buf->bo) {
       free(buf);
@@ -1769,7 +1768,7 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
     *
     * Note: the clear value for MCS buffers is all 1's, so we memset to 0xff.
     */
-   mt->aux_buf = intel_alloc_aux_buffer(brw, "mcs-miptree", &temp_mcs_surf,
+   mt->aux_buf = intel_alloc_aux_buffer(brw, &temp_mcs_surf,
                                         alloc_flags, true, 0xFF, mt);
    if (!mt->aux_buf) {
       free(aux_state);
@@ -1814,7 +1813,7 @@ intel_miptree_alloc_ccs(struct brw_context *brw,
     * For CCS_D, do the same thing. On gen9+, this avoids having any undefined
     * bits in the aux buffer.
     */
-   mt->aux_buf = intel_alloc_aux_buffer(brw, "ccs-miptree", &temp_ccs_surf,
+   mt->aux_buf = intel_alloc_aux_buffer(brw, &temp_ccs_surf,
                                         BO_ALLOC_ZEROED, false, 0, mt);
    if (!mt->aux_buf) {
       free(aux_state);
@@ -1881,7 +1880,7 @@ intel_miptree_alloc_hiz(struct brw_context *brw,
    assert(ok);
 
    const uint32_t alloc_flags = 0;
-   mt->aux_buf = intel_alloc_aux_buffer(brw, "hiz-miptree", &temp_hiz_surf,
+   mt->aux_buf = intel_alloc_aux_buffer(brw, &temp_hiz_surf,
                                         alloc_flags, false, 0, mt);
 
    if (!mt->aux_buf) {
-- 
2.16.2



More information about the mesa-dev mailing list