From c643e9cea87b4676e648e431d5c39f2880a1454c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 16 Dec 2015 17:27:35 -0800 Subject: anv/state: Allow levelCount to be 0 This can happen if the client is creating an image view of a textureable surface and they only ever intend to render to that view. --- src/vulkan/gen7_state.c | 4 ++-- src/vulkan/gen8_state.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c index c6de40d..cb299a3 100644 --- a/src/vulkan/gen7_state.c +++ b/src/vulkan/gen7_state.c @@ -329,7 +329,7 @@ genX(image_view_init)(struct anv_image_view *iview, * sampler engine is [SurfaceMinLOD, SurfaceMinLOD + MIPCountLOD]. */ surface_state.SurfaceMinLOD = range->baseMipLevel; - surface_state.MIPCountLOD = range->levelCount - 1; + surface_state.MIPCountLOD = MIN2(range->levelCount, 1) - 1; GENX(RENDER_SURFACE_STATE_pack)(NULL, iview->nonrt_surface_state.map, &surface_state); @@ -369,7 +369,7 @@ genX(image_view_init)(struct anv_image_view *iview, format->surface_format); surface_state.SurfaceMinLOD = range->baseMipLevel; - surface_state.MIPCountLOD = range->levelCount - 1; + surface_state.MIPCountLOD = MIN2(range->levelCount, 1) - 1; GENX(RENDER_SURFACE_STATE_pack)(NULL, iview->storage_surface_state.map, &surface_state); diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c index fe9f088..199905b 100644 --- a/src/vulkan/gen8_state.c +++ b/src/vulkan/gen8_state.c @@ -305,7 +305,7 @@ genX(image_view_init)(struct anv_image_view *iview, * sampler engine is [SurfaceMinLOD, SurfaceMinLOD + MIPCountLOD]. */ surface_state.SurfaceMinLOD = range->baseMipLevel; - surface_state.MIPCountLOD = range->levelCount - 1; + surface_state.MIPCountLOD = MIN2(range->levelCount, 1) - 1; GENX(RENDER_SURFACE_STATE_pack)(NULL, iview->nonrt_surface_state.map, &surface_state); @@ -344,7 +344,7 @@ genX(image_view_init)(struct anv_image_view *iview, format_info->surface_format); surface_state.SurfaceMinLOD = range->baseMipLevel; - surface_state.MIPCountLOD = range->levelCount - 1; + surface_state.MIPCountLOD = MIN2(range->levelCount, 1) - 1; GENX(RENDER_SURFACE_STATE_pack)(NULL, iview->storage_surface_state.map, &surface_state); -- cgit v1.1