Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897ea51c authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev... 

Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev am: 691fcb96 am: f05cb262
am: 02dd4888

* commit '02dd4888':
  vulkan: remove EnumerateDeviceLayerProperties internally

Change-Id: I0b3ed76850f846c4a27dec320e585608a3e4caad
parents 8fbed7fd 02dd4888

vulkan/libvulkan/api_gen.cpp

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ bool InitDispatchTable( 
    INIT_PROC(instance, GetPhysicalDeviceFormatProperties);

    INIT_PROC(instance, GetPhysicalDeviceImageFormatProperties);

    INIT_PROC(instance, CreateDevice);

    INIT_PROC(instance, EnumerateDeviceLayerProperties);

    INIT_PROC(instance, EnumerateDeviceExtensionProperties);

    INIT_PROC(instance, GetPhysicalDeviceSparseImageFormatProperties);

    INIT_PROC_EXT(KHR_surface, instance, DestroySurfaceKHR);

vulkan/libvulkan/api_gen.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct InstanceDispatchTable { 
    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;

    PFN_vkGetPhysicalDeviceImageFormatProperties GetPhysicalDeviceImageFormatProperties;

    PFN_vkCreateDevice CreateDevice;

    PFN_vkEnumerateDeviceLayerProperties EnumerateDeviceLayerProperties;

    PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;

    PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;

    PFN_vkDestroySurfaceKHR DestroySurfaceKHR;

vulkan/libvulkan/code-generator.tmpl

+4 −3
Original line number Diff line number Diff line
@@ -434,9 +434,12 @@ bool InitDriverTable(VkDevice dev, PFN_vkGetDeviceProcAddr get_proc, 
  {{AssertType $ "Function"}}



  {{if and (Macro "IsFunctionExported" $) (Macro "IsInstanceDispatched" $)}}

    {{/* deprecated and unused internally */}}

    {{if not (eq $.Name "vkEnumerateDeviceLayerProperties")}}

      true

    {{end}}

  {{end}}

{{end}}





{{/*
@@ -938,8 +941,6 @@ VK_KHR_swapchain 
    {{else if eq $.Name "vkDestroyInstance"}}true

    {{else if eq $.Name "vkDestroyDevice"}}true



    {{else if eq $.Name "vkEnumerateDeviceLayerProperties"}}true



    {{/* Enumeration of extensions */}}

    {{else if eq $.Name "vkEnumerateDeviceExtensionProperties"}}true

vulkan/libvulkan/driver_gen.cpp

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ bool InitDriverTable(VkInstance instance, 
    INIT_PROC(instance, EnumeratePhysicalDevices);

    INIT_PROC(instance, GetInstanceProcAddr);

    INIT_PROC(instance, CreateDevice);

    INIT_PROC(instance, EnumerateDeviceLayerProperties);

    INIT_PROC(instance, EnumerateDeviceExtensionProperties);

    INIT_PROC_EXT(EXT_debug_report, instance, CreateDebugReportCallbackEXT);

    INIT_PROC_EXT(EXT_debug_report, instance, DestroyDebugReportCallbackEXT);

vulkan/libvulkan/driver_gen.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct InstanceDriverTable { 
    PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices;

    PFN_vkGetInstanceProcAddr GetInstanceProcAddr;

    PFN_vkCreateDevice CreateDevice;

    PFN_vkEnumerateDeviceLayerProperties EnumerateDeviceLayerProperties;

    PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;

    PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallbackEXT;

    PFN_vkDestroyDebugReportCallbackEXT DestroyDebugReportCallbackEXT;