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

Commit 1a04c987 authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge changes I6437dc95,I77261381 

am: d9f506fd

Change-Id: Ib3af51d0e71015bbc60f39bf209517b749bd80c0
parents fdf61aa5 d9f506fd

vulkan/api/platform.api

+3 −0
Original line number Diff line number Diff line
@@ -48,3 +48,6 @@ type u64 size_t 
// VK_USE_PLATFORM_WIN32_KHR

@internal type void* HINSTANCE

@internal type void* HWND

@internal type void* HANDLE

@internal type u32   DWORD

@internal class SECURITY_ATTRIBUTES {}

vulkan/api/vulkan.api

+515 −7

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_platform.h

+7 −7
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ extern "C" 
    #define VKAPI_ATTR

    #define VKAPI_CALL __stdcall

    #define VKAPI_PTR  VKAPI_CALL

#elif defined(__ANDROID__) && defined(__ARM_EABI__) && !defined(__ARM_ARCH_7A__)

    // Android does not support Vulkan in native code using the "armeabi" ABI.

    #error "Vulkan requires the 'armeabi-v7a' or 'armeabi-v7a-hard' ABI on 32-bit ARM CPUs"

#elif defined(__ANDROID__) && defined(__ARM_ARCH_7A__)

    // On Android/ARMv7a, Vulkan functions use the armeabi-v7a-hard calling

    // convention, even if the application's native code is compiled with the

    // armeabi-v7a calling convention.

#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7

    #error "Vulkan isn't supported for the 'armeabi' NDK ABI"

#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)

    // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"

    // calling convention, i.e. float parameters are passed in registers. This

    // is true even if the rest of the application passes floats on the stack,

    // as it does by default when compiling for the armeabi-v7a NDK ABI.

    #define VKAPI_ATTR __attribute__((pcs("aapcs-vfp")))

    #define VKAPI_CALL

    #define VKAPI_PTR  VKAPI_ATTR

vulkan/include/vulkan/vulkan.h

+490 −9

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/api_gen.cpp

+5 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ VKAPI_ATTR void CmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, Vk 
VKAPI_ATTR void CmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter);

VKAPI_ATTR void CmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);

VKAPI_ATTR void CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);

VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData);

VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData);

VKAPI_ATTR void CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);

VKAPI_ATTR void CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);

VKAPI_ATTR void CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
@@ -453,8 +453,10 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkEnumerateInstanceLayerProperties",

        "vkEnumeratePhysicalDevices",

        "vkGetInstanceProcAddr",

        "vkGetPhysicalDeviceExternalImageFormatPropertiesNV",

        "vkGetPhysicalDeviceFeatures",

        "vkGetPhysicalDeviceFormatProperties",

        "vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",

        "vkGetPhysicalDeviceImageFormatProperties",

        "vkGetPhysicalDeviceMemoryProperties",

        "vkGetPhysicalDeviceProperties",
@@ -1077,7 +1079,7 @@ VKAPI_ATTR void CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcI 
    GetData(commandBuffer).dispatch.CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions);

}



VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) {

VKAPI_ATTR void CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) {

    GetData(commandBuffer).dispatch.CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData);

}
@@ -1797,7 +1799,7 @@ VKAPI_ATTR void vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage sr 
}



__attribute__((visibility("default")))

VKAPI_ATTR void vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) {

VKAPI_ATTR void vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) {

    vulkan::api::CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData);

}