From c4e8b1cddb432315196af65b86cbdd63694c7dc1 Mon Sep 17 00:00:00 2001 From: Viktoriia Palianytsia Date: Mon, 20 Mar 2023 13:41:16 +0200 Subject: [PATCH] iris,crocus: Add proper way of assigning num_levels value Changes miptree_level_range_length function to use correct macro and num_levels value assignment. Closes: mesa/mesa#8256 Signed-off-by: Viktoriia Palianytsia Reviewed-by: Nanley Chery Part-of: --- src/gallium/drivers/crocus/crocus_resolve.c | 4 ++-- src/gallium/drivers/iris/iris_resolve.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/crocus/crocus_resolve.c b/src/gallium/drivers/crocus/crocus_resolve.c index 3629785cd3a..b32b8796707 100644 --- a/src/gallium/drivers/crocus/crocus_resolve.c +++ b/src/gallium/drivers/crocus/crocus_resolve.c @@ -760,8 +760,8 @@ miptree_level_range_length(const struct crocus_resource *res, { assert(start_level < res->surf.levels); - if (num_levels == INTEL_REMAINING_LAYERS) - num_levels = res->surf.levels; + if (num_levels == INTEL_REMAINING_LEVELS) + num_levels = res->surf.levels - start_level; /* Check for overflow */ assert(start_level + num_levels >= start_level); diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index 3078ad4eb2c..3c228780fb4 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -751,8 +751,8 @@ miptree_level_range_length(const struct iris_resource *res, { assert(start_level < res->surf.levels); - if (num_levels == INTEL_REMAINING_LAYERS) - num_levels = res->surf.levels; + if (num_levels == INTEL_REMAINING_LEVELS) + num_levels = res->surf.levels - start_level; /* Check for overflow */ assert(start_level + num_levels >= start_level);