Commit d084824e by Chris Forbes

Allow VS-only pipeline

This has really spotty coverage [see VK-GL-CTS #1770], but is legal. Test: dEQP-VK.api.descriptor_set.descriptor_set_layout_lifetime.graphics Change-Id: I1452fb7a2146e882f6d792d153135ff8b474aca4 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31069Tested-by: 's avatarChris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 0b8234b4
...@@ -237,7 +237,6 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn ...@@ -237,7 +237,6 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
~(VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT | ~(VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT |
VK_PIPELINE_CREATE_DERIVATIVE_BIT | VK_PIPELINE_CREATE_DERIVATIVE_BIT |
VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT)) != 0) || VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT)) != 0) ||
(pCreateInfo->stageCount != 2) ||
(pCreateInfo->pTessellationState != nullptr)) (pCreateInfo->pTessellationState != nullptr))
{ {
UNIMPLEMENTED("pCreateInfo settings"); UNIMPLEMENTED("pCreateInfo settings");
...@@ -464,10 +463,12 @@ void GraphicsPipeline::compileShaders(const VkAllocationCallbacks* pAllocator, c ...@@ -464,10 +463,12 @@ void GraphicsPipeline::compileShaders(const VkAllocationCallbacks* pAllocator, c
switch (pStage->stage) switch (pStage->stage)
{ {
case VK_SHADER_STAGE_VERTEX_BIT: case VK_SHADER_STAGE_VERTEX_BIT:
ASSERT(vertexShader == nullptr);
context.vertexShader = vertexShader = spirvShader; context.vertexShader = vertexShader = spirvShader;
break; break;
case VK_SHADER_STAGE_FRAGMENT_BIT: case VK_SHADER_STAGE_FRAGMENT_BIT:
ASSERT(fragmentShader == nullptr);
context.pixelShader = fragmentShader = spirvShader; context.pixelShader = fragmentShader = spirvShader;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment