vktrace: fix crashes while tracing vulkaninfo
diff --git a/.gitignore b/.gitignore
index 463e52a..3a076df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,4 @@
dbuild
vktrace/src/vktrace_extensions/vktracevulkan/codegen_vktrace_utils
vktrace/src/vktrace_extensions/vktracevulkan/vkreplay/codegen
-vktrace/src/vktrace_extensions/vktracevulkan/vktrace/codegen
vktrace/src/vktrace_extensions/vktracevulkan/vulkan/codegen_utils
diff --git a/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp b/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp
index c38fe43..490faf2 100644
--- a/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp
+++ b/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp
@@ -565,7 +565,10 @@
char **ppName = (char **) &localCreateInfo.ppEnabledLayerNames[i];
*ppName = (char *) pCreateInfo->ppEnabledLayerNames[i];
}
- localCreateInfo.pNext = strip_create_extensions(pCreateInfo->pNext);
+ //localCreateInfo.pNext = strip_create_extensions(pCreateInfo->pNext);
+ // The pNext pointer isn't getting marshalled into the trace buffer properly anyway, so
+ // set it to NULL so that replay does not trip over it.
+ localCreateInfo.pNext = NULL;
CREATE_TRACE_PACKET(vkCreateInstance, sizeof(VkInstance) + get_struct_chain_size((void*)&localCreateInfo) + sizeof(VkAllocationCallbacks));
pHeader->vktrace_begin_time = vktraceStartTime;
pHeader->entrypoint_begin_time = startTime;