diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2015-11-26 10:11:52 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2015-11-26 10:11:52 -0800 |
| commit | d6d82f1ab33b7885f11dd720e93d9890df27ce36 (patch) | |
| tree | f2e4e7b0addbf5d7acfb0e9da1e0539aa33ecba0 /src/vulkan/gen8_cmd_buffer.c | |
| parent | cd4721c062a300739b107925f801c9b9ced5f9fa (diff) | |
vk: Fix 3DSTATE_WM_DEPTH_STENCIL for gen8
This packet is a different size on gen8 and we hit an assertion when we
try to merge a gen9 size dword array from the pipeline with the gen8
sized array we create from dynamic state.
Use a static assert in the merge macro and fix this issue by using different
wm_depth_stencil arrays on gen8 and gen9.
Diffstat (limited to 'src/vulkan/gen8_cmd_buffer.c')
| -rw-r--r-- | src/vulkan/gen8_cmd_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/vulkan/gen8_cmd_buffer.c index 09315319001..1d1433817d9 100644 --- a/src/vulkan/gen8_cmd_buffer.c +++ b/src/vulkan/gen8_cmd_buffer.c @@ -248,7 +248,7 @@ cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer) pipeline->gen8.raster); } - /* Stencil reference values were moves from COLOR_CALC_STATE in gen8 to + /* Stencil reference values moved from COLOR_CALC_STATE in gen8 to * 3DSTATE_WM_DEPTH_STENCIL in gen9. That means the dirty bits gets split * across different state packets for gen8 and gen9. We handle that by * using a big old #if switch here. @@ -347,7 +347,7 @@ cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer) GEN9_3DSTATE_WM_DEPTH_STENCIL_pack(NULL, dwords, &wm_depth_stencil); anv_batch_emit_merge(&cmd_buffer->batch, dwords, - pipeline->gen8.wm_depth_stencil); + pipeline->gen9.wm_depth_stencil); } #endif |