fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/miptree: Share tiling_flags in miptree_create

Browse source 
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Nanley Chery 2018-06-11 10:23:23 -07:00
parent 6c9947c3ef
commit fbe01625f6
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -686,11 +686,16 @@ miptree_create(struct brw_context *brw,
enum intel_miptree_create_flags flags) enum intel_miptree_create_flags flags)
{ {
const struct gen_device_info *devinfo = &brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
isl_tiling_flags_t tiling_flags = ISL_TILING_ANY_MASK;
/* TODO: This used to be because there wasn't BLORP to handle Y-tiling. */
if (devinfo->gen < 6 && _mesa_is_format_color_format(format))
tiling_flags &= ~ISL_TILING_Y0_BIT;
if (format == MESA_FORMAT_S_UINT8) if (format == MESA_FORMAT_S_UINT8)
return make_surface(brw, target, format, first_level, last_level, return make_surface(brw, target, format, first_level, last_level,
width0, height0, depth0, num_samples, width0, height0, depth0, num_samples,
ISL_TILING_W_BIT, tiling_flags,
ISL_SURF_USAGE_STENCIL_BIT | ISL_SURF_USAGE_STENCIL_BIT |
ISL_SURF_USAGE_TEXTURE_BIT, ISL_SURF_USAGE_TEXTURE_BIT,
BO_ALLOC_BUSY, BO_ALLOC_BUSY,
@ -708,7 +713,7 @@ miptree_create(struct brw_context *brw,
struct intel_mipmap_tree *mt = make_surface( struct intel_mipmap_tree *mt = make_surface(
brw, target, devinfo->gen >= 6 ? depth_only_format : format, brw, target, devinfo->gen >= 6 ? depth_only_format : format,
first_level, last_level, first_level, last_level,
width0, height0, depth0, num_samples, ISL_TILING_Y0_BIT, width0, height0, depth0, num_samples, tiling_flags,
ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT, ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT,
BO_ALLOC_BUSY, 0, NULL); BO_ALLOC_BUSY, 0, NULL);
@ -735,12 +740,6 @@ miptree_create(struct brw_context *brw,
if (flags & MIPTREE_CREATE_BUSY) if (flags & MIPTREE_CREATE_BUSY)
alloc_flags |= BO_ALLOC_BUSY; alloc_flags |= BO_ALLOC_BUSY;
isl_tiling_flags_t tiling_flags = ISL_TILING_ANY_MASK;
/* TODO: This used to be because there wasn't BLORP to handle Y-tiling. */
if (devinfo->gen < 6)
tiling_flags &= ~ISL_TILING_Y0_BIT;
struct intel_mipmap_tree *mt = make_surface( struct intel_mipmap_tree *mt = make_surface(
brw, target, format, brw, target, format,
first_level, last_level, first_level, last_level,