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

Commit 9835fadb authored by Juston Li's avatar Juston Li
Browse files

vkjson: fix incorrect sType for VK_EXT_custom_border_color 

The PROPERTIES sType was inadvertently used instead of the FEATURES one
causing it to always print "0.0" for customBorderColorFeaturesEXT

Bug: 384808623
Test: adb shell cmd gpu vkjson
Flag: NONE infeasible
Change-Id: I544d2da947596c0abf12a948cb87d6e7c2bb8c38
parent 566e93a9

vulkan/scripts/vk.py

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ VULKAN_EXTENSIONS_AND_STRUCTS_MAPPING = { 
      {"VkPhysicalDeviceImage2DViewOf3DFeaturesEXT" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT"},

    ],

    "VK_EXT_custom_border_color" : [

      {"VkPhysicalDeviceCustomBorderColorFeaturesEXT" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT"},

      {"VkPhysicalDeviceCustomBorderColorFeaturesEXT" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT"},

    ],

    "VK_EXT_primitive_topology_list_restart": [

      {"VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT" : "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT"},

vulkan/vkjson/vkjson_instance.cc

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { 
  if (HasExtension("VK_EXT_custom_border_color", device.extensions)) {

    device.ext_custom_border_color.reported = true;

    device.ext_custom_border_color.custom_border_color_features_ext.sType =

        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT;

        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT;

    device.ext_custom_border_color.custom_border_color_features_ext.pNext =

        features.pNext;

    features.pNext =