commit 431774d334a8ce83c7476fde4b30c2c181dfa26c
author Karl Schultz <karl@lunarg.com> Fri Feb 12 13:51:56 2016 -0700
committer Karl Schultz <karl@lunarg.com> Fri Feb 12 13:51:56 2016 -0700
tree af75314e88b3c4542a09564d89dc4f9b2d6a2fe5
parent 8888d0fed2ef164a6f94df67a2ca179269e62c4b

vktrace: fix crashes while tracing vulkaninfo

.gitignore

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

vktrace/src/vktrace_layer/vktrace_lib_trace.cpp

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;