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

Update GLFW 3.3 source code (2019/11/25) #261

Merged
merged 1 commit into from
Nov 25, 2019
Merged

Update GLFW 3.3 source code (2019/11/25) #261

merged 1 commit into from
Nov 25, 2019

Conversation

pchampio
Copy link
Contributor

fixes: #260

@@ -816,7 +815,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
[window->ns.object setLevel:NSMainMenuWindowLevel + 1];
else
{
[window->ns.object center];
[(NSWindow*) window->ns.object center];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The line that was causing the warning.

@hajimehoshi
Copy link
Member

This change includes not only suppressing the warnings but also other fixes. IMHO only suppressing the warning should be fine, but perhaps do you want to track GLFW version with GLFW_C_REVISION.txt?

@pchampio
Copy link
Contributor Author

No I just want to keep go-gl/glfw/v3.3 updated with glfw/stable-3.3.

@hajimehoshi
Copy link
Member

No I just want to keep go-gl/glfw/v3.3 updated with glfw/stable-3.3.

This is what I meant :-)

So you don't want to cherry-pick a specific change, right? As 3.4 is still unstable, I think cherry-picking an obvious change would make sense. What do you think?

@pchampio
Copy link
Contributor Author

Sorry, I got confused. I did not get that cherry-picking will mean the commit id in GLFW_C_REVISION.txt will diverge.

I really think that the commit id in GLFW_C_REVISION.txt should exactly reflect what's version of glfw we use.
For maintenance it is much more easier, one can read the commit history of glfw and know if his issue/warning is resolved in glfw.

3.4 isn't stable, and we aren't using code from 3.4. The question of potential cherry-picking from 3.4 is not relevant for now.

@pwaller pwaller changed the title udpate GLFW source code Update GLFW 3.3 source code (2019/11/25) Nov 25, 2019
@pwaller
Copy link
Member

pwaller commented Nov 25, 2019

I agree with @pchampio and don't see why we shouldn't bring in all of the fixes on the stable branch, for now.

Perhaps if we take option (B) in my tagging straw man proposals, then we could update go-gl/glfw@master to the 3.3 stable branch as frequently as someone requests it. Users who desire a specific tested version of the go bindings can pin a specific go-gl/glfw hash, or use go mod edit -replace=... to use a specific version of glfw if they cared to.

@pwaller pwaller merged commit 12ad95a into go-gl:master Nov 25, 2019
@hajimehoshi
Copy link
Member

Ah, I was misunderstanding. I didn't know there was 3.3-stable branch. Then that makes sense :-)

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.

Warnings on macOS
3 participants