From c53a67d4693745e52127b9ea027ecbf9e87ae639 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 8 Dec 2018 02:01:19 -0800 Subject: [PATCH] iris: be sure to skip buffers in resolve code Buffers don't have ISL surfaces, and this can get us into trouble. --- src/gallium/drivers/iris/iris_resolve.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index aedc12f125b..eb8552a3aca 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -94,6 +94,9 @@ resolve_sampler_views(struct iris_context *ice, struct iris_sampler_view *isv = shs->textures[i]; struct iris_resource *res = (void *) isv->base.texture; + if (res->base.target == PIPE_BUFFER) + continue; + if (batch->name != IRIS_BATCH_COMPUTE) { disable_rb_aux_buffer(ice, draw_aux_buffer_disabled, res, isv->view.base_level, isv->view.levels, @@ -122,6 +125,9 @@ resolve_image_views(struct iris_context *ice, const int i = u_bit_scan(&views); struct iris_resource *res = (void *) shs->image[i].res; + if (res->base.target == PIPE_BUFFER) + continue; + if (batch->name != IRIS_BATCH_COMPUTE) { disable_rb_aux_buffer(ice, draw_aux_buffer_disabled, res, 0, ~0, "as a shader image"); -- 2.30.2