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

Commit 2e731f83 authored by Trevor Black's avatar Trevor Black Committed by Android (Google) Code Review
Browse files

Merge changes from topic "main-vulkan13-dev to master" 

* changes:
  Add Vulkan 1.3 symbols to null_driver
  Vulkan: update the loader for vulkan-headers v1.3.203
  Add Vulkan version 1.3 to frameworks/native/data/etc
  Added a comment deprecating vkjson
  Updated the llndk symbol map for Vulkan 1.3
  Added Vulkan 1.3 support to vkjson
  Change Vulkan API to 1.3
  Vulkan: update the loader for vulkan-headers v1.3.197
  Added Vulkan 1.2 support to vkjson
  Deprecate old VK_* defines
  Change Vulkan API to 1.2
parents 842bbde9 6e76a617

data/etc/android.hardware.vulkan.version-1_3.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2022 The Android Open Source Project



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

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

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This is the standard feature indicating that the device has a Vulkan

     driver that supports API version 1.3 (0x00403000) -->

<permissions>

    <feature name="android.hardware.vulkan.version" version="4206592" />

</permissions>

vulkan/libvulkan/api.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ VkResult EnumerateInstanceVersion(uint32_t* pApiVersion) { 
    if (!EnsureInitialized())

        return VK_ERROR_OUT_OF_HOST_MEMORY;



    *pApiVersion = VK_API_VERSION_1_1;

    *pApiVersion = VK_API_VERSION_1_3;

    return VK_SUCCESS;

}

vulkan/libvulkan/api_gen.cpp

+444 −0

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/api_gen.h

