Skip to content

Commit 55d886a

Browse files
committed
Fetch extension strings after any potential modification
1 parent 14a4b28 commit 55d886a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,14 +4172,6 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
41724172
createInfo.enabledLayerCount = 0;
41734173
createInfo.ppEnabledLayerNames = NULL;
41744174

4175-
rdcarray<const char *> extArray;
4176-
extArray.resize(Extensions.size());
4177-
for(size_t i = 0; i < Extensions.size(); i++)
4178-
extArray[i] = Extensions[i].c_str();
4179-
4180-
createInfo.enabledExtensionCount = (uint32_t)extArray.size();
4181-
createInfo.ppEnabledExtensionNames = extArray.data();
4182-
41834175
byte *tempMem = GetTempMemory(GetNextPatchSize(createInfo.pNext));
41844176

41854177
UnwrapNextChain(m_State, "VkDeviceCreateInfo", tempMem, (VkBaseInStructure *)&createInfo);
@@ -4198,6 +4190,14 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
41984190
NVAftermath_Init();
41994191
NVAftermath_EnableVK(supportedExtensions, Extensions, &createInfo.pNext);
42004192

4193+
rdcarray<const char *> extArray;
4194+
extArray.resize(Extensions.size());
4195+
for(size_t i = 0; i < Extensions.size(); i++)
4196+
extArray[i] = Extensions[i].c_str();
4197+
4198+
createInfo.enabledExtensionCount = (uint32_t)extArray.size();
4199+
createInfo.ppEnabledExtensionNames = extArray.data();
4200+
42014201
vkr = GetDeviceDispatchTable(NULL)->CreateDevice(Unwrap(physicalDevice), &createInfo, NULL,
42024202
&device);
42034203

0 commit comments

Comments
 (0)