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

Commit 6f39a6d1 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Update from version 0.184.0 to 0.185.0 

Change-Id: I1d6012db32441fe3a99480bfed0e41dfce068980
(cherry picked from commit 8b07f118b46ae01f709e7bfd92e29c6f6df5d7c0)
parent d8bade00

vulkan/api/vulkan.api

+2 −30
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import platform "platform.api" 


// API version (major.minor.patch)

define VERSION_MAJOR 0

define VERSION_MINOR 184

define VERSION_MINOR 185

define VERSION_PATCH 0



// API limits
@@ -217,11 +217,6 @@ enum VkQueryType { 
    VK_QUERY_TYPE_PIPELINE_STATISTICS                       = 0x00000001, /// Optional

}



enum VkTimestampType {

    VK_TIMESTAMP_TYPE_TOP                                   = 0x00000000,

    VK_TIMESTAMP_TYPE_BOTTOM                                = 0x00000001,

}



enum VkBorderColor {

    VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK                 = 0x00000000,

    VK_BORDER_COLOR_INT_TRANSPARENT_BLACK                   = 0x00000001,
@@ -1539,7 +1534,6 @@ class VkSpecializationInfo { 
class VkPipelineShaderStageCreateInfo {

    VkStructureType                             sType              /// Must be VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO

    const void*                                 pNext              /// Pointer to next structure

    VkShaderStageFlags                          stage

    VkShader                                    shader

    const VkSpecializationInfo*                 pSpecializationInfo

}
@@ -2908,28 +2902,6 @@ cmd void vkDestroySemaphore( 
    State.Semaphores[semaphore] = null

}



@threadSafety("app")

cmd VkResult vkQueueSignalSemaphore(

        VkQueue                                     queue,

        VkSemaphore                                 semaphore) {

    queueObject := GetQueue(queue)

    semaphoreObject := GetSemaphore(semaphore)

    assert(queueObject.device == semaphoreObject.device)



    return ?

}



@threadSafety("system")

cmd VkResult vkQueueWaitSemaphore(

        VkQueue                                     queue,

        VkSemaphore                                 semaphore) {

    queueObject := GetQueue(queue)

    semaphoreObject := GetSemaphore(semaphore)

    assert(queueObject.device == semaphoreObject.device)



    return ?

}





// Event functions
@@ -4347,7 +4319,7 @@ cmd void vkCmdResetQueryPool( 
@threadSafety("app")

cmd void vkCmdWriteTimestamp(

        VkCmdBuffer                                 cmdBuffer,

        VkTimestampType                             timestampType,

        VkPipelineStageFlagBits                     pipelineStage,

        VkBuffer                                    destBuffer,

        VkDeviceSize                                destOffset) {

    cmdBufferObject := GetCmdBuffer(cmdBuffer)

vulkan/include/vulkan/vulkan.h

+3 −23
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern "C" { 
    ((major << 22) | (minor << 12) | patch)



// Vulkan API version supported by this file

#define VK_API_VERSION VK_MAKE_VERSION(0, 184, 0)

#define VK_API_VERSION VK_MAKE_VERSION(0, 185, 0)





#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800) || __cplusplus >= 201103L)
@@ -771,15 +771,6 @@ typedef enum { 
    VK_INDEX_TYPE_MAX_ENUM = 0x7FFFFFFF

} VkIndexType;



typedef enum {

    VK_TIMESTAMP_TYPE_TOP = 0,

    VK_TIMESTAMP_TYPE_BOTTOM = 1,

    VK_TIMESTAMP_TYPE_BEGIN_RANGE = VK_TIMESTAMP_TYPE_TOP,

    VK_TIMESTAMP_TYPE_END_RANGE = VK_TIMESTAMP_TYPE_BOTTOM,

    VK_TIMESTAMP_TYPE_NUM = (VK_TIMESTAMP_TYPE_BOTTOM - VK_TIMESTAMP_TYPE_TOP + 1),

    VK_TIMESTAMP_TYPE_MAX_ENUM = 0x7FFFFFFF

} VkTimestampType;



typedef enum {

    VK_RENDER_PASS_CONTENTS_INLINE = 0,

    VK_RENDER_PASS_CONTENTS_SECONDARY_CMD_BUFFERS = 1,
@@ -1561,7 +1552,6 @@ typedef struct { 
typedef struct {

    VkStructureType                             sType;

    const void*                                 pNext;

    VkShaderStageFlagBits                       stage;

    VkShader                                    shader;

    const VkSpecializationInfo*                 pSpecializationInfo;

} VkPipelineShaderStageCreateInfo;
@@ -2126,8 +2116,6 @@ typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence); 
typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout);

typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, VkSemaphore* pSemaphore);

typedef void (VKAPI *PFN_vkDestroySemaphore)(VkDevice device, VkSemaphore semaphore);

typedef VkResult (VKAPI *PFN_vkQueueSignalSemaphore)(VkQueue queue, VkSemaphore semaphore);

typedef VkResult (VKAPI *PFN_vkQueueWaitSemaphore)(VkQueue queue, VkSemaphore semaphore);

typedef VkResult (VKAPI *PFN_vkCreateEvent)(VkDevice device, const VkEventCreateInfo* pCreateInfo, VkEvent* pEvent);

typedef void (VKAPI *PFN_vkDestroyEvent)(VkDevice device, VkEvent event);

typedef VkResult (VKAPI *PFN_vkGetEventStatus)(VkDevice device, VkEvent event);
@@ -2218,7 +2206,7 @@ typedef void (VKAPI *PFN_vkCmdPipelineBarrier)(VkCmdBuffer cmdBuffer, VkPipeline 
typedef void (VKAPI *PFN_vkCmdBeginQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags);

typedef void (VKAPI *PFN_vkCmdEndQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot);

typedef void (VKAPI *PFN_vkCmdResetQueryPool)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount);

typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset);

typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset);

typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize stride, VkQueryResultFlags flags);

typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t start, uint32_t length, const void* values);

typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents);
@@ -2450,14 +2438,6 @@ void VKAPI vkDestroySemaphore( 
    VkDevice                                    device,

    VkSemaphore                                 semaphore);



VkResult VKAPI vkQueueSignalSemaphore(

    VkQueue                                     queue,

    VkSemaphore                                 semaphore);



VkResult VKAPI vkQueueWaitSemaphore(

    VkQueue                                     queue,

    VkSemaphore                                 semaphore);



VkResult VKAPI vkCreateEvent(

    VkDevice                                    device,

    const VkEventCreateInfo*                    pCreateInfo,
@@ -2961,7 +2941,7 @@ void VKAPI vkCmdResetQueryPool( 


void VKAPI vkCmdWriteTimestamp(

    VkCmdBuffer                                 cmdBuffer,

    VkTimestampType                             timestampType,

    VkPipelineStageFlagBits                     pipelineStage,

    VkBuffer                                    destBuffer,

    VkDeviceSize                                destOffset);

vulkan/libvulkan/entry.cpp

+2 −12
Original line number Diff line number Diff line
@@ -261,16 +261,6 @@ void vkDestroySemaphore(VkDevice device, VkSemaphore semaphore) { 
    GetVtbl(device).DestroySemaphore(device, semaphore);

}



__attribute__((visibility("default")))

VkResult vkQueueSignalSemaphore(VkQueue queue, VkSemaphore semaphore) {

    return GetVtbl(queue).QueueSignalSemaphore(queue, semaphore);

}



__attribute__((visibility("default")))

VkResult vkQueueWaitSemaphore(VkQueue queue, VkSemaphore semaphore) {

    return GetVtbl(queue).QueueWaitSemaphore(queue, semaphore);

}



__attribute__((visibility("default")))

VkResult vkCreateEvent(VkDevice device, const VkEventCreateInfo* pCreateInfo, VkEvent* pEvent) {

    return GetVtbl(device).CreateEvent(device, pCreateInfo, pEvent);
@@ -722,8 +712,8 @@ void vkCmdResetQueryPool(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t 
}



__attribute__((visibility("default")))

void vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset) {

    GetVtbl(cmdBuffer).CmdWriteTimestamp(cmdBuffer, timestampType, destBuffer, destOffset);

void vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset) {

    GetVtbl(cmdBuffer).CmdWriteTimestamp(cmdBuffer, pipelineStage, destBuffer, destOffset);

}



__attribute__((visibility("default")))

vulkan/libvulkan/get_proc_addr.cpp

+0 −14
Original line number Diff line number Diff line
@@ -192,10 +192,8 @@ const NameProcEntry kDeviceProcTbl[] = { 
    {"vkQueueBindSparseImageMemory", reinterpret_cast<PFN_vkVoidFunction>(vkQueueBindSparseImageMemory)},

    {"vkQueueBindSparseImageOpaqueMemory", reinterpret_cast<PFN_vkVoidFunction>(vkQueueBindSparseImageOpaqueMemory)},

    {"vkQueuePresentKHR", reinterpret_cast<PFN_vkVoidFunction>(vkQueuePresentKHR)},

    {"vkQueueSignalSemaphore", reinterpret_cast<PFN_vkVoidFunction>(vkQueueSignalSemaphore)},

    {"vkQueueSubmit", reinterpret_cast<PFN_vkVoidFunction>(vkQueueSubmit)},

    {"vkQueueWaitIdle", reinterpret_cast<PFN_vkVoidFunction>(vkQueueWaitIdle)},

    {"vkQueueWaitSemaphore", reinterpret_cast<PFN_vkVoidFunction>(vkQueueWaitSemaphore)},

    {"vkResetCommandBuffer", reinterpret_cast<PFN_vkVoidFunction>(vkResetCommandBuffer)},

    {"vkResetCommandPool", reinterpret_cast<PFN_vkVoidFunction>(vkResetCommandPool)},

    {"vkResetDescriptorPool", reinterpret_cast<PFN_vkVoidFunction>(vkResetDescriptorPool)},
@@ -353,10 +351,8 @@ const NameOffsetEntry kDeviceOffsetTbl[] = { 
    {"vkQueueBindSparseImageMemory", offsetof(DeviceVtbl, QueueBindSparseImageMemory)},

    {"vkQueueBindSparseImageOpaqueMemory", offsetof(DeviceVtbl, QueueBindSparseImageOpaqueMemory)},

    {"vkQueuePresentKHR", offsetof(DeviceVtbl, QueuePresentKHR)},

    {"vkQueueSignalSemaphore", offsetof(DeviceVtbl, QueueSignalSemaphore)},

    {"vkQueueSubmit", offsetof(DeviceVtbl, QueueSubmit)},

    {"vkQueueWaitIdle", offsetof(DeviceVtbl, QueueWaitIdle)},

    {"vkQueueWaitSemaphore", offsetof(DeviceVtbl, QueueWaitSemaphore)},

    {"vkResetCommandBuffer", offsetof(DeviceVtbl, ResetCommandBuffer)},

    {"vkResetCommandPool", offsetof(DeviceVtbl, ResetCommandPool)},

    {"vkResetDescriptorPool", offsetof(DeviceVtbl, ResetDescriptorPool)},
@@ -645,16 +641,6 @@ bool LoadDeviceVtbl(VkDevice device, 
        ALOGE("missing device proc: %s", "vkDestroySemaphore");

        success = false;

    }

    vtbl.QueueSignalSemaphore = reinterpret_cast<PFN_vkQueueSignalSemaphore>(get_proc_addr(device, "vkQueueSignalSemaphore"));

    if (UNLIKELY(!vtbl.QueueSignalSemaphore)) {

        ALOGE("missing device proc: %s", "vkQueueSignalSemaphore");

        success = false;

    }

    vtbl.QueueWaitSemaphore = reinterpret_cast<PFN_vkQueueWaitSemaphore>(get_proc_addr(device, "vkQueueWaitSemaphore"));

    if (UNLIKELY(!vtbl.QueueWaitSemaphore)) {

        ALOGE("missing device proc: %s", "vkQueueWaitSemaphore");

        success = false;

    }

    vtbl.CreateEvent = reinterpret_cast<PFN_vkCreateEvent>(get_proc_addr(device, "vkCreateEvent"));

    if (UNLIKELY(!vtbl.CreateEvent)) {

        ALOGE("missing device proc: %s", "vkCreateEvent");

vulkan/libvulkan/loader.h

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ struct DeviceVtbl { 
    PFN_vkQueueBindSparseBufferMemory QueueBindSparseBufferMemory;

    PFN_vkQueueBindSparseImageOpaqueMemory QueueBindSparseImageOpaqueMemory;

    PFN_vkQueueBindSparseImageMemory QueueBindSparseImageMemory;

    PFN_vkQueueSignalSemaphore QueueSignalSemaphore;

    PFN_vkQueueWaitSemaphore QueueWaitSemaphore;



    PFN_vkBeginCommandBuffer BeginCommandBuffer;

    PFN_vkEndCommandBuffer EndCommandBuffer;