and drop local copy.
Suggested-by: Daniel Stone <dani...@collabora.com>
Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
---
src/mesa/drivers/dri/i965/intel_blit.h | 13 -------------
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_blit.h
b/src/mesa/drivers/dri/i965/intel_blit.h
index 5e4d1f5eb4..2604417e2d 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.h
+++ b/src/mesa/drivers/dri/i965/intel_blit.h
@@ -28,19 +28,6 @@
#include "brw_context.h"
-static inline unsigned
-isl_tiling_to_bufmgr_tiling(enum isl_tiling tiling)
-{
- if (tiling == ISL_TILING_X)
- return I915_TILING_X;
-
- if (tiling == ISL_TILING_Y0)
- return I915_TILING_Y;
-
- /* All other are unknown to buffer allocator. */
- return I915_TILING_NONE;
-}
-
bool
intelEmitCopyBlit(struct brw_context *brw,
GLuint cpp,
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 418ec3cf06..c6308e9456 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -782,7 +782,7 @@ make_surface(struct brw_context *brw, GLenum target,
mesa_format format,
if (!bo) {
mt->bo = brw_bo_alloc_tiled(brw->bufmgr, "isl-miptree",
mt->surf.size,
- isl_tiling_to_bufmgr_tiling(
+ isl_tiling_to_i915_tiling(
mt->surf.tiling),
mt->surf.row_pitch, alloc_flags);
if (!mt->bo)
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
