actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decouple <cstddef>

Browse Source
This commit is contained in:
Martin Natano
2023-04-20 11:21:29 +02:00
parent 093675cdc3
commit 78fb2e9fc3
171 changed files with 2012 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm
+72 -70
View File
@@ -6,6 +6,8 @@
#import "RageDisplay_OGL_Helpers.h"
#import "arch/ArchHooks/ArchHooks.h"
#include <cstddef>
#import <Cocoa/Cocoa.h>
#import <OpenGL/OpenGL.h>
#import <OpenGL/gl.h>
@@ -30,7 +32,7 @@ class AutoreleasePool
AutoreleasePool( const AutoreleasePool& );
AutoreleasePool &operator=( const AutoreleasePool& );
NSAutoreleasePool *m_Pool;
public:
AutoreleasePool() { m_Pool = [[NSAutoreleasePool alloc] init]; }
~AutoreleasePool() { [m_Pool release]; }
@@ -78,7 +80,7 @@ public:
{
id window = [aNotification object];
NSSize size = [NSWindow contentRectForFrameRect:[window frame] styleMask:g_iStyleMask].size;
LockMut( g_ResizeLock );
g_bResized = true;
g_iWidth = int( size.width );
@@ -92,7 +94,7 @@ public:
styleMask:g_iStyleMask
backing:NSBackingStoreBuffered
defer:YES];
[m_Window setExcludedFromWindowsMenu:YES];
[m_Window setReleasedWhenClosed:NO];
[m_Window setDelegate:static_cast<id<NSWindowDelegate> >(self)];
@@ -102,16 +104,16 @@ public:
{
[m_Window setDelegate:nil];
[m_Window close];
[m_Window release];
[m_Window release];
}
- (void) setParams:(NSValue *)params
{
const VideoModeParams &p = *(const VideoModeParams *)[params pointerValue];
NSRect contentRect = { { 0, 0 }, { static_cast<CGFloat>(p.width), static_cast<CGFloat>(p.height) } };
NSRect contentRect = { { 0, 0 }, { static_cast<CGFloat>(p.width), static_cast<CGFloat>(p.height) } };
[m_Window setContentSize:contentRect.size];
[m_Window setTitle:[NSString stringWithUTF8String:p.sWindowTitle.c_str()]];
[m_Window setTitle:[NSString stringWithUTF8String:p.sWindowTitle.c_str()]];
[m_Window center];
[m_Window makeKeyAndOrderFront:nil];
}
@@ -145,7 +147,7 @@ static NSOpenGLContext *CreateOGLContext( GLContextType type, int iColorSize, in
NSOpenGLPixelFormatAttribute(0) // Must be at the end.
};
const int n = 9; // The first noncommon index.
switch( type )
{
case WINDOWED:
@@ -163,22 +165,22 @@ static NSOpenGLContext *CreateOGLContext( GLContextType type, int iColorSize, in
attrs[n+1] = NSOpenGLPFAPixelBuffer;
break;
}
NSOpenGLPixelFormat *pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
if( !pixelFormat )
return nil;
NSOpenGLContext *context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:share];
bShared = share && context;
if( !context )
context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil];
[pixelFormat release];
return context;
}
}
class RenderTarget_MacOSX : public RenderTarget
@@ -190,7 +192,7 @@ public:
uintptr_t GetTexture() const { return static_cast<uintptr_t>(m_iTexHandle); }
void StartRenderingTo();
void FinishRenderingTo();
private:
NSOpenGLContext *m_ShareContext, *m_OldContext, *m_PBufferContext;
GLuint m_iTexHandle;
@@ -220,7 +222,7 @@ void RenderTarget_MacOSX::Create( const RenderTargetParam &param, int &iTextureW
POOL;
m_iWidth = param.iWidth;
m_iHeight = param.iHeight;
// PBuffer needs to be a power of 2.
int iTextureWidth = power_of_two( param.iWidth );
int iTextureHeight = power_of_two( param.iHeight );
@@ -233,7 +235,7 @@ void RenderTarget_MacOSX::Create( const RenderTargetParam &param, int &iTextureW
pixelsWide:iTextureWidth
pixelsHigh:iTextureHeight];
DEBUG_ASSERT( PBuffer );
// Create an OGL context.
bool bShared = false;
m_PBufferContext = CreateOGLContext( PIXEL_BUFFER, 24, param.bWithAlpha? 8:0, param.bWithDepthBuffer? 16:0, m_ShareContext, bShared );
@@ -242,22 +244,22 @@ void RenderTarget_MacOSX::Create( const RenderTargetParam &param, int &iTextureW
[m_PBufferContext setPixelBuffer:PBuffer cubeMapFace:0 mipMapLevel:0
currentVirtualScreen:[m_ShareContext currentVirtualScreen]];
[PBuffer release]; // XXX: Hopefully this is retained by the PBufferContext.
glGenTextures( 1, &m_iTexHandle );
glBindTexture( GL_TEXTURE_2D, m_iTexHandle );
while( glGetError() != GL_NO_ERROR )
;
iTextureWidthOut = iTextureWidth;
iTextureHeightOut = iTextureHeight;
glTexImage2D( GL_TEXTURE_2D, 0, param.bWithAlpha? GL_RGBA8:GL_RGB8,
iTextureWidth, iTextureHeight, 0, param.bWithAlpha? GL_RGBA:GL_RGB,
GL_UNSIGNED_BYTE, nil);
GLenum error = glGetError();
ASSERT_M(error == GL_NO_ERROR, RageDisplay_Legacy_Helpers::GLToString(error));
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
@@ -276,17 +278,17 @@ void RenderTarget_MacOSX::FinishRenderingTo()
{
DEBUG_ASSERT( m_OldContext );
glBindTexture( GL_TEXTURE_2D, m_iTexHandle );
while( glGetError() != GL_NO_ERROR )
;
glCopyTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 0, 0, m_iWidth, m_iHeight );
GLenum error = glGetError();
ASSERT_M( error == GL_NO_ERROR, RageDisplay_Legacy_Helpers::GLToString(error) );
glBindTexture( GL_TEXTURE_2D, 0 );
[m_OldContext makeCurrentContext];
m_OldContext = nil;
}
@@ -297,7 +299,7 @@ LowLevelWindow_MacOSX::LowLevelWindow_MacOSX() : m_Context(nil), m_BGContext(nil
POOL;
m_WindowDelegate = [[SMWindowDelegate alloc] init];
[m_WindowDelegate performSelectorOnMainThread:@selector(setupWindow) withObject:nil waitUntilDone:YES];
m_CurrentParams.windowed = true; // We are essentially windowed to begin with.
SetActualParamsFromMode( CGDisplayCurrentMode(kCGDirectMainDisplay) );
dispatch_sync(dispatch_get_main_queue(), ^{
@@ -309,7 +311,7 @@ LowLevelWindow_MacOSX::~LowLevelWindow_MacOSX()
{
POOL;
ShutDownFullScreen();
[m_Context clearDrawable];
[m_Context release];
[m_BGContext clearDrawable];
@@ -326,7 +328,7 @@ void *LowLevelWindow_MacOSX::GetProcAddress( RString s )
const uint32_t count = _dyld_image_count();
NSSymbol symbol = nil;
const uint32_t options = NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR;
for( uint32_t i = 0; i < count && !symbol; ++i )
symbol = NSLookupSymbolInImage( _dyld_get_image_header(i), symbolName, options );
return symbol ? NSAddressOfSymbol( symbol ) : nil;
@@ -341,29 +343,29 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
m_CurrentParams.interlaced = p.interlaced;
m_CurrentParams.PAL = p.PAL;
m_CurrentParams.fDisplayAspectRatio = p.fDisplayAspectRatio;
#define X(x) p.x != m_CurrentParams.x
const bool bRebuildContext = X(bpp) || X(windowed) || !m_Context;
const bool bChangeMode = X(width) || X(height) || X(rate) || bRebuildContext;
const bool bChangeVsync = X(vsync) || bRebuildContext;
#undef X
if( !bChangeMode && !bChangeVsync )
return RString();
POOL;
newDeviceOut = false;
ASSERT( p.bpp == 16 || p.bpp == 32 );
// If we don't have focus, we cannot be full screen.
if( p.windowed || !HOOKS->AppHasFocus() )
{
{
if( bRebuildContext )
{
bool bShared;
NSOpenGLContext *newContext = CreateOGLContext( WINDOWED, p.bpp == 16? 16:24, p.bpp == 16? 1:8, 16, m_Context, bShared );
if( !newContext )
return "Failed to create OGL context.";
ShutDownFullScreen();
@@ -374,14 +376,14 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
[m_BGContext release];
m_BGContext = nil;
m_BGContext = CreateOGLContext( WINDOWED, p.bpp == 16? 16:24, p.bpp == 16? 1:8, 16, m_Context, bShared );
if( m_BGContext && !bShared )
{
[m_BGContext release];
m_BGContext = nil;
}
}
[m_WindowDelegate performSelectorOnMainThread:@selector(setParams:) withObject:[NSValue valueWithPointer:&p] waitUntilDone:YES];
dispatch_sync(dispatch_get_main_queue(), ^{
[m_Context setView:[((SMWindowDelegate *)m_WindowDelegate)->m_Window contentView]];
@@ -397,7 +399,7 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
if( bChangeMode )
{
int result = ChangeDisplayMode( p );
if( result )
return ssprintf( "Failed to switch to full screen:%d x %d @ %d. Error %d.",
p.width, p.height, p.rate, result );
@@ -407,7 +409,7 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
{
bool bShared;
NSOpenGLContext *newContext = CreateOGLContext( FULL_SCREEN, p.bpp == 16? 16:24, p.bpp == 16? 1:8, 16, m_Context, bShared );
if( !newContext )
return "Failed to create full screen OGL context.";
[m_Context clearDrawable];
@@ -417,7 +419,7 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
m_CurrentParams.bpp = p.bpp;
[m_BGContext release];
m_BGContext = CreateOGLContext( FULL_SCREEN, p.bpp == 16? 16:24, p.bpp == 16? 1:8, 16, m_Context, bShared );
if( m_BGContext && !bShared )
{
[m_BGContext release];
@@ -429,14 +431,14 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new
[m_Context update];
});
[m_Context makeCurrentContext];
if( bChangeVsync )
{
GLint swap = p.vsync ? 1 : 0;
[m_Context setValues:&swap forParameter:NSOpenGLCPSwapInterval];
m_CurrentParams.vsync = p.vsync;
}
return RString();
}
@@ -445,21 +447,21 @@ void LowLevelWindow_MacOSX::ShutDownFullScreen()
if( m_CurrentParams.windowed )
return;
ASSERT( m_CurrentDisplayMode );
// Clear the front and back framebuffers before switching out of FullScreen mode.
// (This is not strictly necessary, but avoids an untidy flash of garbage.)
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
glClear( GL_COLOR_BUFFER_BIT );
[m_Context flushBuffer];
glClear( GL_COLOR_BUFFER_BIT );
[m_Context flushBuffer];
[m_Context flushBuffer];
[NSOpenGLContext clearCurrentContext];
[m_Context clearDrawable];
[m_BGContext clearDrawable];
CGDisplayErr err = CGDisplaySwitchToMode( kCGDirectMainDisplay, m_CurrentDisplayMode );
ASSERT( err == kCGErrorSuccess );
CGDisplayShowCursor( kCGDirectMainDisplay );
err = CGDisplayRelease( m_DisplayID );
@@ -471,48 +473,48 @@ void LowLevelWindow_MacOSX::ShutDownFullScreen()
}
int LowLevelWindow_MacOSX::ChangeDisplayMode( const VideoModeParams& p )
{
{
CFDictionaryRef mode = nil;
CFDictionaryRef newMode;
CGDisplayErr err;
if( !m_CurrentDisplayMode )
{
m_DisplayID = CGMainDisplayID();
if( (err = CGDisplayCapture(m_DisplayID)) != kCGErrorSuccess )
return err;
// Only hide the first time we go to full screen.
CGDisplayHideCursor( kCGDirectMainDisplay );
CGDisplayHideCursor( kCGDirectMainDisplay );
mode = CGDisplayCurrentMode( kCGDirectMainDisplay );
}
if( p.rate == REFRESH_DEFAULT )
newMode = CGDisplayBestModeForParameters( kCGDirectMainDisplay, p.bpp, p.width, p.height, nil);
else
newMode = CGDisplayBestModeForParametersAndRefreshRate( kCGDirectMainDisplay, p.bpp,
p.width, p.height, p.rate, nil);
err = CGDisplaySwitchToMode( kCGDirectMainDisplay, newMode );
if( err != kCGErrorSuccess )
return err; // We don't own mode, don't release it.
if( !m_CurrentDisplayMode )
m_CurrentDisplayMode = mode;
m_CurrentParams.windowed = false;
SetActualParamsFromMode( newMode );
return 0;
}
// http://lukassen.wordpress.com/2010/01/18/taming-snow-leopard-cgdisplaybitsperpixel-deprication/
static size_t GetDisplayBitsPerPixel( CGDirectDisplayID displayId )
static std::size_t GetDisplayBitsPerPixel( CGDirectDisplayID displayId )
{
CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId);
size_t depth = 0;
std::size_t depth = 0;
CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode);
if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
depth = 32;
@@ -523,7 +525,7 @@ static size_t GetDisplayBitsPerPixel( CGDirectDisplayID displayId )
CFRelease(pixEnc);
CGDisplayModeRelease(mode);
return depth;
}
@@ -533,7 +535,7 @@ void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode )
SInt32 rate;
bool ret = CFNumberGetValue( (CFNumberRef)CFDictionaryGetValue(mode, CFSTR("RefreshRate")),
kCFNumberSInt32Type, &rate );
if( !ret || rate == 0)
rate = 60;
m_CurrentParams.rate = rate;
@@ -552,7 +554,7 @@ void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode )
dispatch_sync(dispatch_get_main_queue(), ^{
size = [[((SMWindowDelegate *)m_WindowDelegate)->m_Window contentView] frame].size;
});
m_CurrentParams.width = int(size.width);
m_CurrentParams.height = int(size.height);
}
@@ -563,7 +565,7 @@ void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode )
static int GetIntValue( CFTypeRef r )
{
int ret;
if( !r || CFGetTypeID(r) != CFNumberGetTypeID() || !CFNumberGetValue(CFNumberRef(r), kCFNumberIntType, &ret) )
return 0;
return ret;
@@ -629,7 +631,7 @@ void LowLevelWindow_MacOSX::Update()
{
// Keep the system from sleeping or the screen saver from activating.
UpdateSystemActivity( IdleActivity );
LockMutex lock( g_ResizeLock );
if( likely(!g_bResized) )
return;
@@ -642,7 +644,7 @@ void LowLevelWindow_MacOSX::Update()
dispatch_sync(dispatch_get_main_queue(), ^{
[m_Context update];
});
DISPLAY->ResolutionChanged();
}
@@ -663,7 +665,7 @@ void LowLevelWindow_MacOSX::BeginConcurrentRendering()
/*
* (c) 2005-2006, 2008 Steve Checkoway
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -673,7 +675,7 @@ void LowLevelWindow_MacOSX::BeginConcurrentRendering()
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF