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

Commit 94ce01a7 authored by mridulgoyal's avatar mridulgoyal Committed by Mridul Goyal
Browse files

Fixed Indentation for vk.py and reordered variable definition 

Key Updates:
- Fixed Indentation issues in vk.py
- Reordered variable to match the new vk.py (generated using vk_parser.py)
Flag: NONE infeasible
Bug: N/A
Test: N/A
Change-Id: I187ccf7fb7ebe4d8a75c85e29cdaae43fd484f71
parent 5e9c5be6

vulkan/scripts/vk.py

+701 −700
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ class VkPhysicalDeviceDriverProperties: 
    driverInfo: str

    conformanceVersion: ConformanceVersion





# Defining alias for structures

VkPhysicalDeviceLineRasterizationFeaturesEXT = VkPhysicalDeviceLineRasterizationFeatures

VkPhysicalDeviceLineRasterizationFeaturesKHR = VkPhysicalDeviceLineRasterizationFeatures
@@ -771,6 +772,61 @@ VkPhysicalDeviceFloatControlsPropertiesKHR = VkPhysicalDeviceFloatControlsProper 
VkPhysicalDeviceShaderDrawParametersFeatures = VkPhysicalDeviceShaderDrawParameterFeatures

VkPhysicalDeviceDriverPropertiesKHR = VkPhysicalDeviceDriverProperties



# List of all the structures for vkjson

ALL_STRUCTS = [

    VkPhysicalDeviceFloatControlsPropertiesKHR,

    VkPhysicalDeviceProperties,

    VkPhysicalDeviceMemoryProperties,

    VkPhysicalDeviceSubgroupProperties,

    VkPhysicalDevicePointClippingProperties,

    VkPhysicalDeviceMultiviewProperties,

    VkPhysicalDeviceIDProperties,

    VkPhysicalDeviceMaintenance3Properties,

    VkPhysicalDeviceSparseProperties,

    VkImageFormatProperties,

    VkQueueFamilyProperties,

    VkExtensionProperties,

    VkLayerProperties,

    VkFormatProperties,

    VkPhysicalDeviceVariablePointerFeaturesKHR,

    VkPhysicalDeviceVariablePointersFeaturesKHR,

    VkPhysicalDeviceShaderFloat16Int8FeaturesKHR,

    VkPhysicalDeviceFloat16Int8FeaturesKHR,

    VkPhysicalDeviceImage2DViewOf3DFeaturesEXT,

    VkPhysicalDeviceCustomBorderColorFeaturesEXT,

    VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT,

    VkPhysicalDeviceProvokingVertexFeaturesEXT,

    VkPhysicalDeviceIndexTypeUint8FeaturesKHR,

    VkPhysicalDeviceIndexTypeUint8FeaturesEXT,

    VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR,

    VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT,

    VkPhysicalDeviceTransformFeedbackFeaturesEXT,

    VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR,

    VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR,

    VkPhysicalDevice8BitStorageFeaturesKHR,

    VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR,

    VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG,

    VkPhysicalDeviceLineRasterizationFeaturesKHR,

    VkPhysicalDeviceLineRasterizationFeaturesEXT,

    VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT,

    VkPhysicalDevice16BitStorageFeatures,

    VkPhysicalDeviceMultiviewFeatures,

    VkPhysicalDeviceProtectedMemoryFeatures,

    VkPhysicalDeviceSamplerYcbcrConversionFeatures,

    VkPhysicalDeviceShaderDrawParameterFeatures,

    VkPhysicalDeviceLimits,

    VkPhysicalDeviceFeatures,

    VkPhysicalDeviceVulkan11Properties,

    VkPhysicalDeviceVulkan11Features,

    VkPhysicalDeviceVulkan12Properties,

    VkPhysicalDeviceVulkan12Features,

    VkPhysicalDeviceVulkan13Properties,

    VkPhysicalDeviceVulkan13Features,

    VkPhysicalDeviceVulkan14Properties,

    VkPhysicalDeviceVulkan14Features,

    VkPhysicalDeviceDriverProperties,

]



# Defining dependency of structures on extensions

