mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-15 14:08:42 +00:00
Changed: Minor changes
This commit is contained in:
parent
e1eea14dcb
commit
639dfa4a1e
4 changed files with 12 additions and 12 deletions
|
@ -1758,14 +1758,14 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle)
|
|||
#elif defined(NL_OS_MAC)
|
||||
|
||||
// leave fullscreen mode, enter windowed mode
|
||||
if(windowStyle == EWSWindowed && [containerView() isInFullScreenMode])
|
||||
if (windowStyle == EWSWindowed && [containerView() isInFullScreenMode])
|
||||
{
|
||||
// disable manual setting of back buffer size, cocoa handles this
|
||||
// automatically as soon as the view gets resized
|
||||
CGLError error = CGLDisable((CGLContextObj)[_ctx CGLContextObj],
|
||||
kCGLCESurfaceBackingSize);
|
||||
|
||||
if(error != kCGLNoError)
|
||||
if (error != kCGLNoError)
|
||||
nlerror("cannot disable kCGLCESurfaceBackingSize (%s)",
|
||||
CGLErrorString(error));
|
||||
|
||||
|
@ -1780,13 +1780,13 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle)
|
|||
}
|
||||
|
||||
// enter fullscreen, leave windowed mode
|
||||
else if(windowStyle == EWSFullscreen && ![containerView() isInFullScreenMode])
|
||||
else if (windowStyle == EWSFullscreen && ![containerView() isInFullScreenMode])
|
||||
{
|
||||
// enable manual back buffer size for mode setting in fullscreen
|
||||
CGLError error = CGLEnable((CGLContextObj)[_ctx CGLContextObj],
|
||||
kCGLCESurfaceBackingSize);
|
||||
|
||||
if(error != kCGLNoError)
|
||||
if (error != kCGLNoError)
|
||||
nlerror("cannot enable kCGLCESurfaceBackingSize (%s)",
|
||||
CGLErrorString(error));
|
||||
|
||||
|
|
|
@ -31,8 +31,7 @@ static void windowDidMove(NSWindow* window, CDriverGL* driver)
|
|||
driver->_WindowX = windowRect.origin.x;
|
||||
|
||||
// map y from cocoa to NeL coordinates before setting in driver
|
||||
driver->_WindowY =
|
||||
screenRect.size.height - windowRect.size.height - windowRect.origin.y;
|
||||
driver->_WindowY = screenRect.size.height - windowRect.size.height - windowRect.origin.y;
|
||||
}
|
||||
|
||||
@implementation CocoaWindowDelegate
|
||||
|
|
|
@ -298,7 +298,8 @@ void CRGBA::modulateColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, ui
|
|||
uint64 blank = 0;
|
||||
/// well, this could be further optimized when stride is 4
|
||||
if (dup == 1)
|
||||
{ __asm
|
||||
{
|
||||
__asm
|
||||
{
|
||||
push ebp
|
||||
movq mm2, blank
|
||||
|
|
|
@ -213,11 +213,11 @@ void connectionRestoreVideoMode ()
|
|||
(ClientCfg.Width != mode.Width) ||
|
||||
(ClientCfg.Height != mode.Height)))
|
||||
{
|
||||
mode.Windowed = ClientCfg.Windowed;
|
||||
mode.Depth = uint8(ClientCfg.Depth);
|
||||
mode.Width = ClientCfg.Width;
|
||||
mode.Height = ClientCfg.Height;
|
||||
mode.Frequency= ClientCfg.Frequency;
|
||||
mode.Windowed = ClientCfg.Windowed;
|
||||
mode.Depth = uint8(ClientCfg.Depth);
|
||||
mode.Width = ClientCfg.Width;
|
||||
mode.Height = ClientCfg.Height;
|
||||
mode.Frequency = ClientCfg.Frequency;
|
||||
setVideoMode(mode);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue