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

Bring over non-Vulkan changes from Vulkan branch #8627

Merged
merged 6 commits into from
Mar 6, 2016

Conversation

unknownbrackets
Copy link
Collaborator

These changes are all from #8601, but have no dependency on Vulkan. I think it's better to get them merged first, and it'll reduce the number of changes in that pull too.

I can rebase vulkan after this is merged, there will be some minor conflicts (I squashed a couple fixes like in dataconv), just let me know if you want me to / when you don't have anything working.

-[Unknown]

@hrydgard
Copy link
Owner

hrydgard commented Mar 6, 2016

Yeah, I've been meaning to do this, nice. I'll rebase Vulkan myself.

hrydgard added a commit that referenced this pull request Mar 6, 2016
Bring over non-Vulkan changes from Vulkan branch
@hrydgard hrydgard merged commit 2e532e5 into hrydgard:master Mar 6, 2016
@unknownbrackets unknownbrackets deleted the vk-distance branch March 6, 2016 20:52
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.

2 participants