diff options
| author | Ian Elliott <ianelliott@google.com> | 2015-11-18 14:57:08 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-01 10:18:23 -0700 |
| commit | 7519cfc098b9843c6883cb46bfd29ddc03249e4b (patch) | |
| tree | 5749b6cedcc1da5b9197a5a2e51290f3b0201fbd | |
| parent | 11b4cd253e18c29a90b469abbb730aeddbd11bcb (diff) | |
| download | usermoji-7519cfc098b9843c6883cb46bfd29ddc03249e4b.tar.xz | |
WSI: Eliminate a lot of references to WSI header files.
Conflicts:
include/vulkan/vk_layer.h
loader/loader.h
| -rw-r--r-- | include/vulkan/vk_layer.h | 2 | ||||
| -rw-r--r-- | loader/loader.h | 2 | ||||
| -rwxr-xr-x | vk_helper.py | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index ea137152..80fd943f 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -7,8 +7,6 @@ #include "vulkan/vulkan.h" #include "vulkan/vk_lunarg_debug_report.h" #include "vulkan/vk_lunarg_debug_marker.h" -#include "vulkan/vk_ext_khr_swapchain.h" -#include "vulkan/vk_ext_khr_device_swapchain.h" #if defined(__GNUC__) && __GNUC__ >= 4 # define VK_LAYER_EXPORT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) diff --git a/loader/loader.h b/loader/loader.h index 60e7d131..28878065 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -36,7 +36,7 @@ #include <vk_loader_platform.h> #include <vulkan/vk_lunarg_debug_report.h> -#include <vulkan/VK_KHR_surface.h> + #include <vulkan/vk_layer.h> #include <vulkan/vk_icd.h> #include <assert.h> diff --git a/vk_helper.py b/vk_helper.py index e82766e2..5fc067fd 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -1301,7 +1301,7 @@ class StructWrapperGen: sh_funcs.append('%s}' % (indent)) sh_funcs.append("%sreturn structSize;\n}" % (indent)) # Now generate generic functions to loop over entire struct chain (or just handle single generic structs) - if 'khr' not in self.header_filename and '_debug_' not in self.header_filename: + if '_debug_' not in self.header_filename: for follow_chain in [True, False]: sh_funcs.append('%s' % self.lineinfo.get()) if follow_chain: @@ -1358,8 +1358,6 @@ class StructWrapperGen: def _generateSizeHelperHeaderC(self): header = [] header.append('#include "vk_struct_size_helper.h"') - header.append('#include "vulkan/vk_ext_khr_swapchain.h"') - header.append('#include "vulkan/vk_ext_khr_device_swapchain.h"') header.append('#include <string.h>') header.append('#include <assert.h>') header.append('\n// Function definitions\n') |