From a7ee842acd30578f4170f69124c3986ee35a6df8 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Tue, 1 Jul 2014 15:37:56 +0200 Subject: llvmpipe: get rid of llvmpipe_get_texture_tile_linear Because the layout is always linear this didn't really do much any longer - at some point this triggered per-tile swizzled->linear conversion. The x/y coords were ignored too. Apart from triggering conversion, this also invoked alloc_image_data(), which could only actually trigger mapping of display target resources. So, instead just call resource_map in the callers (which also gives the ability to unmap again). Note that mapping/unmapping of display target resources still isn't really all that clean (map/unmap may be unmatched, and all such mappings use the same pointer thus usage flags are a lie). Reviewed-by: Brian Paul --- src/gallium/drivers/llvmpipe/lp_texture.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/gallium/drivers/llvmpipe/lp_texture.h') diff --git a/src/gallium/drivers/llvmpipe/lp_texture.h b/src/gallium/drivers/llvmpipe/lp_texture.h index b1632268ea3..34c3f604066 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.h +++ b/src/gallium/drivers/llvmpipe/lp_texture.h @@ -217,12 +217,6 @@ ubyte * llvmpipe_get_texture_image_address(struct llvmpipe_resource *lpr, unsigned face_slice, unsigned level); -ubyte * -llvmpipe_get_texture_tile_linear(struct llvmpipe_resource *lpr, - unsigned face_slice, unsigned level, - enum lp_texture_usage usage, - unsigned x, unsigned y); - extern void llvmpipe_print_resources(void); -- cgit v1.2.3