vk/formats: Document new meaning of anv_format::cpp

[mesa.git] / src / vulkan / device.c

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 3c5691f3cb3d3a71f2ac55e4c6499d1a64d7001d..74771e300314acae87f6b85abe7088bcf5d3ce33 100644 (file)
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -2710,7 +2710,7 @@ anv_cmd_buffer_alloc_surface_state(struct anv_cmd_buffer *cmd_buffer,
 {
    struct anv_state state;
 
-   state.offset = ALIGN_U32(cmd_buffer->surface_next, alignment);
+   state.offset = align_u32(cmd_buffer->surface_next, alignment);
    if (state.offset + size > cmd_buffer->surface_batch_bo->bo.size)
       return (struct anv_state) { 0 };
 
@@ -3763,6 +3763,7 @@ anv_cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer,
       cmd_buffer->framebuffer->depth_stencil;
 
    /* FIXME: Implement the PMA stall W/A */
+   /* FIXME: Width and Height are wrong */
 
    anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DEPTH_BUFFER,
                   .SurfaceType = SURFTYPE_2D,
@@ -3779,7 +3780,7 @@ anv_cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer,
                   .MinimumArrayElement = 0,
                   .DepthBufferObjectControlState = GEN8_MOCS,
                   .RenderTargetViewExtent = 1 - 1,
-                  .SurfaceQPitch = 0);
+                  .SurfaceQPitch = view->depth_qpitch >> 2);
 
    /* Disable hierarchial depth buffers. */
    anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_HIER_DEPTH_BUFFER);
@@ -3789,7 +3790,7 @@ anv_cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer,
                   .StencilBufferObjectControlState = GEN8_MOCS,
                   .SurfacePitch = view->stencil_stride > 0 ? view->stencil_stride - 1 : 0,
                   .SurfaceBaseAddress = { view->bo, view->stencil_offset },
-                  .SurfaceQPitch = 0);
+                  .SurfaceQPitch = view->stencil_qpitch >> 2);
 
    /* Clear the clear params. */
    anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_CLEAR_PARAMS);