diff options
author | Eleni Maria Stea <estea@igalia.com> | 2019-02-15 15:29:44 +0200 |
---|---|---|
committer | Nanley Chery <nanley.g.chery@intel.com> | 2019-02-15 15:54:41 -0800 |
commit | 7188e2ba1577fb6e4cf3cb07b73e3fd15950d635 (patch) | |
tree | be77d6167e9780cfff8820f5ff8f081d1c6c5352 /src/mesa/drivers/dri/i965/intel_mipmap_tree.c | |
parent | 248f2e788860240ab84fc10f0d18332c34712b85 (diff) |
i965: Removed the field etc_format from the struct intel_mipmap_tree
After the previous changes to emulate the ETC/EAC formats using the
secondary shadow miptree, the etc_format field of the intel_mipmap_tree
struct became redundant and the remaining check that used it has been
replaced. (Nanley Chery)
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 7146fcb6582..426782c5883 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -706,7 +706,6 @@ miptree_create(struct brw_context *brw, if (intel_miptree_needs_fake_etc(brw, mt)) { mesa_format decomp_format = intel_lower_compressed_format(brw, format); - mt->etc_format = format; mt->shadow_mt = make_surface(brw, target, decomp_format, first_level, last_level, width0, height0, depth0, num_samples, tiling_flags, @@ -717,10 +716,6 @@ miptree_create(struct brw_context *brw, intel_miptree_release(&mt); return NULL; } - - mt->shadow_mt->etc_format = MESA_FORMAT_NONE; - } else { - mt->etc_format = MESA_FORMAT_NONE; } if (needs_separate_stencil(brw, mt, format)) { @@ -1302,8 +1297,6 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt, mt_format = MESA_FORMAT_Z24_UNORM_S8_UINT; if (mt->format == MESA_FORMAT_Z_FLOAT32 && mt->stencil_mt) mt_format = MESA_FORMAT_Z32_FLOAT_S8X24_UINT; - if (mt->etc_format != MESA_FORMAT_NONE) - mt_format = mt->etc_format; if (_mesa_get_srgb_format_linear(image->TexFormat) != _mesa_get_srgb_format_linear(mt_format)) |