[Vulkan] Restore parts of #33783 and #32809 missing after rebase. #34307
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bruvzg
force-pushed
the
macos_rebase_fixes
branch
from
bf3ad99
to
79d1002
Compare
akien-mga
approved these changes
Dec 12, 2019
|
Thanks! |
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Feb 11, 2020
[Vulkan] Restore parts of godotengine#33783 and godotengine#32809 missing after rebase.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#33783, OpenGL vsync changes were not rebased (OpenGL code was moved to the separate file before).
#32809, OpenGL specific call was left without driver check ifs.
Also, removes "werror=yes" from macOS Travis build, there are still Vulkan specific warnings.