Skip to content

Update assets submodule to include upstream additions - #1574

Merged
marty-johnson59 merged 1 commit into
KhronosGroup:mainfrom
gpx1000:fix/update-assets-submodule
Sep 10, 2026
Merged

Update assets submodule to include upstream additions#1574
marty-johnson59 merged 1 commit into
KhronosGroup:mainfrom
gpx1000:fix/update-assets-submodule

Conversation

@gpx1000

@gpx1000 gpx1000 commented Sep 10, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • The assets submodule was pinned to a fork branch that had diverged from KhronosGroup/Vulkan-Samples-Assets main, missing assets that several existing samples depend on (conditional_rendering, extended_dynamic_state2, patch_control_points, morpheus_team, pica_pica_robot, subpass_scene, ray_tracing_position_fetch).
  • Merges the latest upstream assets into the existing branch while keeping the octomap/splat assets already in use, and updates the submodule pointer to the merged commit.

Test plan

  • Verify submodule checkout pulls the merged commit cleanly
  • Build affected samples (conditional_rendering, extended_dynamic_state2, patch_control_points) and confirm they now find their assets

The assets submodule was pinned to a fork branch that had diverged
from upstream, missing assets for conditional_rendering,
extended_dynamic_state2, patch_control_points, morpheus_team,
pica_pica_robot, subpass_scene, and ray_tracing_position_fetch
samples. Merges upstream/main into the existing branch while keeping
the octomap/splat assets already in use.
@gpx1000 gpx1000 linked an issue Sep 10, 2026 that may be closed by this pull request
@marty-johnson59
marty-johnson59 merged commit ad5dd38 into KhronosGroup:main Sep 10, 2026
19 checks passed
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.

Scene assets missing after merge of octomap sample

3 participants