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

[GL3+] add support for currentGLContext for macOS #216

Merged

Conversation

srmainwaring
Copy link
Contributor

This PR adds support for the parameter 'currentGLContext' on macOS for the GL3+ RS

There are also a couple of minor changes to help with debugging and multi-threaded applications:

  • Initialise pointers to nil in CocoaWindow::create
  • Add checks to ensure that attempts to create new Cocoa windows or set a view on an OpenGL context only occur on the main thread

I've applied the PR to v2-1 as there are difficulties compiling master on macOS at present. Ideally this change would be present on master and backported to v2-1 and v2-2. It is a pre-requisite for macOS support in the downstream project ignition-gui and ignition-gazebo.

- Support the parameter 'currentGLContext' on macOS for the GL3+ RS
- Initialise pointers to nil in CocoaWindow::create
- Add checks to ensure that attempts to create new Cocoa windows or set a view on an OpenGL context only occur on the main thread

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
@darksylinc
Copy link
Member

darksylinc commented Aug 22, 2021

Hi!

Thanks for the PR!

I've fixed all build errors I could see when using the XCode generator on the v2-2 branch (except for MorphAnimations sample. Just comment that sample from CMakeLists)

I haven't merged those changes into master yet, but if you're in a rush hopefully master should merge with no conflicts with v2-2

Edit: Merging bb2aae5 into master should be fine, but latest commits will cause lots of conflicts.

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