Skip to content

Commit d493ded

Browse files
committed
GPU Display: Use 1-argument Vulkan loader which might be compatible to more Vulkan implementations
1 parent 79f1117 commit d493ded

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

GPU/GPUTracking/display/backend/GPUDisplayBackendOpenGL.cxx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,23 @@ GPUDisplayBackendOpenGL::GPUDisplayBackendOpenGL()
6161
mBackendName = "OpenGL";
6262
}
6363

64-
#ifdef GPUCA_DISPLAY_GL3W
6564
int32_t GPUDisplayBackendOpenGL::ExtInit()
6665
{
66+
#ifdef GPUCA_DISPLAY_GL3W
6767
return gl3wInit();
68-
}
6968
#else
70-
int32_t GPUDisplayBackendOpenGL::ExtInit()
71-
{
7269
return glewInit();
73-
}
7470
#endif
75-
#ifdef GPUCA_DISPLAY_OPENGL_CORE
71+
}
72+
7673
bool GPUDisplayBackendOpenGL::CoreProfile()
7774
{
75+
#ifdef GPUCA_DISPLAY_OPENGL_CORE
7876
return true;
79-
}
8077
#else
81-
bool GPUDisplayBackendOpenGL::CoreProfile()
82-
{
8378
return false;
84-
}
8579
#endif
80+
}
8681

8782
// #define CHKERR(cmd) {cmd;}
8883
#define CHKERR(cmd) \

GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ double GPUDisplayBackendVulkan::checkDevice(vk::PhysicalDevice device, const std
340340

341341
void GPUDisplayBackendVulkan::createDevice()
342342
{
343-
VULKAN_HPP_DEFAULT_DISPATCHER.init();
343+
VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
344344
vk::ApplicationInfo appInfo{};
345345
appInfo.pApplicationName = "GPU CA Standalone display";
346346
appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
@@ -355,8 +355,7 @@ void GPUDisplayBackendVulkan::createDevice()
355355
uint32_t frontendExtensionCount = mDisplay->frontend()->getReqVulkanExtensions(frontendExtensions);
356356
std::vector<const char*> reqInstanceExtensions(frontendExtensions, frontendExtensions + frontendExtensionCount);
357357

358-
const std::vector<const char*> reqValidationLayers = {
359-
"VK_LAYER_KHRONOS_validation"};
358+
const std::vector<const char*> reqValidationLayers = {"VK_LAYER_KHRONOS_validation"};
360359
auto debugCallback = [](vk::DebugUtilsMessageSeverityFlagBitsEXT messageSeverity, vk::DebugUtilsMessageTypeFlagsEXT messageType, const vk::DebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData) -> VkBool32 {
361360
static int32_t throwOnError = getenv("GPUCA_VULKAN_VALIDATION_THROW") ? atoi(getenv("GPUCA_VULKAN_VALIDATION_THROW")) : 0;
362361
static bool showVulkanValidationInfo = getenv("GPUCA_VULKAN_VALIDATION_INFO") && atoi(getenv("GPUCA_VULKAN_VALIDATION_INFO"));

0 commit comments

Comments
 (0)