Skip to content

S
swiftshader
Commit 7b29abfc by Alexis Hetu Committed by Alexis Hétu
Options

Improved pNext pointer handling

- Added a loop for handling pNext pointers everywhere in libVulkan.cpp where the wasn't already one, in order to always output the unsupported structure type(s) received by the library - Changed UNIMPLEMENTED to WARN for unhandled pNext pointers Fixes the test: dEQP-VK.api.smoke.triangle_ext_structs Bug: b/144999059 b/119321052 Change-Id: Id83b5e74c8925dbd38651747b0cea46fac4a69a4 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38548 Presubmit-Ready: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarSean Risser <srisser@google.com> Reviewed-by: 's avatarChris Forbes <chrisforbes@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent a59e70ec
Showing with 4 additions and 2 deletions
src/Vulkan/VkPipeline.cpp
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "VkPipelineCache.hpp" #include "VkPipelineCache.hpp"
#include "VkPipelineLayout.hpp" #include "VkPipelineLayout.hpp"
#include "VkShaderModule.hpp" #include "VkShaderModule.hpp"
#include "VkStringify.hpp"
#include "VkRenderPass.hpp" #include "VkRenderPass.hpp"
#include "Pipeline/ComputeProgram.hpp" #include "Pipeline/ComputeProgram.hpp"
#include "Pipeline/SpirvShader.hpp" #include "Pipeline/SpirvShader.hpp"
...@@ -419,7 +420,7 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn ...@@ -419,7 +420,7 @@ GraphicsPipeline::GraphicsPipeline(const VkGraphicsPipelineCreateInfo* pCreateIn
} }
break; break;
default: default:
UNIMPLEMENTED("extensionCreateInfo->sType"); WARN("pCreateInfo->pRasterizationState->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType));
break; break;
} }
......
src/Vulkan/VkRenderPass.cpp
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
// limitations under the License. // limitations under the License.
#include "VkRenderPass.hpp" #include "VkRenderPass.hpp"
#include "VkStringify.hpp"
#include <cstring> #include <cstring>
namespace vk namespace vk
...@@ -76,7 +77,7 @@ RenderPass::RenderPass(const VkRenderPassCreateInfo* pCreateInfo, void* mem) : ...@@ -76,7 +77,7 @@ RenderPass::RenderPass(const VkRenderPassCreateInfo* pCreateInfo, void* mem) :
break; break;
} }
default: default:
/* Unknown structure in pNext chain must be ignored */ WARN("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType));
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