+37 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct InstanceDispatchTable { 
    PFN_vkGetPhysicalDeviceExternalFenceProperties GetPhysicalDeviceExternalFenceProperties;

    PFN_vkEnumeratePhysicalDeviceGroups EnumeratePhysicalDeviceGroups;

    PFN_vkGetPhysicalDevicePresentRectanglesKHR GetPhysicalDevicePresentRectanglesKHR;

    PFN_vkGetPhysicalDeviceToolProperties GetPhysicalDeviceToolProperties;

    // clang-format on

};
@@ -207,6 +208,9 @@ struct DeviceDispatchTable { 
    PFN_vkGetBufferMemoryRequirements2 GetBufferMemoryRequirements2;

    PFN_vkGetImageMemoryRequirements2 GetImageMemoryRequirements2;

    PFN_vkGetImageSparseMemoryRequirements2 GetImageSparseMemoryRequirements2;

    PFN_vkGetDeviceBufferMemoryRequirements GetDeviceBufferMemoryRequirements;

    PFN_vkGetDeviceImageMemoryRequirements GetDeviceImageMemoryRequirements;

    PFN_vkGetDeviceImageSparseMemoryRequirements GetDeviceImageSparseMemoryRequirements;

    PFN_vkCreateSamplerYcbcrConversion CreateSamplerYcbcrConversion;

    PFN_vkDestroySamplerYcbcrConversion DestroySamplerYcbcrConversion;

    PFN_vkGetDeviceQueue2 GetDeviceQueue2;
@@ -225,6 +229,39 @@ struct DeviceDispatchTable { 
    PFN_vkGetBufferOpaqueCaptureAddress GetBufferOpaqueCaptureAddress;

    PFN_vkGetBufferDeviceAddress GetBufferDeviceAddress;

    PFN_vkGetDeviceMemoryOpaqueCaptureAddress GetDeviceMemoryOpaqueCaptureAddress;

    PFN_vkCmdSetCullMode CmdSetCullMode;

    PFN_vkCmdSetFrontFace CmdSetFrontFace;

    PFN_vkCmdSetPrimitiveTopology CmdSetPrimitiveTopology;

    PFN_vkCmdSetViewportWithCount CmdSetViewportWithCount;

    PFN_vkCmdSetScissorWithCount CmdSetScissorWithCount;

    PFN_vkCmdBindVertexBuffers2 CmdBindVertexBuffers2;

    PFN_vkCmdSetDepthTestEnable CmdSetDepthTestEnable;

    PFN_vkCmdSetDepthWriteEnable CmdSetDepthWriteEnable;

    PFN_vkCmdSetDepthCompareOp CmdSetDepthCompareOp;

    PFN_vkCmdSetDepthBoundsTestEnable CmdSetDepthBoundsTestEnable;

    PFN_vkCmdSetStencilTestEnable CmdSetStencilTestEnable;

    PFN_vkCmdSetStencilOp CmdSetStencilOp;

    PFN_vkCmdSetRasterizerDiscardEnable CmdSetRasterizerDiscardEnable;

    PFN_vkCmdSetDepthBiasEnable CmdSetDepthBiasEnable;

    PFN_vkCmdSetPrimitiveRestartEnable CmdSetPrimitiveRestartEnable;

    PFN_vkCreatePrivateDataSlot CreatePrivateDataSlot;

    PFN_vkDestroyPrivateDataSlot DestroyPrivateDataSlot;

    PFN_vkSetPrivateData SetPrivateData;

    PFN_vkGetPrivateData GetPrivateData;

    PFN_vkCmdCopyBuffer2 CmdCopyBuffer2;

    PFN_vkCmdCopyImage2 CmdCopyImage2;

    PFN_vkCmdBlitImage2 CmdBlitImage2;

    PFN_vkCmdCopyBufferToImage2 CmdCopyBufferToImage2;

    PFN_vkCmdCopyImageToBuffer2 CmdCopyImageToBuffer2;

    PFN_vkCmdResolveImage2 CmdResolveImage2;

    PFN_vkCmdSetEvent2 CmdSetEvent2;

    PFN_vkCmdResetEvent2 CmdResetEvent2;

    PFN_vkCmdWaitEvents2 CmdWaitEvents2;

    PFN_vkCmdPipelineBarrier2 CmdPipelineBarrier2;

    PFN_vkQueueSubmit2 QueueSubmit2;

    PFN_vkCmdWriteTimestamp2 CmdWriteTimestamp2;

    PFN_vkCmdBeginRendering CmdBeginRendering;

    PFN_vkCmdEndRendering CmdEndRendering;

    // clang-format on

};

vulkan/libvulkan/driver.cpp

+14 −4
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ CreateInfoWrapper::CreateInfoWrapper(const VkInstanceCreateInfo& create_info, 
                                     const VkAllocationCallbacks& allocator)

    : is_instance_(true),

      allocator_(allocator),

      loader_api_version_(VK_API_VERSION_1_1),

      loader_api_version_(VK_API_VERSION_1_3),

      icd_api_version_(icd_api_version),

      physical_dev_(VK_NULL_HANDLE),

      instance_info_(create_info),
@@ -377,7 +377,7 @@ CreateInfoWrapper::CreateInfoWrapper(VkPhysicalDevice physical_dev, 
                                     const VkAllocationCallbacks& allocator)

    : is_instance_(false),

      allocator_(allocator),

      loader_api_version_(VK_API_VERSION_1_1),

      loader_api_version_(VK_API_VERSION_1_3),

      icd_api_version_(icd_api_version),

      physical_dev_(physical_dev),

      dev_info_(create_info),
@@ -519,6 +519,14 @@ VkResult CreateInfoWrapper::SanitizeExtensions() { 
        is_instance_ ? loader_api_version_

                     : std::min(icd_api_version_, loader_api_version_);

    switch (api_version) {

        case VK_API_VERSION_1_3:

            hook_extensions_.set(ProcHook::EXTENSION_CORE_1_3);

            hal_extensions_.set(ProcHook::EXTENSION_CORE_1_3);

            [[clang::fallthrough]];

        case VK_API_VERSION_1_2:

            hook_extensions_.set(ProcHook::EXTENSION_CORE_1_2);

            hal_extensions_.set(ProcHook::EXTENSION_CORE_1_2);

            [[clang::fallthrough]];

        case VK_API_VERSION_1_1:

            hook_extensions_.set(ProcHook::EXTENSION_CORE_1_1);

            hal_extensions_.set(ProcHook::EXTENSION_CORE_1_1);
@@ -653,6 +661,7 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            case ProcHook::EXTENSION_CORE_1_0:

            case ProcHook::EXTENSION_CORE_1_1:

            case ProcHook::EXTENSION_CORE_1_2:

            case ProcHook::EXTENSION_CORE_1_3:

            case ProcHook::EXTENSION_COUNT:

                // Device and meta extensions. If we ever get here it's a bug in

                // our code. But enumerating them lets us avoid having a default
@@ -707,6 +716,7 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            case ProcHook::EXTENSION_CORE_1_0:

            case ProcHook::EXTENSION_CORE_1_1:

            case ProcHook::EXTENSION_CORE_1_2:

            case ProcHook::EXTENSION_CORE_1_3:

            case ProcHook::EXTENSION_COUNT:

                // Instance and meta extensions. If we ever get here it's a bug

                // in our code. But enumerating them lets us avoid having a
@@ -1111,7 +1121,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, 
        if (result != VK_SUCCESS)

            return result;



        icd_api_version ^= VK_VERSION_PATCH(icd_api_version);

        icd_api_version ^= VK_API_VERSION_PATCH(icd_api_version);

    }



    CreateInfoWrapper wrapper(*pCreateInfo, icd_api_version, data_allocator);
@@ -1195,7 +1205,7 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice, 


    CreateInfoWrapper wrapper(

        physicalDevice, *pCreateInfo,

        properties.apiVersion ^ VK_VERSION_PATCH(properties.apiVersion),

        properties.apiVersion ^ VK_API_VERSION_PATCH(properties.apiVersion),

        data_allocator);

    VkResult result = wrapper.Validate();

    if (result != VK_SUCCESS)