Skip to content

Commit c40d281

Browse files
committed
CVulkanConnection fix
1 parent f801543 commit c40d281

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

src/nbl/video/CVulkanConnection.cpp

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -190,25 +190,7 @@ namespace nbl::video
190190
};
191191

192192

193-
std::unique_ptr<CVulkanDebugCallback> debugCallback = nullptr;
194-
VkDebugUtilsMessengerCreateInfoEXT debugMessengerCreateInfo = { VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT };
195-
if (logger && enabledFeatures.debugUtils)
196-
{
197-
auto logLevelMask = logger->getLogLevelMask();
198-
debugCallback = std::make_unique<CVulkanDebugCallback>(std::move(logger));
199-
200-
debugMessengerCreateInfo.pNext = nullptr;
201-
debugMessengerCreateInfo.flags = 0;
202-
auto debugCallbackFlags = getDebugCallbackFlagsFromLogLevelMask(logLevelMask);
203-
debugMessengerCreateInfo.messageSeverity = debugCallbackFlags.first;
204-
debugMessengerCreateInfo.messageType = debugCallbackFlags.second;
205-
debugMessengerCreateInfo.pfnUserCallback = CVulkanDebugCallback::defaultCallback;
206-
debugMessengerCreateInfo.pUserData = debugCallback.get();
207-
208-
addStructToChain(&debugMessengerCreateInfo);
209-
}
210-
211-
VkValidationFeaturesEXT validationFeaturesEXT = { VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT };
193+
VkValidationFeaturesEXT validationFeaturesEXT = { VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT, nullptr };
212194
VkValidationFeatureEnableEXT validationsEnable[16u] = {};
213195
VkValidationFeatureDisableEXT validationsDisable[16u] = {};
214196
validationFeaturesEXT.pEnabledValidationFeatures = validationsEnable;
@@ -229,6 +211,23 @@ namespace nbl::video
229211
return nullptr;
230212
}
231213

214+
std::unique_ptr<CVulkanDebugCallback> debugCallback = nullptr;
215+
VkDebugUtilsMessengerCreateInfoEXT debugMessengerCreateInfo = { VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT, nullptr };
216+
if (logger && enabledFeatures.debugUtils)
217+
{
218+
auto logLevelMask = logger->getLogLevelMask();
219+
debugCallback = std::make_unique<CVulkanDebugCallback>(std::move(logger));
220+
221+
debugMessengerCreateInfo.flags = 0;
222+
auto debugCallbackFlags = getDebugCallbackFlagsFromLogLevelMask(logLevelMask);
223+
debugMessengerCreateInfo.messageSeverity = debugCallbackFlags.first;
224+
debugMessengerCreateInfo.messageType = debugCallbackFlags.second;
225+
debugMessengerCreateInfo.pfnUserCallback = CVulkanDebugCallback::defaultCallback;
226+
debugMessengerCreateInfo.pUserData = debugCallback.get();
227+
228+
addStructToChain(&debugMessengerCreateInfo);
229+
}
230+
232231
VkInstance vk_instance;
233232
{
234233
VkApplicationInfo applicationInfo = { VK_STRUCTURE_TYPE_APPLICATION_INFO };

0 commit comments

Comments
 (0)