commit 0bacc751b4d175e4731d5a7a33aab2ac5a9c2c8f
author Shahbaz Youssefi <syoussefi@google.com> Sun Mar 24 22:49:35 2024 -0400
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 28 01:59:07 2024 +0000
tree cc95645b3c9a7fa0ee67280ad1e3b29001b18f26
parent bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca

Fix crash in asserts with VK_EXT_vertex_input_dynamic_state

Assertions that there are no flags in
VkPipelineVertexInputStateCreateInfo did not account for the fact the
pointer may be nullptr if vertex input state is dynamic.

Test: dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.instanced.dynamic_state_draw_*
Change-Id: Idb17beca9513e57822be95783b53b21d969d85a7
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/73188
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
Presubmit-Ready: Shahbaz Youssefi <syoussefi@google.com>
Tested-by: Shahbaz Youssefi <syoussefi@google.com>

src/Device/Context.cpp

diff --git a/src/Device/Context.cpp b/src/Device/Context.cpp
index 1cecc19..71c6811 100644
--- a/src/Device/Context.cpp
+++ b/src/Device/Context.cpp
@@ -315,12 +315,6 @@
 
 void Inputs::initialize(const VkPipelineVertexInputStateCreateInfo *vertexInputState, const VkPipelineDynamicStateCreateInfo *dynamicStateCreateInfo)
 {
-	if(vertexInputState->flags != 0)
-	{
-		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
-		UNSUPPORTED("vertexInputState->flags");
-	}
-
 	dynamicStateFlags = ParseInputsDynamicStateFlags(dynamicStateCreateInfo);
 
 	if(dynamicStateFlags.dynamicVertexInput)
@@ -328,6 +322,12 @@
 		return;
 	}
 
+	if(vertexInputState->flags != 0)
+	{
+		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
+		UNSUPPORTED("vertexInputState->flags");
+	}
+
 	// Temporary in-binding-order representation of buffer strides, to be consumed below
 	// when considering attributes. TODO: unfuse buffers from attributes in backend, is old GL model.
 	uint32_t vertexStrides[MAX_VERTEX_INPUT_BINDINGS];
@@ -513,7 +513,7 @@
 {
 	dynamicStateFlags = allDynamicStateFlags.vertexInputInterface;
 
-	if(vertexInputState->flags != 0)
+	if(vertexInputState && vertexInputState->flags != 0)
 	{
 		// Vulkan 1.2: "flags is reserved for future use." "flags must be 0"
 		UNSUPPORTED("vertexInputState->flags");