diff options
| author | Topi Pohjolainen <[email protected]> | 2017-07-19 20:30:30 +0300 |
|---|---|---|
| committer | Topi Pohjolainen <[email protected]> | 2017-07-20 11:32:21 +0300 |
| commit | d8521b9960e4f0202cc61feb5eab4b34c0cfde60 (patch) | |
| tree | 7f55eaf7f1ea2f17037f0a25f0da354c83ba89aa /src/mesa/drivers/dri | |
| parent | a92e6ff31579649ecbd2a6d5d5cf7311916d2bac (diff) | |
i965/miptree: Use isl_tiling_to_i915_tiling()
and drop local copy.
Reviewed-by: Jason Ekstrand <[email protected]>
Signed-off-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_blit.h | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/intel_blit.h index 5e4d1f5eb4a..2604417e2d5 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 418ec3cf061..c6308e9456c 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) |