nulldrv: Update for bug 14033 Add new entrypoints and delete old ones

1 files changed, 45 insertions, 36 deletions

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index c87ae5a3..32b8f5f6 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1735,72 +1735,81 @@ ICD_EXPORT VkResult VKAPI vkQueueBindSparseImageMemory(
     NULLDRV_LOG_FUNC;
     return VK_SUCCESS;
 }
-
-ICD_EXPORT VkResult VKAPI vkCreateGraphicsPipeline(
-    VkDevice                                  device,
-    const VkGraphicsPipelineCreateInfo*    pCreateInfo,
-    VkPipeline*                               pPipeline)
+ICD_EXPORT VkResult VKAPI vkCreatePipelineCache(
+    VkDevice                                    device,
+    const VkPipelineCacheCreateInfo*            pCreateInfo,
+    VkPipelineCache*                            pPipelineCache)
 {
-    NULLDRV_LOG_FUNC;
-    struct nulldrv_dev *dev = nulldrv_dev(device);
 
-    return graphics_pipeline_create(dev, pCreateInfo,
-            (struct nulldrv_pipeline **) pPipeline);
+    NULLDRV_LOG_FUNC;
+    return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkCreateGraphicsPipelineDerivative(
-    VkDevice                                  device,
-    const VkGraphicsPipelineCreateInfo*    pCreateInfo,
-    VkPipeline                                basePipeline,
-    VkPipeline*                               pPipeline)
+VkResult VKAPI vkDestroyPipelineCache(
+    VkDevice                                    device,
+    VkPipelineCache                             pipelineCache)
 {
     NULLDRV_LOG_FUNC;
-    struct nulldrv_dev *dev = nulldrv_dev(device);
-
-    return graphics_pipeline_create(dev, pCreateInfo,
-            (struct nulldrv_pipeline **) pPipeline);
+    return VK_SUCCESS;
 }
 
-ICD_EXPORT VkResult VKAPI vkCreateComputePipeline(
-    VkDevice                                  device,
-    const VkComputePipelineCreateInfo*     pCreateInfo,
-    VkPipeline*                               pPipeline)
+ICD_EXPORT size_t VKAPI vkGetPipelineCacheSize(
+    VkDevice                                    device,
+    VkPipelineCache                             pipelineCache)
 {
     NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
+    return VK_ERROR_UNAVAILABLE;
 }
 
-ICD_EXPORT VkResult VKAPI vkStorePipeline(
-    VkDevice                                  device,
-    VkPipeline                                pipeline,
-    size_t*                                     pDataSize,
+ICD_EXPORT VkResult VKAPI vkGetPipelineCacheData(
+    VkDevice                                    device,
+    VkPipelineCache                             pipelineCache,
     void*                                       pData)
 {
     NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
+    return VK_ERROR_UNAVAILABLE;
 }
 
-ICD_EXPORT VkResult VKAPI vkLoadPipeline(
+ICD_EXPORT VkResult VKAPI vkMergePipelineCaches(
+    VkDevice                                    device,
+    VkPipelineCache                             destCache,
+    uint32_t                                    srcCacheCount,
+    const VkPipelineCache*                      pSrcCaches)
+{
+    NULLDRV_LOG_FUNC;
+    return VK_ERROR_UNAVAILABLE;
+}
+ICD_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(
     VkDevice                                  device,
-    size_t                                    	dataSize,
-    const void*                                 pData,
+    VkPipelineCache                           pipelineCache,
+    uint32_t                                  count,
+    const VkGraphicsPipelineCreateInfo*    pCreateInfo,
     VkPipeline*                               pPipeline)
 {
     NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
+    struct nulldrv_dev *dev = nulldrv_dev(device);
+
+    return graphics_pipeline_create(dev, pCreateInfo,
+            (struct nulldrv_pipeline **) pPipeline);
 }
 
-ICD_EXPORT VkResult VKAPI vkLoadPipelineDerivative(
+
+
+ICD_EXPORT VkResult VKAPI vkCreateComputePipelines(
     VkDevice                                  device,
-    size_t                                    	dataSize,
-    const void*                                 pData,
-    VkPipeline				basePipeline,
+    VkPipelineCache                           pipelineCache,
+    uint32_t                                  count,
+    const VkComputePipelineCreateInfo*     pCreateInfo,
     VkPipeline*                               pPipeline)
 {
     NULLDRV_LOG_FUNC;
     return VK_SUCCESS;
 }
 
+
+
+
+
 ICD_EXPORT VkResult VKAPI vkCreateQueryPool(
     VkDevice                                  device,
     const VkQueryPoolCreateInfo*           pCreateInfo,