Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Vulkan] Add detail:: namespace to throwResultException #3353

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

heirecka
Copy link
Contributor

Fixes the build with vulkan-header >= 1.3.260.

@past-due
Copy link
Member

Thanks for the contribution!

Unfortunately it looks like this breaks compilation with earlier Vulkan SDK headers, so it seems like we may need a preprocessor check (maybe conditioned on VK_HEADER_VERSION >= 260?) - something like the following (untested):

#if VK_HEADER_VERSION >= 260
# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::detail::throwResultException(result, message)
#else
# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::throwResultException(result, message)
#endif

And then we'd replace the calls like:

- vk::throwResultException( result, "vmaCreateBuffer" );
+ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" );

Add detail:: namespace to throwResultException
@past-due past-due merged commit 65a3519 into Warzone2100:master Aug 29, 2023
36 checks passed
@heirecka heirecka deleted the vulkan-add-detail-namespace branch September 19, 2023 13:25
@past-due past-due mentioned this pull request Oct 4, 2023
@past-due past-due added this to the 4.4.0-beta1 milestone Oct 11, 2023
@kloczek
Copy link

kloczek commented Nov 3, 2023

Is it possible to release new version because this commit? 🤔

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