From 585c95f8cc064e81cedd4522297c95bab25b2f01 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 29 Nov 2018 23:03:20 -0800 Subject: [PATCH] iris: Don't bother considering if the underlying surface is a cube Dave fixed it to consider whether the sampler view is a cube. With that, there's no point (possibly harm) in looking if the original resource was a cube...if it's an array view, we don't want to treat it as a cube anymore... --- src/gallium/drivers/iris/iris_state.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index d35738ea51c..9ef6df7770e 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -1523,9 +1523,7 @@ iris_create_sampler_view(struct pipe_context *ctx, isv->res = (struct iris_resource *) tex; - isl_surf_usage_flags_t usage = - ISL_SURF_USAGE_TEXTURE_BIT | - (isv->res->surf.usage & ISL_SURF_USAGE_CUBE_BIT); + isl_surf_usage_flags_t usage = ISL_SURF_USAGE_TEXTURE_BIT; if (isv->base.target == PIPE_TEXTURE_CUBE || isv->base.target == PIPE_TEXTURE_CUBE_ARRAY) -- 2.30.2