From 80d9ca7219218529313034115780a5149f04f80b Mon Sep 17 00:00:00 2001
From: Tom Murphy <tomnom@google.com>
Date: Thu, 17 Oct 2024 09:52:47 +0000
Subject: Add 1.4 support to VKJson

Add support for reporting vulkan 1.4 features in vkjson

Bug: 370568136
Flag: com.android.graphics.libvulkan.flags.vulkan_1_4_instance_api
Test: tested using hacked swiftshader with 1.4 support. Diff'd output with original output
Test: atest CtsGraphicsTestCases:android.graphics.cts.VulkanFeaturesTest passed
Change-Id: I0912a2cfd6a298ea4ce03e4749c4a7225c3f57c6
---
 vulkan/vkjson/vkjson.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'vulkan/vkjson/vkjson.h')

diff --git a/vulkan/vkjson/vkjson.h b/vulkan/vkjson/vkjson.h
index 88f6e7de53..28de680a99 100644
--- a/vulkan/vkjson/vkjson.h
+++ b/vulkan/vkjson/vkjson.h
@@ -84,6 +84,11 @@ struct VkJsonCore13 {
   VkPhysicalDeviceVulkan13Features features;
 };
 
+struct VkJsonCore14 {
+  VkPhysicalDeviceVulkan14Properties properties;
+  VkPhysicalDeviceVulkan14Features features;
+};
+
 struct VkJsonDevice {
   VkJsonDevice() {
     memset(&properties, 0, sizeof(VkPhysicalDeviceProperties));
@@ -110,6 +115,7 @@ struct VkJsonDevice {
            sizeof(VkPhysicalDeviceShaderDrawParameterFeatures));
     memset(&core12, 0, sizeof(VkJsonCore12));
     memset(&core13, 0, sizeof(VkJsonCore13));
+    memset(&core14, 0, sizeof(VkJsonCore14));
   }
   VkPhysicalDeviceProperties properties;
   VkPhysicalDeviceFeatures features;
@@ -139,6 +145,7 @@ struct VkJsonDevice {
       external_semaphore_properties;
   VkJsonCore12 core12;
   VkJsonCore13 core13;
+  VkJsonCore14 core14;
 };
 
 struct VkJsonDeviceGroup {
-- 
cgit v1.2.3-59-g8ed1b