bug 14608: VkShaderModule object lifetime (WIP)

Remove VkShader.  We add a simple cache to intel_shader_module in place of
intel_shader.

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14608

3 files changed, 0 insertions, 28 deletions

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 995d4f5f..2d5d948b 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -153,10 +153,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkCreateShaderModule;
     if (!strcmp(name, "DestroyShaderModule"))
         return (void*) vkDestroyShaderModule;
-    if (!strcmp(name, "CreateShader"))
-        return (void*) vkCreateShader;
-    if (!strcmp(name, "DestroyShader"))
-        return (void*) vkDestroyShader;
     if (!strcmp(name, "CreatePipelineCache"))
         return (void*) vkCreatePipelineCache;
     if (!strcmp(name, "DestroyPipelineCache"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 29bdc389..b0ef6299 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -82,8 +82,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->DestroyImageView = (PFN_vkDestroyImageView) gpa(dev, "vkDestroyImageView");
     table->CreateShaderModule = (PFN_vkCreateShaderModule) gpa(dev, "vkCreateShaderModule");
     table->DestroyShaderModule = (PFN_vkDestroyShaderModule) gpa(dev, "vkDestroyShaderModule");
-    table->CreateShader = (PFN_vkCreateShader) gpa(dev, "vkCreateShader");
-    table->DestroyShader = (PFN_vkDestroyShader) gpa(dev, "vkDestroyShader");
     table->CreatePipelineCache = (PFN_vkCreatePipelineCache) gpa(dev, "vkCreatePipelineCache");
     table->DestroyPipelineCache = (PFN_vkDestroyPipelineCache) gpa(dev, "vkDestroyPipelineCache");
     table->GetPipelineCacheData = (PFN_vkGetPipelineCacheData) gpa(dev, "vkGetPipelineCacheData");
@@ -273,10 +271,6 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->CreateShaderModule;
     if (!strcmp(name, "DestroyShaderModule"))
         return (void *) table->DestroyShaderModule;
-    if (!strcmp(name, "CreateShader"))
-        return (void *) table->CreateShader;
-    if (!strcmp(name, "DestroyShader"))
-        return (void *) table->DestroyShader;
     if (!strcmp(name, "CreatePipelineCache"))
         return (void*) vkCreatePipelineCache;
     if (!strcmp(name, "DestroyPipelineCache"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 9f053c60..e86a949a 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -735,24 +735,6 @@ LOADER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule s
     disp->DestroyShaderModule(device, shaderModule, pAllocator);
 }
 
-LOADER_EXPORT VkResult VKAPI vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShader* pShader)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->CreateShader(device, pCreateInfo, pAllocator, pShader);
-}
-
-LOADER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    disp->DestroyShader(device, shader, pAllocator);
-}
-
 LOADER_EXPORT VkResult VKAPI vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache)
 {
     const VkLayerDispatchTable *disp;