Skip to content

guard android/ios surfaces in terminator_DestroySurfaceKHR#1946

Merged
charles-lunarg merged 1 commit into
KhronosGroup:mainfrom
aizu-m:guard-destroy-surface-android-ios
Jun 24, 2026
Merged

guard android/ios surfaces in terminator_DestroySurfaceKHR#1946
charles-lunarg merged 1 commit into
KhronosGroup:mainfrom
aizu-m:guard-destroy-surface-android-ios

Conversation

@aizu-m

@aizu-m aizu-m commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

an android or ios surface is the smaller VkIcdSurfaceAndroid/VkIcdSurfaceIOS and never gets a surface_index, yet terminator_DestroySurfaceKHR reads surface_index and create_info straight off it and then indexes every driver's surface_list with that garbage, so bail out for those two platforms up front like wsi_unwrap_icd_surface already does.

@ci-tester-lunarg

Copy link
Copy Markdown

Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build.

1 similar comment
@ci-tester-lunarg

Copy link
Copy Markdown

Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build.

@ci-tester-lunarg

Copy link
Copy Markdown

CI Vulkan-Loader build queued with queue ID 16341.

@ci-tester-lunarg

Copy link
Copy Markdown

CI Vulkan-Loader build # 3585 running.

@ci-tester-lunarg

Copy link
Copy Markdown

CI Vulkan-Loader build # 3585 passed.

@charles-lunarg charles-lunarg left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brings the destroy surface code in line with the create surface code.
Because this loader doesn't support Android (currently) the existence of android code is vestigial. But since it might in the future (no plans, just that it is in the realm of possibility), its good to keep around.

The IOS path using the MACOS_MVK platform guard is odd, but since the create surface code has the same guard, I would rather it be consistent anyhow. Plus, I suspect the guard is that way for a reason.

@charles-lunarg charles-lunarg merged commit 9a5f88e into KhronosGroup:main Jun 24, 2026
51 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.

3 participants