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

Commit 8e4438b9 authored by Chris Forbes's avatar Chris Forbes
Browse files

frontbuffer enhancements to ANDROID_vulkan_native_buffer 

Since VK_KHR_swapchain is implemented entirely in libvulkan, we need an
image-level mechanism to inform the driver that a swapchain image will
be used for front-buffered rendering. This is implemented by chaining
another structure off of the VkImageCreateInfo passed to the driver when
creating swapchain images.

V2: Don't foul up api file. Rerun code generators.
V3: Rename VkNativeBuffer2ANDROID structure to
VkSwapchainImageCreateInfoANDROID
V4: Provide nulldrv stub for new function
V5: rebase.

Change-Id: I4447400cb1782440638e4c8816b081dd8923ddb9
Test: compile
parent ec9ec7d5

vulkan/api/vulkan.api

+26 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ define NULL_HANDLE 0 
@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_SPEC_VERSION     5

@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_NAME             "VK_KHR_win32_surface"



@extension("VK_ANDROID_native_buffer") define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION     5

@extension("VK_ANDROID_native_buffer") define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION     6

@extension("VK_ANDROID_native_buffer") define VK_ANDROID_NATIVE_BUFFER_NAME             "VK_ANDROID_native_buffer"



@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION       3
@@ -681,6 +681,7 @@ enum VkStructureType { 


    //@extension("VK_ANDROID_native_buffer")

    VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID                     = 1000010000,

    VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID       = 1000010001,



    //@extension("VK_EXT_debug_report")

    VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT     = 1000011000,
@@ -1376,6 +1377,13 @@ bitfield VkDebugReportFlagBitsEXT { 
    VK_DEBUG_REPORT_DEBUG_BIT_EXT                           = 0x00000010,

}



@extension("VK_ANDROID_native_buffer")

type VkFlags VkSwapchainImageUsageFlagsANDROID

@extension("VK_ANDROID_native_buffer")

bitfield VkSwapchainImageUsageFlagBitsANDROID {

    VK_SWAPCHAIN_IMAGE_USAGE_FLAGS_FRONT_BUFFER_BIT_ANDROID = 0x00000001,

}





//////////////////

//  Structures  //
@@ -2671,6 +2679,13 @@ class VkNativeBufferANDROID { 
    int                                         usage

}



@extension("VK_ANDROID_native_buffer")

class VkSwapchainImageCreateInfoANDROID {

    VkStructureType                             sType

    const void*                                 pNext

    VkSwapchainImageUsageFlagBitsANDROID        flags

}



@extension("VK_EXT_debug_report")

class VkDebugReportCallbackCreateInfoEXT {

    VkStructureType                             sType
@@ -5280,6 +5295,16 @@ cmd VkResult vkGetSwapchainGrallocUsageANDROID( 
    return ?

}



@extension("VK_ANDROID_native_buffer")

cmd VkResult vkGetSwapchainGrallocUsage2ANDROID(

        VkDevice                                device,

        VkFormat                                format,

        VkImageUsageFlags                       imageUsage,

        VkSwapchainImageUsageFlagsANDROID       swapchainImageUsage,

        int*                                    grallocUsage) {

    return ?

}



@extension("VK_ANDROID_native_buffer")

cmd VkResult vkAcquireImageANDROID(

        VkDevice                                device,

vulkan/include/vulkan/vk_android_native_buffer.h

+22 −1
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@ extern "C" { 
#define VK_ANDROID_native_buffer 1



#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER 11

#define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION     5

#define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION     6

#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME   "VK_ANDROID_native_buffer"



#define VK_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)(1000000000 + (1000 * (VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER - 1)) + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID   VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)



typedef enum VkSwapchainImageUsageFlagBitsANDROID {

    VK_SWAPCHAIN_IMAGE_USAGE_FRONT_BUFFER_BIT_ANDROID = 0x00000001,

    VK_SWAPCHAIN_IMAGE_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF

} VkSwapchainImageUsageFlagBitsANDROID;

typedef VkFlags VkSwapchainImageUsageFlagsANDROID;



typedef struct {

    VkStructureType             sType; // must be VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID

    const void*                 pNext;
@@ -46,7 +52,15 @@ typedef struct { 
    int                         usage;

} VkNativeBufferANDROID;



typedef struct {

    VkStructureType                        sType; // must be VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID

    const void*                            pNext;



    VkSwapchainImageUsageFlagBitsANDROID   usage;

} VkSwapchainImageCreateInfoANDROID;



typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageANDROID)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, int* grallocUsage);

typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsage2ANDROID)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, VkSwapchainImageUsageFlagsANDROID swapchainImageUsage, int* grallocUsage);

typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageANDROID)(VkDevice device, VkImage image, int nativeFenceFd, VkSemaphore semaphore, VkFence fence);

typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalReleaseImageANDROID)(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int* pNativeFenceFd);
@@ -57,6 +71,13 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsageANDROID( 
    VkImageUsageFlags   imageUsage,

    int*                grallocUsage

);

VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsage2ANDROID(

    VkDevice            device,

    VkFormat            format,

    VkImageUsageFlags   imageUsage,

    VkSwapchainImageUsageFlagsANDROID swapchainImageUsage,

    int*                grallocUsage

);

VKAPI_ATTR VkResult VKAPI_CALL vkAcquireImageANDROID(

    VkDevice            device,

    VkImage             image,

vulkan/libvulkan/driver_gen.cpp

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,13 @@ const ProcHook g_proc_hooks[] = { 
        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSurfaceSupportKHR),

        nullptr,

    },

    {

        "vkGetSwapchainGrallocUsage2ANDROID",

        ProcHook::DEVICE,

        ProcHook::ANDROID_native_buffer,

        nullptr,

        nullptr,

    },

    {

        "vkGetSwapchainGrallocUsageANDROID",

        ProcHook::DEVICE,
@@ -351,6 +358,7 @@ bool InitDriverTable(VkDevice dev, 
    INIT_PROC(dev, DestroyImage);

    INIT_PROC(dev, AllocateCommandBuffers);

    INIT_PROC_EXT(ANDROID_native_buffer, dev, GetSwapchainGrallocUsageANDROID);

    INIT_PROC_EXT(ANDROID_native_buffer, dev, GetSwapchainGrallocUsage2ANDROID);

    INIT_PROC_EXT(ANDROID_native_buffer, dev, AcquireImageANDROID);

    INIT_PROC_EXT(ANDROID_native_buffer, dev, QueueSignalReleaseImageANDROID);

    // clang-format on

vulkan/libvulkan/driver_gen.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct DeviceDriverTable { 
    PFN_vkDestroyImage DestroyImage;

    PFN_vkAllocateCommandBuffers AllocateCommandBuffers;

    PFN_vkGetSwapchainGrallocUsageANDROID GetSwapchainGrallocUsageANDROID;

    PFN_vkGetSwapchainGrallocUsage2ANDROID GetSwapchainGrallocUsage2ANDROID;

    PFN_vkAcquireImageANDROID AcquireImageANDROID;

    PFN_vkQueueSignalReleaseImageANDROID QueueSignalReleaseImageANDROID;

    // clang-format on

vulkan/nulldrv/null_driver.cpp

+10 −0
Original line number Diff line number Diff line
@@ -886,6 +886,16 @@ VkResult GetSwapchainGrallocUsageANDROID(VkDevice, 
    return VK_SUCCESS;

}



VkResult GetSwapchainGrallocUsage2ANDROID(VkDevice,

                                          VkFormat,

                                          VkImageUsageFlags,

                                          VkSwapchainImageUsageFlagsANDROID,

                                          int* grallocUsage) {

    // The null driver never reads or writes the gralloc buffer

    *grallocUsage = 0;

    return VK_SUCCESS;

}



VkResult AcquireImageANDROID(VkDevice,

                             VkImage,

                             int fence,