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

Commit 65ab552c authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Update from version 0.197.0 to 0.198.0 

Change-Id: I182b21c68374e8eae962b2ae391bb283f07d5517
(cherry picked from commit ef5b7de781a9d803be4fba7ba243e6e96dd61851)
parent d1af812f

vulkan/api/vulkan.api

+122 −121

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_platform.h

+2 −5
Original line number Diff line number Diff line
@@ -42,12 +42,9 @@ extern "C" 
#if defined(_WIN32)

    // On Windows, VKAPI should equate to the __stdcall convention

    #define VKAPI   __stdcall

#elif defined(__GNUC__)

    // On other platforms using GCC, VKAPI stays undefined

    #define VKAPI

#else

    // Unsupported Platform!

    #error "Unsupported OS Platform detected!"

    // On other platforms, use the default calling convention

    #define VKAPI

#endif



#include <stddef.h>

vulkan/include/vulkan/vulkan.h

+147 −146

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/entry.cpp

+14 −14
Original line number Diff line number Diff line
@@ -552,18 +552,18 @@ void vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, fl 
}



__attribute__((visibility("default")))

void vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask) {

    GetVtbl(commandBuffer).CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask);

void vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) {

    GetVtbl(commandBuffer).CmdSetStencilCompareMask(commandBuffer, faceMask, compareMask);

}



__attribute__((visibility("default")))

void vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask) {

    GetVtbl(commandBuffer).CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask);

void vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) {

    GetVtbl(commandBuffer).CmdSetStencilWriteMask(commandBuffer, faceMask, writeMask);

}



__attribute__((visibility("default")))

void vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference) {

    GetVtbl(commandBuffer).CmdSetStencilReference(commandBuffer, faceMask, stencilReference);

void vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) {

    GetVtbl(commandBuffer).CmdSetStencilReference(commandBuffer, faceMask, reference);

}



__attribute__((visibility("default")))
@@ -687,13 +687,13 @@ void vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags sr 
}



__attribute__((visibility("default")))

void vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags) {

    GetVtbl(commandBuffer).CmdBeginQuery(commandBuffer, queryPool, slot, flags);

void vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t entry, VkQueryControlFlags flags) {

    GetVtbl(commandBuffer).CmdBeginQuery(commandBuffer, queryPool, entry, flags);

}



__attribute__((visibility("default")))

void vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) {

    GetVtbl(commandBuffer).CmdEndQuery(commandBuffer, queryPool, slot);

void vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t entry) {

    GetVtbl(commandBuffer).CmdEndQuery(commandBuffer, queryPool, entry);

}



__attribute__((visibility("default")))
@@ -702,8 +702,8 @@ void vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, u 
}



__attribute__((visibility("default")))

void vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) {

    GetVtbl(commandBuffer).CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot);

void vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t entry) {

    GetVtbl(commandBuffer).CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, entry);

}



__attribute__((visibility("default")))
@@ -717,12 +717,12 @@ void vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, 
}



__attribute__((visibility("default")))

void vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) {

void vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents) {

    GetVtbl(commandBuffer).CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents);

}



__attribute__((visibility("default")))

void vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkRenderPassContents contents) {

void vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents) {

    GetVtbl(commandBuffer).CmdNextSubpass(commandBuffer, contents);

}

vulkan/nulldrv/null_driver.cpp

+6 −6
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ void GetPhysicalDeviceProperties(VkPhysicalDevice, 
                                 VkPhysicalDeviceProperties* properties) {

    properties->apiVersion = VK_API_VERSION;

    properties->driverVersion = VK_MAKE_VERSION(0, 0, 1);

    properties->vendorId = 0;

    properties->deviceId = 0;

    properties->vendorID = 0;

    properties->deviceID = 0;

    properties->deviceType = VK_PHYSICAL_DEVICE_TYPE_OTHER;

    strcpy(properties->deviceName, "Android Vulkan Null Driver");

    memset(properties->pipelineCacheUUID, 0,
@@ -279,8 +279,8 @@ void GetPhysicalDeviceQueueFamilyProperties( 
    uint32_t* count,

    VkQueueFamilyProperties* properties) {

    if (properties) {

        properties->queueFlags =

            VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_DMA_BIT;

        properties->queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT |

                                 VK_QUEUE_TRANSFER_BIT;

        properties->queueCount = 1;

        properties->timestampValidBits = 64;

    }
@@ -1077,10 +1077,10 @@ void CmdCopyQueryPoolResults(VkCommandBuffer cmdBuffer, VkQueryPool queryPool, u 
void CmdPushConstants(VkCommandBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t start, uint32_t length, const void* values) {

}



void CmdBeginRenderPass(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents) {

void CmdBeginRenderPass(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents) {

}



void CmdNextSubpass(VkCommandBuffer cmdBuffer, VkRenderPassContents contents) {

void CmdNextSubpass(VkCommandBuffer cmdBuffer, VkSubpassContents contents) {

}



void CmdEndRenderPass(VkCommandBuffer cmdBuffer) {