Skip to content

a workaround to fix black screen on macOS 10.14 #19090

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 16, 2018
Merged

a workaround to fix black screen on macOS 10.14 #19090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cocos/platform/CCGLView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ class CC_DLL GLView : public Ref

#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
virtual id getCocoaWindow() = 0;
virtual id getNSGLContext() = 0; // stevetranby: added
#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) */

/**
Expand Down
1 change: 1 addition & 0 deletions cocos/platform/desktop/CCGLViewImpl-desktop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class CC_DLL GLViewImpl : public GLView

#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
id getCocoaWindow() override { return glfwGetCocoaWindow(_mainWindow); }
id getNSGLContext() override { return glfwGetNSGLContext(_mainWindow); } // stevetranby: added
#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)

protected:
Expand Down
14 changes: 12 additions & 2 deletions cocos/platform/mac/CCApplication-mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,21 @@ static long getCurrentMillSecond()

// Retain glview to avoid glview being released in the while loop
glview->retain();


unsigned int ctx_updated_count = 0;

while (!glview->windowShouldClose())
{
lastTime = getCurrentMillSecond();


// hack to fix issue #19080, black screen on macOS 10.14
// stevetranby: look into doing this outside loop to get rid of condition test per frame
if(ctx_updated_count < 2) {
ctx_updated_count++;
NSOpenGLContext* ctx = (NSOpenGLContext*)glview->getNSGLContext();
[ctx update];
}

Copy link
Contributor

@minggo minggo Oct 16, 2018

Choose a reason for hiding this comment

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

It is better that these codes only run on macOS 10.14 + Xcode 10.

Copy link
Contributor Author

@drelaptop drelaptop Nov 16, 2018

Choose a reason for hiding this comment

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

this code block be executed only in the first time of main loop, for a fixed little time, not executed every frame. and add version check will make the main loop code looks more complex , so I think it's ok without version check.

director->mainLoop();
glview->pollEvents();

Expand Down