From: Nanley Chery Date: Sat, 9 Jun 2018 23:45:02 +0000 (-0700) Subject: i965/miptree: Use make_surface in map_blit X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=684fa59eb6bf02c267770365e267dc7f14083658;p=mesa.git i965/miptree: Use make_surface in map_blit Do this so that we don't have to special case linearly-tiled depth buffers in miptree_create. Reviewed-by: Topi Pohjolainen --- diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index d2218402182..ef658ceb915 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -3119,12 +3119,12 @@ intel_miptree_map_blit(struct brw_context *brw, unsigned int level, unsigned int slice) { const struct gen_device_info *devinfo = &brw->screen->devinfo; - map->linear_mt = intel_miptree_create(brw, GL_TEXTURE_2D, mt->format, - /* first_level */ 0, - /* last_level */ 0, - map->w, map->h, 1, - /* samples */ 1, - MIPTREE_CREATE_LINEAR); + map->linear_mt = make_surface(brw, GL_TEXTURE_2D, mt->format, + 0, 0, map->w, map->h, 1, 1, + ISL_TILING_LINEAR_BIT, + ISL_SURF_USAGE_RENDER_TARGET_BIT | + ISL_SURF_USAGE_TEXTURE_BIT, + 0, 0, NULL); if (!map->linear_mt) { fprintf(stderr, "Failed to allocate blit temporary\n");