diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 4c27716d18e..2375070636e 100644
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -49,9 +49,9 @@ genX(fill_buffer_surface_state)(void *state, enum isl_format format,
       .TiledSurface                             = false,
       .RenderCacheReadWriteMode                 = false,
       .SurfaceObjectControlState                = GENX(MOCS),
-      .Height                                   = (num_elements >> 7) & 0x3fff,
-      .Width                                    = num_elements & 0x7f,
-      .Depth                                    = (num_elements >> 21) & 0x3f,
+      .Height                                   = ((num_elements - 1) >> 7) & 0x3fff,
+      .Width                                    = (num_elements - 1) & 0x7f,
+      .Depth                                    = ((num_elements - 1) >> 21) & 0x3f,
       .SurfacePitch                             = stride - 1,
 #  if (ANV_IS_HASWELL)
       .ShaderChannelSelectR                     = SCS_RED,