iris: Disallow incomplete resource creation

If a modifier specifies an aux, it must be created.

Fixes: 75a3947af46 ("iris/resource: Fall back to no aux if creation fails")
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index a45bcdb71ae028fe4f91040ece2955a5eb5e5bfe..61b47ae73b16dddd7e3e1ef94d5a1e4450b77417 100644 (file)
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -888,8 +888,12 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen,
       }
    }
 
-   if (!aux_enabled)
-      iris_resource_disable_aux(res);
+   if (!aux_enabled) {
+      if (res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE)
+         goto fail;
+      else
+         iris_resource_disable_aux(res);
+   }
 
    return &res->base;