From 41866db908985f0fc389e5cd7924afa4fd61aa93 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Tue, 1 Sep 2015 17:30:39 -0600 Subject: Bug 14522: Remove VkAttachmentView https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14522 Several parts of the driver really want an attachment view so I've included the attachment information in the intel_img_view structure and initialize both when the view is created. Parts of the meta path only need intel_att_view and I kept that in place. --- loader/gpa_helper.h | 4 ---- loader/table_ops.h | 6 ------ loader/trampoline.c | 18 ------------------ 3 files changed, 28 deletions(-) (limited to 'loader') diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index f1b28868..17fd9ad4 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -159,10 +159,6 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkCreateImageView; if (!strcmp(name, "DestroyImageView")) return (void*) vkDestroyImageView; - if (!strcmp(name, "CreateAttachmentView")) - return (void*) vkCreateAttachmentView; - if (!strcmp(name, "DestroyAttachmentView")) - return (void*) vkDestroyAttachmentView; if (!strcmp(name, "CreateShaderModule")) return (void*) vkCreateShaderModule; if (!strcmp(name, "DestroyShaderModule")) diff --git a/loader/table_ops.h b/loader/table_ops.h index 49f01e42..4064178f 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -84,8 +84,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->GetImageSubresourceLayout = (PFN_vkGetImageSubresourceLayout) gpa(dev, "vkGetImageSubresourceLayout"); table->CreateImageView = (PFN_vkCreateImageView) gpa(dev, "vkCreateImageView"); table->DestroyImageView = (PFN_vkDestroyImageView) gpa(dev, "vkDestroyImageView"); - table->CreateAttachmentView = (PFN_vkCreateAttachmentView) gpa(dev, "vkCreateAttachmentView"); - table->DestroyAttachmentView = (PFN_vkDestroyAttachmentView) gpa(dev, "vkDestroyAttachmentView"); table->CreateShaderModule = (PFN_vkCreateShaderModule) gpa(dev, "vkCreateShaderModule"); table->DestroyShaderModule = (PFN_vkDestroyShaderModule) gpa(dev, "vkDestroyShaderModule"); table->CreateShader = (PFN_vkCreateShader) gpa(dev, "vkCreateShader"); @@ -294,10 +292,6 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->CreateImageView; if (!strcmp(name, "DestroyImageView")) return (void *) table->DestroyImageView; - if (!strcmp(name, "CreateAttachmentView")) - return (void *) table->CreateAttachmentView; - if (!strcmp(name, "DestroyAttachmentView")) - return (void *) table->DestroyAttachmentView; if (!strcmp(name, "CreateShaderModule")) return (void *) table->CreateShaderModule; if (!strcmp(name, "DestroyShaderModule")) diff --git a/loader/trampoline.c b/loader/trampoline.c index 2b15afec..e28534c9 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -762,24 +762,6 @@ LOADER_EXPORT VkResult VKAPI vkDestroyImageView(VkDevice device, VkImageView ima return disp->DestroyImageView(device, imageView); } -LOADER_EXPORT VkResult VKAPI vkCreateAttachmentView(VkDevice device, const VkAttachmentViewCreateInfo* pCreateInfo, VkAttachmentView* pView) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(device); - - return disp->CreateAttachmentView(device, pCreateInfo, pView); -} - -LOADER_EXPORT VkResult VKAPI vkDestroyAttachmentView(VkDevice device, VkAttachmentView attachmentView) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(device); - - return disp->DestroyAttachmentView(device, attachmentView); -} - LOADER_EXPORT VkResult VKAPI vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, VkShaderModule* pShader) { const VkLayerDispatchTable *disp; -- cgit v1.2.3