diff options
| author | dan sinclair <dj2@everburning.com> | 2019-03-20 15:41:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 15:41:07 -0700 |
| commit | 3acdaf91b5b2abb919e815d88cb668669743bf93 (patch) | |
| tree | 2fa2d705b22d9ff701db1d7aaff011f8f9f25050 | |
| parent | 05d1a6c90762f331a3e9d16dc4abea6623a5ae64 (diff) | |
| download | amber-3acdaf91b5b2abb919e815d88cb668669743bf93.tar.gz | |
[vulkan] Change vulkan generation location. (#390)
The src/ folder does not always exist when building the vulkan wrappers.
This CL changes the generation script to write to the binary directory
instead of <binary directory>/src.
| -rw-r--r-- | src/vulkan/device.cc | 2 | ||||
| -rw-r--r-- | src/vulkan/device.h | 2 | ||||
| -rwxr-xr-x | tools/update_vk_wrappers.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/vulkan/device.cc b/src/vulkan/device.cc index 7059942..7febc3a 100644 --- a/src/vulkan/device.cc +++ b/src/vulkan/device.cc @@ -365,7 +365,7 @@ Result Device::LoadVulkanPointers(PFN_vkGetInstanceProcAddr getInstanceProcAddr, if (delegate && delegate->LogGraphicsCalls()) delegate->Log("Loading Vulkan Pointers"); -#include "src/vk-wrappers.inc" +#include "vk-wrappers.inc" return {}; } diff --git a/src/vulkan/device.h b/src/vulkan/device.h index 3a0e833..5585474 100644 --- a/src/vulkan/device.h +++ b/src/vulkan/device.h @@ -28,7 +28,7 @@ namespace amber { namespace vulkan { struct VulkanPtrs { -#include "src/vk-wrappers.h" +#include "vk-wrappers.h" // NOLINT(build/include) }; class Device { diff --git a/tools/update_vk_wrappers.py b/tools/update_vk_wrappers.py index 995558d..9acfc8e 100755 --- a/tools/update_vk_wrappers.py +++ b/tools/update_vk_wrappers.py @@ -201,7 +201,7 @@ def main(): wrapper_content = gen_direct(data) header_content = gen_direct_headers(data) - outfile = os.path.join(outdir, 'src', 'vk-wrappers.inc') + outfile = os.path.join(outdir, 'vk-wrappers.inc') if os.path.isfile(outfile): with open(outfile, 'r') as f: if wrapper_content == f.read(): @@ -209,7 +209,7 @@ def main(): with open(outfile, 'w') as f: f.write(wrapper_content) - hdrfile = os.path.join(outdir, 'src', 'vk-wrappers.h') + hdrfile = os.path.join(outdir, 'vk-wrappers.h') if os.path.isfile(hdrfile): with open(hdrfile, 'r') as f: if header_content == f.read(): |