Make vulkan build as optional #4815
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
| RunVulkanTutorial(); | ||
| #else | ||
| ORBIT_ERROR("Vulkan isn't enabled"); |
There was a problem hiding this comment.
Nit: Can you extend the comment to include the flag? Something like: "Compile with WITH_VULKAN".
There was a problem hiding this comment.
Thanks, done (commits are squashed).
| @@ -19,7 +19,9 @@ | |||
| #include "OrbitBase/ExecutablePath.h" | |||
| #include "OrbitBase/Logging.h" | |||
| #include "OrbitBase/ThreadUtils.h" | |||
| #include "VulkanTutorial/OffscreenRenderingVulkanTutorial.h" | |||
| #ifdef VULKAN_ENABLED | |||
| #include "VulkanTutorial/OffscreenRenderingVulkanTutorial.h" | |||
There was a problem hiding this comment.
clang-format:
| #include "VulkanTutorial/OffscreenRenderingVulkanTutorial.h" | |
| #include "VulkanTutorial/OffscreenRenderingVulkanTutorial.h" |
Add option WITH_VULKAN, which is ON by default. If set to OFF, modules OrbitTriggerCaptureVulkanLayer, OrbitVulkanLayer, and VulkanTutorial won't be built
alexkalmuk
force-pushed
the
make-vulkan-as-optional
branch
from
28008c9
to
de858a5
Compare
|
By the way, I didn't update conanfile.py with the new option, which means that for Conan build Vulkan is enabled unconditionally. |
I guess this is fine for now. |
Add option WITH_VULKAN, which is ON by default. If set to OFF, modules OrbitTriggerCaptureVulkanLayer, OrbitVulkanLayer, and VulkanTutorial won't be built
Add cmake option
WITH_VULKAN, which enables/disables Vulkan in Orbit in a straightforward way. It should introduce a bit of additional modularity to the Orbit. By default, this option set toON(i.e., Vulkan enabled).This change affects only Linux, related to #4814.
I'm not sure about one place:
orbit/src/OrbitGl/GpuSubmissionTrack.cpp
Lines 61 to 63 in 3034421
Basically, this file is compiled fine. On the other hand, it looks like it implicitly relies on Vulkan as a background layer.