diff options
| author | Mike Blumenkrantz <[email protected]> | 2019-05-29 16:27:39 -0400 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-07-02 15:39:44 -0700 |
| commit | e0054704665917a23e7d19c838059dab20d8d2b9 (patch) | |
| tree | 933e5d4d1872ef5f42d9b41e575da9a9fc4b6a24 /src | |
| parent | e708261cb7c31b40313a5d46276c8370bdfc6d41 (diff) | |
iris: assert isl_surf_init success in resource_from_handle
this can fail unexpectedly due to bugs, so it's good to provide feedback
when this occurs
Reviewed-by: Sagar Ghuge <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/iris/iris_resource.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 8b7640aa4b6..00e504a9ebe 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -782,20 +782,21 @@ iris_resource_from_handle(struct pipe_screen *pscreen, if (templ->target == PIPE_BUFFER) { res->surf.tiling = ISL_TILING_LINEAR; } else { - isl_surf_init(&screen->isl_dev, &res->surf, - .dim = target_to_isl_surf_dim(templ->target), - .format = fmt.fmt, - .width = templ->width0, - .height = templ->height0, - .depth = templ->depth0, - .levels = templ->last_level + 1, - .array_len = templ->array_size, - .samples = MAX2(templ->nr_samples, 1), - .min_alignment_B = 0, - .row_pitch_B = whandle->stride, - .usage = isl_usage, - .tiling_flags = 1 << res->mod_info->tiling); - + UNUSED const bool isl_surf_created_successfully = + isl_surf_init(&screen->isl_dev, &res->surf, + .dim = target_to_isl_surf_dim(templ->target), + .format = fmt.fmt, + .width = templ->width0, + .height = templ->height0, + .depth = templ->depth0, + .levels = templ->last_level + 1, + .array_len = templ->array_size, + .samples = MAX2(templ->nr_samples, 1), + .min_alignment_B = 0, + .row_pitch_B = whandle->stride, + .usage = isl_usage, + .tiling_flags = 1 << res->mod_info->tiling); + assert(isl_surf_created_successfully); assert(res->bo->tiling_mode == isl_tiling_to_i915_tiling(res->surf.tiling)); |