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

Commit 48853713 authored by Chris Forbes's avatar Chris Forbes
Browse files

vulkan: Fix vulkan.api for Ian's changes & regen 

Various problems: uint32_t vs u32, a dropped }, function body with
semantics that crash the generator, etc ...

V2: don't export Ian's extensions from libvulkan.

Change-Id: I1dceb4d4fc21ad5d38255c4979d9ef372ea2a28b
Test: build
parent 8c47dc91

vulkan/api/vulkan.api

+11 −43
Original line number Diff line number Diff line
@@ -2886,27 +2886,6 @@ class VkWin32SurfaceCreateInfoKHR { 
    platform.HWND                               hwnd

}



@extension("VK_KHR_incremental_present")

class VkRectLayerKHR {

    VkOffset2D                                  offset

    VkExtent2D                                  extent

    uint32_t                                    layer

}



@extension("VK_KHR_incremental_present")

class VkPresentRegionKHR {

    uint32_t                                    rectangleCount

    const VkRectLayerKHR*                       pRectangles

}



@extension("VK_KHR_incremental_present")

class VkPresentRegionsKHR {

    VkStructureType                             sType

    const void*                                 pNext

    uint32_t                                    swapchainCount

    const VkPresentRegionKHR*                   pRegions

}



@extension("VK_ANDROID_native_buffer")

class VkNativeBufferANDROID {

    VkStructureType                             sType
@@ -2922,33 +2901,34 @@ class VkSwapchainImageCreateInfoANDROID { 
    VkStructureType                             sType

    const void*                                 pNext

    VkSwapchainImageUsageFlagBitsANDROID        flags

}



@extension("VK_GOOGLE_display_timing")

class VkRefreshCycleDurationGOOGLE {

    uint64_t                                    minRefreshDuration

    uint64_t                                    maxRefreshDuration

    u64                                         minRefreshDuration

    u64                                         maxRefreshDuration

}



@extension("VK_GOOGLE_display_timing")

class VkPastPresentationTimingGOOGLE {

    uint32_t                                    presentID

    uint64_t                                    desiredPresentTime

    uint64_t                                    actualPresentTime

    uint64_t                                    earliestPresentTime

    uint64_t                                    presentMargin

    u32                                         presentID

    u64                                         desiredPresentTime

    u64                                         actualPresentTime

    u64                                         earliestPresentTime

    u64                                         presentMargin

}



@extension("VK_GOOGLE_display_timing")

class VkPresentTimeGOOGLE {

    uint32_t                                    presentID

    uint64_t                                    desiredPresentTime

    u32                                         presentID

    u64                                         desiredPresentTime

}



@extension("VK_GOOGLE_display_timing")

class VkPresentTimesInfoGOOGLE {

    VkStructureType                             sType

    const void*                                 pNext

    uint32_t                                    swapchainCount

    u32                                         swapchainCount

    const VkPresentTimeGOOGLE*                  pTimes

}
@@ -5889,18 +5869,6 @@ cmd VkResult vkGetPastPresentationTimingGOOGLE( 
        VkSwapchainKHR                           swapchain,

        u32*                                     pPresentationTimingCount,

        VkPastPresentationTimingGOOGLE*          pPresentationTimings) {

    deviceObject := GetDevice(device)



    count := as!u32(?)

    pPresentationTimingCount[0] = count

    presentationTimings := pPresentationTimings[0:count]



    for i in (0 .. count) {

        presentationTiming := ?

        presentationTimings[i] = presentationTiming

        State.Timings[presentationTiming] = new!PresentationTiming(device: device)

    }



    return ?

}

vulkan/libvulkan/api_gen.cpp

+0 −10
Original line number Diff line number Diff line
@@ -427,8 +427,6 @@ VKAPI_ATTR VkResult GetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapch 
VKAPI_ATTR VkResult AcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex);

VKAPI_ATTR VkResult QueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo);

VKAPI_ATTR VkResult CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

VKAPI_ATTR VkResult GetRefreshCycleDurationGOOGLE(VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties);

VKAPI_ATTR VkResult GetPastPresentationTimingGOOGLE(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);



VKAPI_ATTR VkResult EnumeratePhysicalDevices(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) {

    return GetData(instance).dispatch.EnumeratePhysicalDevices(instance, pPhysicalDeviceCount, pPhysicalDevices);
@@ -1212,14 +1210,6 @@ VKAPI_ATTR VkResult CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroid 
    return GetData(instance).dispatch.CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);

}



VKAPI_ATTR VkResult GetRefreshCycleDurationGOOGLE(VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties) {

    return GetData(device).dispatch.GetRefreshCycleDurationGOOGLE(device, swapchain, pDisplayTimingProperties);

}



VKAPI_ATTR VkResult GetPastPresentationTimingGOOGLE(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) {

    return GetData(device).dispatch.GetPastPresentationTimingGOOGLE(device, swapchain, pPresentationTimingCount, pPresentationTimings);

}





}  // anonymous namespace

vulkan/libvulkan/api_gen.h

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ struct DeviceDispatchTable { 
    PFN_vkGetSwapchainImagesKHR GetSwapchainImagesKHR;

    PFN_vkAcquireNextImageKHR AcquireNextImageKHR;

    PFN_vkQueuePresentKHR QueuePresentKHR;

    PFN_vkGetRefreshCycleDurationGOOGLE GetRefreshCycleDurationGOOGLE;

    PFN_vkGetPastPresentationTimingGOOGLE GetPastPresentationTimingGOOGLE;

    // clang-format on

};

vulkan/libvulkan/code-generator.tmpl

+0 −3
Original line number Diff line number Diff line
@@ -704,7 +704,6 @@ VK_KHR_android_surface 
VK_KHR_incremental_present

VK_KHR_surface

VK_KHR_swapchain

VK_KHR_incremental_present

VK_GOOGLE_display_timing

{{end}}
@@ -1152,8 +1151,6 @@ VK_GOOGLE_display_timing 
  {{     if eq $ext "VK_KHR_surface"}}true

  {{else if eq $ext "VK_KHR_swapchain"}}true

  {{else if eq $ext "VK_KHR_android_surface"}}true

  {{else if eq $ext "VK_KHR_incremental_present"}}true

  {{else if eq $ext "VK_GOOGLE_display_timing"}}true

  {{end}}

{{end}}

vulkan/libvulkan/driver_gen.cpp

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    if (strcmp(name, "VK_ANDROID_native_buffer") == 0) return ProcHook::ANDROID_native_buffer;

    if (strcmp(name, "VK_EXT_debug_report") == 0) return ProcHook::EXT_debug_report;

    if (strcmp(name, "VK_KHR_android_surface") == 0) return ProcHook::KHR_android_surface;

    if (strcmp(name, "VK_KHR_incremental_present") == 0) return ProcHook::KHR_incremental_present;

    if (strcmp(name, "VK_KHR_surface") == 0) return ProcHook::KHR_surface;

    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_GOOGLE_display_timing") == 0) return ProcHook::GOOGLE_display_timing;