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 | |
| parent | 19362d1915fd91e5df8b7fb5c5387cec717f0b45 (diff) | |
| download | usermoji-dce5f3ea01d8c26cedf1d72fda33db52e8e57f47.tar.xz | |
nulldrv: Get compiling.
Conflicts:
icd/common/icd.h
| -rw-r--r-- | icd/common/icd.h | 4 | ||||
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 12 | ||||
| -rw-r--r-- | icd/nulldrv/nulldrv.h | 2 |
3 files changed, 11 insertions, 7 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 diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 113a90e9..8c6875e9 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -740,6 +740,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR( ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR( VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, + const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain) { NULLDRV_LOG_FUNC; @@ -760,7 +761,8 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR( ICD_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR( VkDevice device, - VkSwapchainKHR swapchain) + VkSwapchainKHR swapchain, + const VkAllocationCallbacks* pAllocator) { NULLDRV_LOG_FUNC; struct nulldrv_swap_chain *sc = *(struct nulldrv_swap_chain **) &swapchain; @@ -771,8 +773,7 @@ ICD_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR( ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR( VkDevice device, VkSwapchainKHR swapchain, - uint32_t* pCount, - VkFence fence, + uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) { NULLDRV_LOG_FUNC; @@ -780,7 +781,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR( struct nulldrv_dev *dev = sc->dev; VkResult ret = VK_SUCCESS; - *pCount = 2; + *pSwapchainImageCount = 2; if (pSwapchainImages) { uint32_t i; for (i = 0; i < 2; i++) { @@ -803,6 +804,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR( VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, + VkFence fence, uint32_t* pImageIndex) { NULLDRV_LOG_FUNC; @@ -812,7 +814,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR( ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR( VkQueue queue_, - VkPresentInfoKHR* pPresentInfo) + const VkPresentInfoKHR* pPresentInfo) { NULLDRV_LOG_FUNC; diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h index 46711634..768d7848 100644 --- a/icd/nulldrv/nulldrv.h +++ b/icd/nulldrv/nulldrv.h @@ -35,8 +35,6 @@ #include <vulkan/vulkan.h> #include <vulkan/vk_lunarg_debug_report.h> #include <vulkan/vk_icd.h> -#include "vulkan/VK_KHR_surface.h" -#include "vulkan/VK_KHR_swapchain.h" #include "icd.h" |