tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow VK_API_VERSION_1_2 in VkJson" am: 3ce4a1b9a2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1637597

Change-Id: Ib808aa5bcdd66d493eefc69cff1b5a9161b8886c
This commit is contained in:
Jason Macnak 2021-03-16 20:51:46 +00:00 committed by Automerger Merge Worker
commit 7cc33770c0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vulkan/vkjson/vkjson.cc
View file

@ -842,6 +842,8 @@ inline bool Iterate(Visitor* visitor, VkJsonDevice* device) {
bool ret = true; bool ret = true;
switch (device->properties.apiVersion ^ switch (device->properties.apiVersion ^
VK_VERSION_PATCH(device->properties.apiVersion)) { VK_VERSION_PATCH(device->properties.apiVersion)) {
case VK_API_VERSION_1_2:
FALLTHROUGH_INTENDED;
case VK_API_VERSION_1_1: case VK_API_VERSION_1_1:
ret &= ret &=
visitor->Visit("subgroupProperties", &device->subgroup_properties) && visitor->Visit("subgroupProperties", &device->subgroup_properties) &&
@ -896,6 +898,8 @@ template <typename Visitor>
inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) { inline bool Iterate(Visitor* visitor, VkJsonInstance* instance) {
bool ret = true; bool ret = true;
switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) { switch (instance->api_version ^ VK_VERSION_PATCH(instance->api_version)) {
case VK_API_VERSION_1_2:
FALLTHROUGH_INTENDED;
case VK_API_VERSION_1_1: case VK_API_VERSION_1_1:
ret &= visitor->Visit("deviceGroups", &instance->device_groups); ret &= visitor->Visit("deviceGroups", &instance->device_groups);
FALLTHROUGH_INTENDED; FALLTHROUGH_INTENDED;