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

Commit 1d5f68c1 authored by Chris Forbes's avatar Chris Forbes
Browse files

vulkan: KHR_swapchain_front_buffered -> KHR_shared_presentable_image 

Tracking Khronos naming churn
V2: More churn, no longer shared_image_swapchain.

Test: build
Change-Id: I88b11b47f2fd2f96e1f27f900a65b599aec470af
parent 87162c12

vulkan/api/vulkan.api

+7 −7
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ define NULL_HANDLE 0 
@extension("VK_NVX_device_generated_commands") define VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION 1

@extension("VK_NVX_device_generated_commands") define VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME "VK_NVX_device_generated_commands"



@extension("VK_KHR_swapchain_front_buffered") define VK_KHR_SWAPCHAIN_FRONT_BUFFERED_SPEC_VERSION 1

@extension("VK_KHR_swapchain_front_buffered") define VK_KHR_SWAPCHAIN_FRONT_BUFFERED_EXTENSION_NAME "VK_KHR_swapchain_front_buffered"

@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1

@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"
@@ -927,10 +927,10 @@ enum VkPresentModeKHR { 
    VK_PRESENT_MODE_MAILBOX_KHR                             = 0x00000001,

    VK_PRESENT_MODE_FIFO_KHR                                = 0x00000002,

    VK_PRESENT_MODE_FIFO_RELAXED_KHR                        = 0x00000003,

    //@extension("VK_KHR_swapchain_front_buffered")

    VK_PRESENT_MODE_FRONT_BUFFERED_DEMAND_REFRESH_KHR       = 1000111000,

    //@extension("VK_KHR_swapchain_front_buffered")

    VK_PRESENT_MODE_FRONT_BUFFERED_CONTINUOUS_REFRESH_KHR   = 1000111001,

    //@extension("VK_KHR_shared_presentable_image")

    VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR       = 1000111000,

    //@extension("VK_KHR_shared_presentable_image")

    VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR   = 1000111001,

}



@extension("VK_KHR_surface")
@@ -6116,7 +6116,7 @@ cmd void vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX( 
        VkDeviceGeneratedCommandsLimitsNVX*         pLimits) {

}



@extension("VK_KHR_swapchain_front_buffered")

@extension("VK_KHR_shared_presentable_image")

cmd VkResult vkGetSwapchainStatusKHR(

        VkDevice                                    device,

        VkSwapchainKHR                              swapchain) {

vulkan/include/vulkan/vulkan.h

+5 −5
Original line number Diff line number Diff line
@@ -3228,8 +3228,8 @@ typedef enum VkPresentModeKHR { 
    VK_PRESENT_MODE_MAILBOX_KHR = 1,

    VK_PRESENT_MODE_FIFO_KHR = 2,

    VK_PRESENT_MODE_FIFO_RELAXED_KHR = 3,

    VK_PRESENT_MODE_FRONT_BUFFERED_DEMAND_REFRESH_KHR = 1000111000,

    VK_PRESENT_MODE_FRONT_BUFFERED_CONTINUOUS_REFRESH_KHR = 1000111001,

    VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR = 1000111000,

    VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR = 1000111001,

    VK_PRESENT_MODE_BEGIN_RANGE_KHR = VK_PRESENT_MODE_IMMEDIATE_KHR,

    VK_PRESENT_MODE_END_RANGE_KHR = VK_PRESENT_MODE_FIFO_RELAXED_KHR,

    VK_PRESENT_MODE_RANGE_SIZE_KHR = (VK_PRESENT_MODE_FIFO_RELAXED_KHR - VK_PRESENT_MODE_IMMEDIATE_KHR + 1),
@@ -3886,9 +3886,9 @@ typedef struct VkPresentRegionsKHR { 
    const VkPresentRegionKHR* pRegions;

} VkPresentRegionsKHR;



#define VK_KHR_swapchain_front_buffered 1

#define VK_KHR_SWAPCHAIN_FRONT_BUFFERED_SPEC_VERSION 1

#define VK_KHR_SWAPCHAIN_FRONT_BUFFERED_EXTENSION_NAME "VK_KHR_swapchain_front_buffered"

#define VK_KHR_shared_presentable_image 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"



typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainStatusKHR)(VkDevice device, VkSwapchainKHR swapchain);

vulkan/libvulkan/code-generator.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ VK_KHR_incremental_present 
VK_KHR_surface

VK_KHR_swapchain

VK_GOOGLE_display_timing

VK_KHR_swapchain_front_buffered

VK_KHR_shared_presentable_image

{{end}}

vulkan/libvulkan/driver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            case ProcHook::EXTENSION_UNKNOWN:

                // HAL's extensions

                break;

            case ProcHook::KHR_swapchain_front_buffered:

            case ProcHook::KHR_shared_presentable_image:

                // Exposed by HAL, but API surface is all in the loader

                break;

            default:
@@ -495,7 +495,7 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
                hook_extensions_.set(ProcHook::KHR_swapchain);



            // Exposed by HAL, but API surface is all in the loader

            if (ext_bit == ProcHook::KHR_swapchain_front_buffered)

            if (ext_bit == ProcHook::KHR_shared_presentable_image)

                hook_extensions_.set(ext_bit);



            hal_extensions_.set(ext_bit);

vulkan/libvulkan/driver_gen.cpp

+4 −4
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ VKAPI_ATTR VkResult checkedGetPastPresentationTimingGOOGLE(VkDevice device, VkSw 
}



VKAPI_ATTR VkResult checkedGetSwapchainStatusKHR(VkDevice device, VkSwapchainKHR swapchain) {

    if (GetData(device).hook_extensions[ProcHook::KHR_swapchain_front_buffered]) {

    if (GetData(device).hook_extensions[ProcHook::KHR_shared_presentable_image]) {

        return GetSwapchainStatusKHR(device, swapchain);

    } else {

        Logger(device).Err(device, "VK_KHR_swapchain_front_buffered not enabled. vkGetSwapchainStatusKHR not executed.");

        Logger(device).Err(device, "VK_KHR_shared_presentable_image not enabled. vkGetSwapchainStatusKHR not executed.");

        return VK_SUCCESS;

    }

}
@@ -312,7 +312,7 @@ const ProcHook g_proc_hooks[] = { 
    {

        "vkGetSwapchainStatusKHR",

        ProcHook::DEVICE,

        ProcHook::KHR_swapchain_front_buffered,

        ProcHook::KHR_shared_presentable_image,

        reinterpret_cast<PFN_vkVoidFunction>(GetSwapchainStatusKHR),

        reinterpret_cast<PFN_vkVoidFunction>(checkedGetSwapchainStatusKHR),

    },
@@ -354,7 +354,7 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    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;

    if (strcmp(name, "VK_KHR_swapchain_front_buffered") == 0) return ProcHook::KHR_swapchain_front_buffered;

    if (strcmp(name, "VK_KHR_shared_presentable_image") == 0) return ProcHook::KHR_shared_presentable_image;

    // clang-format on

    return ProcHook::EXTENSION_UNKNOWN;

}