Merge "Update VkJson to not visit features based on a specific version" (0eb46176) · Commits · e / os / platform_frameworks_native

vulkan/vkjson/vkjson.cc

+53 −60

Original line number	Diff line number	Diff line
		@@ -840,11 +840,7 @@ inline bool Iterate(Visitor* visitor, VkJsonDeviceGroup* device_group) {
		template <typename Visitor>
		inline bool Iterate(Visitor* visitor, VkJsonDevice* device) {
		bool ret = true;
		switch (device->properties.apiVersion ^
		VK_VERSION_PATCH(device->properties.apiVersion)) {
		case VK_API_VERSION_1_2:
		FALLTHROUGH_INTENDED;
		case VK_API_VERSION_1_1:
		if (device->properties.apiVersion >= VK_API_VERSION_1_1) {
		ret &=
		visitor->Visit("subgroupProperties", &device->subgroup_properties) &&
		visitor->Visit("pointClippingProperties",
		@@ -869,8 +865,8 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) {
		&device->external_fence_properties) &&
		visitor->Visit("externalSemaphoreProperties",
		&device->external_semaphore_properties);
		FALLTHROUGH_INTENDED;
		case VK_API_VERSION_1_0:
		}
		if (device->properties.apiVersion >= VK_API_VERSION_1_0) {
		ret &= visitor->Visit("properties", &device->properties) &&
		visitor->Visit("features", &device->features) &&
		visitor->Visit("memory", &device->memory) &&
		@@ -897,13 +893,10 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) {
		template <typename Visitor>
		inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) {
		bool ret = true;
		switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) {
		case VK_API_VERSION_1_2:
		FALLTHROUGH_INTENDED;
		case VK_API_VERSION_1_1:
		if (instance->api_version >= VK_API_VERSION_1_1) {
		ret &= visitor->Visit("deviceGroups", &instance->device_groups);
		FALLTHROUGH_INTENDED;
		case VK_API_VERSION_1_0:
		}
		if (instance->api_version >= VK_API_VERSION_1_0) {
		ret &= visitor->Visit("layers", &instance->layers) &&
		visitor->Visit("extensions", &instance->extensions) &&
		visitor->Visit("devices", &instance->devices);