Module: Mesa
Branch: master
Commit: eac752e54b5ec1b8d75d8c22c730af8c9c2a3007
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=eac752e54b5ec1b8d75d8c22c730af8c9c2a3007
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Tue Oct 11 18:26:17 2016 +0100
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.veli...@collabora.com>
Reviewed-by: Chad Versace <chadvers...@chromium.org>
---
src/intel/isl/isl_gen7.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
index 76213f8..b6a86d2 100644
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
@@ -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);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