VULKAN_EXTENSIONS_AND_STRUCTS_MAPPING = {

    "extensions": {
@@ -838,38 +894,8 @@ VULKAN_EXTENSIONS_AND_STRUCTS_MAPPING = { 
        ],

        "VK_KHR_driver_properties": [

            {"VkPhysicalDeviceDriverPropertiesKHR": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES"},

    ]

  }

}



# Defining dependency of structures on vulkan cores

VULKAN_CORES_AND_STRUCTS_MAPPING = {

  "versions" : {

    "Core11" : [

      {"VkPhysicalDeviceVulkan11Properties" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES"},

      {"VkPhysicalDeviceVulkan11Features" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES"},

    ],

    "Core12" : [

      {"VkPhysicalDeviceVulkan12Properties" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES"},

      {"VkPhysicalDeviceVulkan12Features" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES"},

        ],

    "Core13" : [

      {"VkPhysicalDeviceVulkan13Properties" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES"},

      {"VkPhysicalDeviceVulkan13Features" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES"},

    ],

    "Core14" : [

      {"VkPhysicalDeviceVulkan14Properties" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES"},

      {"VkPhysicalDeviceVulkan14Features" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES"},

    ]

  }

    }



# Defining map for list type members mapped to its size

LIST_TYPE_FIELD_AND_SIZE_MAPPING = {

  "pCopySrcLayouts": "copySrcLayoutCount",

  "pCopyDstLayouts": "copyDstLayoutCount",

  "memoryTypes": "memoryTypeCount",

  "memoryHeaps": "memoryHeapCount",

}



# Defining dependency of structures on vulkan api version
@@ -891,7 +917,7 @@ VULKAN_VERSIONS_AND_STRUCTS_MAPPING = { 
        {"VkPhysicalDeviceSamplerYcbcrConversionFeatures": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES"},

        {"VkPhysicalDeviceShaderDrawParameterFeatures": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES"},

        {"VkPhysicalDevice16BitStorageFeatures": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES"},

  ]

    ],

}



# List of structures that are not dependent on extensions
@@ -912,57 +938,32 @@ EXTENSION_INDEPENDENT_STRUCTS = [ 
    VkPhysicalDeviceShaderDrawParameterFeatures,

]



# List of all the structures for vkjson

ALL_STRUCTS = [

  VkPhysicalDeviceFloatControlsPropertiesKHR,

  VkPhysicalDeviceProperties,

  VkPhysicalDeviceMemoryProperties,

  VkPhysicalDeviceSubgroupProperties,

  VkPhysicalDevicePointClippingProperties,

  VkPhysicalDeviceMultiviewProperties,

  VkPhysicalDeviceIDProperties,

  VkPhysicalDeviceMaintenance3Properties,

  VkPhysicalDeviceSparseProperties,

  VkImageFormatProperties,

  VkQueueFamilyProperties,

  VkExtensionProperties,

  VkLayerProperties,

  VkFormatProperties,

  VkPhysicalDeviceVariablePointerFeaturesKHR,

  VkPhysicalDeviceVariablePointersFeaturesKHR,

  VkPhysicalDeviceShaderFloat16Int8FeaturesKHR,

  VkPhysicalDeviceFloat16Int8FeaturesKHR,

  VkPhysicalDeviceImage2DViewOf3DFeaturesEXT,

  VkPhysicalDeviceCustomBorderColorFeaturesEXT,

  VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT,

  VkPhysicalDeviceProvokingVertexFeaturesEXT,

  VkPhysicalDeviceIndexTypeUint8FeaturesKHR,

  VkPhysicalDeviceIndexTypeUint8FeaturesEXT,

  VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR,

  VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT,

  VkPhysicalDeviceTransformFeedbackFeaturesEXT,

  VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR,

  VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR,

  VkPhysicalDevice8BitStorageFeaturesKHR,

  VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR,

  VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG,

  VkPhysicalDeviceLineRasterizationFeaturesKHR,

  VkPhysicalDeviceLineRasterizationFeaturesEXT,

  VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT,

  VkPhysicalDevice16BitStorageFeatures,

  VkPhysicalDeviceMultiviewFeatures,

  VkPhysicalDeviceProtectedMemoryFeatures,

  VkPhysicalDeviceSamplerYcbcrConversionFeatures,

  VkPhysicalDeviceShaderDrawParameterFeatures,

  VkPhysicalDeviceLimits,

  VkPhysicalDeviceFeatures,

  VkPhysicalDeviceVulkan11Properties,

  VkPhysicalDeviceVulkan11Features,

  VkPhysicalDeviceVulkan12Properties,

  VkPhysicalDeviceVulkan12Features,

  VkPhysicalDeviceVulkan13Properties,

  VkPhysicalDeviceVulkan13Features,

  VkPhysicalDeviceVulkan14Properties,

  VkPhysicalDeviceVulkan14Features,

  VkPhysicalDeviceDriverProperties,

]
 
# Defining dependency of structures on vulkan cores

VULKAN_CORES_AND_STRUCTS_MAPPING = {

    "versions": {

        "Core11": [

            {"VkPhysicalDeviceVulkan11Properties": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES"},

            {"VkPhysicalDeviceVulkan11Features": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES"},

        ],

        "Core12": [

            {"VkPhysicalDeviceVulkan12Properties": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES"},

            {"VkPhysicalDeviceVulkan12Features": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES"},

        ],

        "Core13": [

            {"VkPhysicalDeviceVulkan13Properties": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES"},

            {"VkPhysicalDeviceVulkan13Features": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES"},

        ],

        "Core14": [

            {"VkPhysicalDeviceVulkan14Properties": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES"},

            {"VkPhysicalDeviceVulkan14Features": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES"},

        ],

    }

}



# Defining map for list type members mapped to its size

LIST_TYPE_FIELD_AND_SIZE_MAPPING = {

    "pCopySrcLayouts": "copySrcLayoutCount",

    "pCopyDstLayouts": "copyDstLayoutCount",

    "memoryTypes": "memoryTypeCount",

    "memoryHeaps": "memoryHeapCount",

}