i965/bufmgr: Delete set_tiling

Entirely unused, and really shouldn't be used. The alloc functions already
take care of this. And even in a future where we're not going to
h/v-align tiled buffers in the bufmgr, but only in isl, I think we
still want to adjust the tiling mode in the bufmgr, since that ties in
closely to mmaps and stuff like that.

get_tiling is still needed for the import paths (until we have modifiers
everywhere).

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 01cccf6ffd99314cb3862e4c6e8fd945fa07360f..54206293de4bc846ca765cead5b623fa064d3adb 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -1128,23 +1128,6 @@ bo_set_tiling_internal(struct brw_bo *bo, uint32_t tiling_mode,
    return 0;
 }
 
-int
-brw_bo_set_tiling(struct brw_bo *bo, uint32_t *tiling_mode, uint32_t stride)
-{
-   int ret;
-
-   /* Linear buffers have no stride. By ensuring that we only ever use
-    * stride 0 with linear buffers, we simplify our code.
-    */
-   if (*tiling_mode == I915_TILING_NONE)
-      stride = 0;
-
-   ret = bo_set_tiling_internal(bo, *tiling_mode, stride);
-
-   *tiling_mode = bo->tiling_mode;
-   return ret;
-}
-
 int
 brw_bo_get_tiling(struct brw_bo *bo, uint32_t *tiling_mode,
                   uint32_t *swizzle_mode)

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index fb1059c1732076386848a404dc8b053076085d3d..53d51f2a59d9151d3029044c8bee20ccc07999ab 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -208,14 +208,6 @@ void brw_bo_wait_rendering(struct brw_bo *bo);
  */
 void brw_bufmgr_destroy(struct brw_bufmgr *bufmgr);
 
-/**
- * Ask that the buffer be placed in tiling mode
- *
- * \param buf Buffer to set tiling mode for
- * \param tiling_mode desired, and returned tiling mode
- */
-int brw_bo_set_tiling(struct brw_bo *bo, uint32_t *tiling_mode,
-                      uint32_t stride);
 /**
  * Get the current tiling (and resulting swizzling) mode for the bo.
  *