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

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

Merge changes Ib6b72ca5,I8ea5dfb9,Iaf954877,I803bf9f4 

am: 42f482e1

Change-Id: I777ac0dd59147dd8aa28d2093e6baab4d199be42
parents a8f36c30 42f482e1

vulkan/api/platform.api

+4 −0
Original line number Diff line number Diff line
@@ -50,4 +50,8 @@ type u64 size_t 
@internal type void* HWND

@internal type void* HANDLE

@internal type u32   DWORD

@internal type u16*  LPCWSTR

@internal class SECURITY_ATTRIBUTES {}



// VK_USE_PLATFORM_XLIB_XRANDR_EXT

@internal type u64 RROutput

vulkan/api/vulkan.api

+1757 −273

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_platform.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// File: vk_platform.h

//

/*

** Copyright (c) 2014-2015 The Khronos Group Inc.

** Copyright (c) 2014-2017 The Khronos Group Inc.

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

vulkan/include/vulkan/vulkan.h

+1388 −9

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/api_gen.cpp

+16 −5
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ VKAPI_ATTR void CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uin 
VKAPI_ATTR void CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance);

VKAPI_ATTR void CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);

VKAPI_ATTR void CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);

VKAPI_ATTR void CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);

VKAPI_ATTR void CmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);

VKAPI_ATTR void CmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
@@ -451,17 +451,28 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkEnumerateDeviceLayerProperties",

        "vkEnumerateInstanceExtensionProperties",

        "vkEnumerateInstanceLayerProperties",

        "vkEnumeratePhysicalDeviceGroupsKHX",

        "vkEnumeratePhysicalDevices",

        "vkGetInstanceProcAddr",

        "vkGetPhysicalDeviceExternalBufferPropertiesKHX",

        "vkGetPhysicalDeviceExternalImageFormatPropertiesNV",

        "vkGetPhysicalDeviceExternalSemaphorePropertiesKHX",

        "vkGetPhysicalDeviceFeatures",

        "vkGetPhysicalDeviceFeatures2KHR",

        "vkGetPhysicalDeviceFormatProperties",

        "vkGetPhysicalDeviceFormatProperties2KHR",

        "vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",

        "vkGetPhysicalDeviceImageFormatProperties",

        "vkGetPhysicalDeviceImageFormatProperties2KHR",

        "vkGetPhysicalDeviceMemoryProperties",

        "vkGetPhysicalDeviceMemoryProperties2KHR",

        "vkGetPhysicalDevicePresentRectanglesKHX",

        "vkGetPhysicalDeviceProperties",

        "vkGetPhysicalDeviceProperties2KHR",

        "vkGetPhysicalDeviceQueueFamilyProperties",

        "vkGetPhysicalDeviceQueueFamilyProperties2KHR",

        "vkGetPhysicalDeviceSparseImageFormatProperties",

        "vkGetPhysicalDeviceSparseImageFormatProperties2KHR",

        "vkGetPhysicalDeviceSurfaceCapabilitiesKHR",

        "vkGetPhysicalDeviceSurfaceFormatsKHR",

        "vkGetPhysicalDeviceSurfacePresentModesKHR",
@@ -1051,8 +1062,8 @@ VKAPI_ATTR void CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer b 
    GetData(commandBuffer).dispatch.CmdDrawIndexedIndirect(commandBuffer, buffer, offset, drawCount, stride);

}



VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) {

    GetData(commandBuffer).dispatch.CmdDispatch(commandBuffer, x, y, z);

VKAPI_ATTR void CmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) {

    GetData(commandBuffer).dispatch.CmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ);

}



VKAPI_ATTR void CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) {
@@ -1764,8 +1775,8 @@ VKAPI_ATTR void vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer 
}



__attribute__((visibility("default")))

VKAPI_ATTR void vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) {

    vulkan::api::CmdDispatch(commandBuffer, x, y, z);

VKAPI_ATTR void vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) {

    vulkan::api::CmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ);

}



__attribute__((visibility("default")))