Skip to content

Merge 2672f9c180 from lunarg and re-generate cpu-timing files#18

Merged
emrekultursay merged 45 commits into
android-graphics:mainfrom
emrekultursay:merge_from_lunarg
May 22, 2026
Merged

Merge 2672f9c180 from lunarg and re-generate cpu-timing files#18
emrekultursay merged 45 commits into
android-graphics:mainfrom
emrekultursay:merge_from_lunarg

Conversation

@emrekultursay
Copy link
Copy Markdown

The only change in the merge that affects our fork is the Vulkan SDK Header Upgrades (3dcdbbd, 03b976c), which are updated first to 1.4.349 and then to 1.4.350. I re-generated the cpu_timing layer generated files (see the commit after the merge).

Remaining changes in the merge are not related to our fork: vkconfig improvements, api-dump layer changes/fixes.

@google-cla
Copy link
Copy Markdown

google-cla Bot commented May 21, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@emrekultursay emrekultursay marked this pull request as ready for review May 21, 2026 22:59
christophe-lunarg and others added 26 commits May 22, 2026 07:37
- Clarify UI to clarify what is overridden by Vulkan Configurator: Layers, Devices, Loader log
- Redesign system tray:
  - Add selecting Vulkan Layers configuration from system tray
  - Add selecting Vullan physical device from system tray
  - Add enabling Vulkan Loader log from system tray
- Add preferences settings to show "Vulkan Executables Scope"
Change-Id: I5a003d3e539bac5f2dce72cc2fc5a9711cbfe1b9
Change-Id: Ibe020afd10370ba142e8dc7a9f25f2ded7e48932
…applied

Change-Id: I3adc1adf4311a2cc865b6b610345b11d66929627
Change-Id: I6646a52f9e044d6080f35c30ff9023e6be8eb529
Change-Id: I9d5fa47014b1afa41f6265e560e6d21a0d9e4b26
Pointers weren't checking the de-aliased type.
The deprecation of device layers occurred many years ago, but only now has there
been proper declaration of it in the xml. However, the xml also removed useful
fields that let api dump handle the array gracefully. With those fields gone, the
code generator must add back the information.
reg.py added a new dependency that has to be acquired in order
to run the code generator.
christophe-lunarg and others added 19 commits May 22, 2026 07:37
Change-Id: I1f1306ef3334aeca36ae76272e94f193bc57cb2b
Change-Id: I786b47b293f0c9e95ed93aeb345658c551491065
Includes removing the workaround when the VkDeviceCreateInfo
in vk.xml lost some necessary attributes.
Change-Id: I3255e0b91b93cf3f538aef5475b414020c12b2fc
Change-Id: Icf6f228c4c39b48d2a1875c82be2d28f5eb334ec
Change-Id: Ibefe16ce2bf7cb26b1f9323240326d50c6dab465
Change-Id: I7f19d6029291b629c2a79e5e63da851f828b7173
…are not configured

Change-Id: If49d47f966efc011a9633dd3ca92c06359331c00
Change-Id: I9f9962a619ba5bfa9ba9068c227a270a09479b4d
Change-Id: Id7748746694c5def778a06070f885a3db5df0c83
Change-Id: I263eda8be5aef38e97e0c76d5e4bcdae040cdca8
@emrekultursay emrekultursay merged commit df1ed24 into android-graphics:main May 22, 2026
10 checks passed
@emrekultursay
Copy link
Copy Markdown
Author

Oops. I pressed "rebase and merge" instead of merge. Git history doesn't match now.

@emrekultursay
Copy link
Copy Markdown
Author

Fixed the problem by using admin powers. I rewrote git history with the proper merge style. I reapplied the cputiming layer generated files patch on top. Tip-of-tree should be identical.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants