asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Enabled code that requests an OpenGL 3 context.

Browse source
This commit is contained in:
BastiaanOlij 2017-01-04 23:58:20 +11:00
parent 55d425807f
commit 5e717ed8a3
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -12,7 +12,7 @@ os:
env: env:
#- GODOT_TARGET=iphone #- GODOT_TARGET=iphone
#- GODOT_TARGET=osx - GODOT_TARGET=osx
- GODOT_TARGET=x11 - GODOT_TARGET=x11
#- GODOT_TARGET=android #- GODOT_TARGET=android
- GODOT_TARGET=windows - GODOT_TARGET=windows

10
platform/osx/os_osx.mm
View file

@ -987,13 +987,11 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
window_size.width = p_desired.width; window_size.width = p_desired.width;
window_size.height = p_desired.height; window_size.height = p_desired.height;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6 && display_scale>1) { if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6 && display_scale>1) {
[window_view setWantsBestResolutionOpenGLSurface:YES]; [window_view setWantsBestResolutionOpenGLSurface:YES];
//if (current_videomode.resizable) //if (current_videomode.resizable)
[window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; [window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
} }
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
// [window_object setTitle:[NSString stringWithUTF8String:"GodotEnginies"]]; // [window_object setTitle:[NSString stringWithUTF8String:"GodotEnginies"]];
[window_object setContentView:window_view]; [window_object setContentView:window_view];
@ -1001,10 +999,8 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
[window_object setAcceptsMouseMovedEvents:YES]; [window_object setAcceptsMouseMovedEvents:YES];
[window_object center]; [window_object center];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
[window_object setRestorable:NO]; [window_object setRestorable:NO];
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
unsigned int attributeCount = 0; unsigned int attributeCount = 0;
@ -1023,10 +1019,8 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
ADD_ATTR(NSOpenGLPFADoubleBuffer); ADD_ATTR(NSOpenGLPFADoubleBuffer);
ADD_ATTR(NSOpenGLPFAClosestPolicy); ADD_ATTR(NSOpenGLPFAClosestPolicy);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 // we now need OpenGL 3 or better, maybe even change this to 3_3Core ?
if (false/* use gl3*/) ADD_ATTR2(NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core);
ADD_ATTR2(NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core);
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
ADD_ATTR2(NSOpenGLPFAColorSize, colorBits); ADD_ATTR2(NSOpenGLPFAColorSize, colorBits);