From d4de918ad086683c4df4b7d861c27bbce61d6c92 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 22 Jan 2016 15:07:12 -0800 Subject: [PATCH] gen8/state: Remove SKL special-casing for MinimumArrayElement MinimumArrayElement carries the same meaning for BDW and SKL. Suggested by Jason. No regressions in dEQP-VK.pipeline.image.view_type.cube_array.* Fixes a number of cube tests, including cube_array_base_slice and cube_base_slice tests. --- src/vulkan/gen8_state.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c index 01099f4..ce142e6 100644 --- a/src/vulkan/gen8_state.c +++ b/src/vulkan/gen8_state.c @@ -260,17 +260,10 @@ genX(fill_image_surface_state)(struct anv_device *device, void *state_map, template.RenderTargetViewExtent = template.Depth; break; case SURFTYPE_CUBE: - #if ANV_GENx10 >= 90 - /* Like SURFTYPE_2D, but divided by 6. */ - template.MinimumArrayElement = range->baseArrayLayer / 6; - template.Depth = range->layerCount / 6 - 1; - template.RenderTargetViewExtent = template.Depth; - #else - /* Same as SURFTYPE_2D */ - template.MinimumArrayElement = range->baseArrayLayer; - template.Depth = range->layerCount / 6 - 1; - template.RenderTargetViewExtent = template.Depth; - #endif + template.MinimumArrayElement = range->baseArrayLayer; + /* Same as SURFTYPE_2D, but divided by 6 */ + template.Depth = range->layerCount / 6 - 1; + template.RenderTargetViewExtent = template.Depth; break; case SURFTYPE_3D: template.MinimumArrayElement = range->baseArrayLayer; -- 2.7.4