diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-10 17:44:33 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-17 10:05:19 -0600 |
| commit | 04b55e08fd406f371c17d75b14e46b80ab42a79d (patch) | |
| tree | 75f2ecfac430dedb85fda9d730a0559d13d3adb5 | |
| parent | 0dbd6a8689851e1e248a83368bcc980ffce1e6c7 (diff) | |
| download | usermoji-04b55e08fd406f371c17d75b14e46b80ab42a79d.tar.xz | |
nulldrv: Fix up compile issues for Windows
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 4b6b2230..e4c2313d 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1802,11 +1802,6 @@ ICD_EXPORT VkResult VKAPI vkCreatePipelineCache( return VK_SUCCESS; } -<<<<<<< HEAD -VkResult VKAPI vkDestroyPipelineCache( - VkDevice device, - VkPipelineCache pipelineCache) -======= ICD_EXPORT VkResult VKAPI vkDestroyPipeline( VkDevice device, VkPipeline pipeline) @@ -1815,12 +1810,9 @@ ICD_EXPORT VkResult VKAPI vkDestroyPipeline( return VK_SUCCESS; } -ICD_EXPORT VkResult VKAPI vkCreateGraphicsPipelineDerivative( - VkDevice device, - const VkGraphicsPipelineCreateInfo* pCreateInfo, - VkPipeline basePipeline, - VkPipeline* pPipeline) ->>>>>>> Bug 14084 - Improve type safety and remove polymorphism +VkResult VKAPI vkDestroyPipelineCache( + VkDevice device, + VkPipelineCache pipelineCache) { NULLDRV_LOG_FUNC; return VK_SUCCESS; @@ -2133,9 +2125,6 @@ ICD_EXPORT VkResult VKAPI vkCreateImageView( (struct nulldrv_img_view **) pView); } -<<<<<<< HEAD -ICD_EXPORT VkResult VKAPI vkCreateAttachmentView( -======= ICD_EXPORT VkResult VKAPI vkDestroyImageView( VkDevice device, VkImageView imageView) @@ -2144,8 +2133,7 @@ ICD_EXPORT VkResult VKAPI vkDestroyImageView( return VK_SUCCESS; } -ICD_EXPORT VkResult VKAPI vkCreateColorAttachmentView( ->>>>>>> Bug 14084 - Improve type safety and remove polymorphism +ICD_EXPORT VkResult VKAPI vkCreateAttachmentView( VkDevice device, const VkAttachmentViewCreateInfo* pCreateInfo, VkAttachmentView* pView) @@ -2157,38 +2145,14 @@ ICD_EXPORT VkResult VKAPI vkCreateColorAttachmentView( (struct nulldrv_rt_view **) pView); } -<<<<<<< HEAD -======= -ICD_EXPORT VkResult VKAPI vkDestroyColorAttachmentView( - VkDevice device, - VkColorAttachmentView colorAttachmentView) -{ - NULLDRV_LOG_FUNC; - return VK_SUCCESS; -} - -ICD_EXPORT VkResult VKAPI vkCreateDepthStencilView( - VkDevice device, - const VkDepthStencilViewCreateInfo* pCreateInfo, - VkDepthStencilView* pView) -{ - NULLDRV_LOG_FUNC; - struct nulldrv_dev *dev = nulldrv_dev(device); - - return nulldrv_ds_view_create(dev, pCreateInfo, - (struct nulldrv_ds_view **) pView); - -} - -ICD_EXPORT VkResult VKAPI vkDestroyDepthStencilView( +ICD_EXPORT VkResult VKAPI vkDestroyAttachmentView( VkDevice device, - VkDepthStencilView depthStencilView) + VkAttachmentView attachmentView) { NULLDRV_LOG_FUNC; return VK_SUCCESS; } ->>>>>>> Bug 14084 - Improve type safety and remove polymorphism ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, |