diff options
| author | Ian Elliott <ianelliott@google.com> | 2015-11-18 15:32:38 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-01 10:18:23 -0700 |
| commit | dce5f3ea01d8c26cedf1d72fda33db52e8e57f47 (patch) | |
| tree | 5d26347c86f68fabf38dea6994066586a5da9ef4 /icd/common | |
| parent | 19362d1915fd91e5df8b7fb5c5387cec717f0b45 (diff) | |
| download | usermoji-dce5f3ea01d8c26cedf1d72fda33db52e8e57f47.tar.xz | |
nulldrv: Get compiling.
Conflicts:
icd/common/icd.h
Diffstat (limited to 'icd/common')
| -rw-r--r-- | icd/common/icd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/icd/common/icd.h b/icd/common/icd.h index 20726d93..eb371c79 100644 --- a/icd/common/icd.h +++ b/icd/common/icd.h @@ -33,10 +33,14 @@ #include <vulkan/vulkan.h> #include <vulkan/vk_platform.h> +<<<<<<< HEAD #include <vulkan/vk_lunarg_debug_report.h> #include "vulkan/VK_KHR_surface.h" #include "vulkan/VK_KHR_swapchain.h" +======= +#include <vulkan/vk_debug_report_lunarg.h> +>>>>>>> 1379888... nulldrv: Get compiling. #include "vulkan/vk_sdk_platform.h" #if defined(__GNUC__) && __GNUC__ >= 4 |