KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isl/gen7: remove unneeded ISL_DEV_GEN check 

The function gen7_format_needs_valign2 has two callers - the gen7 only
gen7_choose_valign_el() and isl_gen6_filter_tiling(). The latter of
which already guarding the invocation appropriately.

To be extra cautious add a couple of asserts alongside the removal of the
runtime check.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
Emil Velikov 2016-10-11 18:26:17 +01:00 committed by Emil Velikov
parent 5b1efb65ce
commit eac752e54b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/isl/isl_gen7.c
View File

@ -155,9 +155,7 @@ static bool
gen7_format_needs_valign2(const struct isl_device *dev,
enum isl_format format)
{
/* This workaround applies only to gen7 */
if (ISL_DEV_GEN(dev) > 7)
return false;
assert(ISL_DEV_GEN(dev) == 7);
/* From the Ivybridge PRM (2012-05-31), Volume 4, Part 1, Section 2.12.1,
* RENDER_SURFACE_STATE Surface Vertical Alignment:
@ -391,6 +389,8 @@ isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el)
{
assert(ISL_DEV_GEN(dev) == 7);
/* Handled by isl_choose_image_alignment_el */
assert(info->format != ISL_FORMAT_HIZ);