diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2015-06-11 14:58:31 -0700 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2015-06-11 14:58:31 -0700 |
| commit | f7fe06cf0a6f39df406d7b18fa81f9dc31e05fea (patch) | |
| tree | 42b3a14b1122a81e14e42277def57f3f61b92944 | |
| parent | 9aae480cc45d0f73c9d0d33e19d1244e703b323b (diff) | |
vk: Disable shader stages in the graphics pipeline batch
We need to move this into the graphics pipeline batch so we don't emit it
for compute pipelines.
| -rw-r--r-- | src/vulkan/device.c | 22 | ||||
| -rw-r--r-- | src/vulkan/pipeline.c | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/vulkan/device.c b/src/vulkan/device.c index d06d83ab168..f5ca70b83ec 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -2429,28 +2429,6 @@ VkResult anv_BeginCommandBuffer( anv_cmd_buffer_emit_state_base_address(cmd_buffer); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VF_STATISTICS, - .StatisticsEnable = true); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_HS, .Enable = false); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_TE, .TEEnable = false); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DS, .FunctionEnable = false); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_STREAMOUT, .SOFunctionEnable = false); - - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS, - .ConstantBufferOffset = 0, - .ConstantBufferSize = 4); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS, - .ConstantBufferOffset = 4, - .ConstantBufferSize = 4); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS, - .ConstantBufferOffset = 8, - .ConstantBufferSize = 4); - - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_WM_CHROMAKEY, - .ChromaKeyKillEnable = false); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_SBE_SWIZ); - anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_AA_LINE_PARAMETERS); - return VK_SUCCESS; } diff --git a/src/vulkan/pipeline.c b/src/vulkan/pipeline.c index dcb28984c1b..28818152ae0 100644 --- a/src/vulkan/pipeline.c +++ b/src/vulkan/pipeline.c @@ -491,6 +491,28 @@ anv_pipeline_create( emit_ds_state(pipeline, ds_info); emit_cb_state(pipeline, cb_info); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_VF_STATISTICS, + .StatisticsEnable = true); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_HS, .Enable = false); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_TE, .TEEnable = false); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_DS, .FunctionEnable = false); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_STREAMOUT, .SOFunctionEnable = false); + + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_VS, + .ConstantBufferOffset = 0, + .ConstantBufferSize = 4); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS, + .ConstantBufferOffset = 4, + .ConstantBufferSize = 4); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_PS, + .ConstantBufferOffset = 8, + .ConstantBufferSize = 4); + + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_WM_CHROMAKEY, + .ChromaKeyKillEnable = false); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_SBE_SWIZ); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_AA_LINE_PARAMETERS); + anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_CLIP, .ClipEnable = true, .ViewportXYClipTestEnable = !(extra && extra->disable_viewport), |