From 84edfef34dac7761498a4f8fd8ccdf29a9f9c00a Mon Sep 17 00:00:00 2001 From: unexploredtest Date: Mon, 12 Apr 2021 20:50:33 +0430 Subject: [PATCH 1/3] trying to fix add_library for glslang --- src/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1ab2d3eb..01664967c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,7 +161,9 @@ if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) glslang SPIRV) else() - find_package(glslang CONFIG REQUIRED) + + find_library(glslang INTERFACE) + find_library(SPIRV INTERFACE) target_include_directories( kompute PRIVATE @@ -171,8 +173,8 @@ if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) # Not including hlsl support # glslang::HLSL # Adding explicit dependencies to match above - glslang::glslang - glslang::SPIRV) + glslang + SPIRV) endif() endif() From 629c6e38cec243a319e5f4065aa75422db4188bd Mon Sep 17 00:00:00 2001 From: unexploredtest Date: Fri, 16 Apr 2021 17:22:17 +0430 Subject: [PATCH 2/3] changing the way deviceCount is obtained for compatibality --- src/Manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Manager.cpp b/src/Manager.cpp index 025ff804c..2ed6aa4df 100644 --- a/src/Manager.cpp +++ b/src/Manager.cpp @@ -290,7 +290,7 @@ Manager::createDevice(const std::vector& familyQueueIndices, // Getting an integer that says how many vuklan devices we have uint32_t deviceCount = 0; - vkEnumeratePhysicalDevices(*(this->mInstance), &deviceCount, nullptr); + this->mInstance->enumeratePhysicalDevices(&deviceCount, nullptr); // This means there are no devices at all if (deviceCount == 0) { From 429628f246869729ac748aeae2a24d7479650edc Mon Sep 17 00:00:00 2001 From: unexploredtest Date: Fri, 16 Apr 2021 17:34:30 +0430 Subject: [PATCH 3/3] Removed inconsistancies with original branch --- src/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 01664967c..c1ab2d3eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,9 +161,7 @@ if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) glslang SPIRV) else() - - find_library(glslang INTERFACE) - find_library(SPIRV INTERFACE) + find_package(glslang CONFIG REQUIRED) target_include_directories( kompute PRIVATE @@ -173,8 +171,8 @@ if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) # Not including hlsl support # glslang::HLSL # Adding explicit dependencies to match above - glslang - SPIRV) + glslang::glslang + glslang::SPIRV) endif() endif()