KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "intel/isl: Ignore base_array_layer and array_len for 3D storage..." 

This reverts commit 3943888c94.  It turns out
that commit was pretty-much bogus since it breaks binding a 3-D texture as a
2-D storage image.  The correct fix for the Vulkan CTS tests needs to be in
the Vulkan driver itself rather than ISL.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2016-09-13 12:55:25 -07:00
parent 330104464f
commit 106709db7b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/isl/isl_surface_state.c
View File

@ -341,14 +341,10 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
* Since it's already initialized to 0, we can just leave it alone for
* texture surfaces.
*/
if (info->view->usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) {
if (info->view->usage & (ISL_SURF_USAGE_RENDER_TARGET_BIT |
ISL_SURF_USAGE_STORAGE_BIT)) {
s.MinimumArrayElement = info->view->base_array_layer;
s.RenderTargetViewExtent = info->view->array_len - 1;
} else if (info->view->usage & ISL_SURF_USAGE_STORAGE_BIT) {
s.MinimumArrayElement = 0;
s.RenderTargetViewExtent =
isl_minify(info->surf->logical_level0_px.depth,
info->view->base_level) - 1;
}
break;
default: