opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-29 02:03:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

libobs-opengl: Refactor macOS implementation

Browse Source 
Replaces macros with actual code and uses more platform-specific code.
As an added benefit this improves debugging and code navigation in
Xcode.
This commit is contained in:
PatTheMav
2023-02-16 20:56:11 +01:00
committed by Jim
parent 2f4b611fd7
commit 41a10b05fd
1 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs-opengl/gl-cocoa.m
+37 -50
View File
@@ -22,8 +22,6 @@
#import <Cocoa/Cocoa.h>
#import <AppKit/AppKit.h>
//#include "util/darray.h"
struct gl_windowinfo {
NSView *view;
NSOpenGLContext *context;
@@ -37,26 +35,9 @@ struct gl_platform {
static NSOpenGLContext *gl_context_create(NSOpenGLContext *share)
{
unsigned attrib_count = 0;
#define ADD_ATTR(x) \
{ \
attributes[attrib_count++] = (NSOpenGLPixelFormatAttribute)x; \
}
#define ADD_ATTR2(x, y) \
{ \
ADD_ATTR(x); \
ADD_ATTR(y); \
}
NSOpenGLPixelFormatAttribute attributes[40];
ADD_ATTR(NSOpenGLPFADoubleBuffer);
ADD_ATTR2(NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core);
ADD_ATTR(0);
#undef ADD_ATTR2
#undef ADD_ATTR
NSOpenGLPixelFormatAttribute attributes[] = {
NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile,
NSOpenGLProfileVersion3_2Core, 0};
NSOpenGLPixelFormat *pf;
pf = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes];
@@ -79,11 +60,9 @@ static NSOpenGLContext *gl_context_create(NSOpenGLContext *share)
return context;
}
struct gl_platform *gl_platform_create(gs_device_t *device, uint32_t adapter)
struct gl_platform *gl_platform_create(gs_device_t *device __unused,
uint32_t adapter __unused)
{
UNUSED_PARAMETER(device);
UNUSED_PARAMETER(adapter);
NSOpenGLContext *context = gl_context_create(nil);
if (!context) {
blog(LOG_ERROR, "gl_context_create failed");
@@ -92,10 +71,8 @@ struct gl_platform *gl_platform_create(gs_device_t *device, uint32_t adapter)
[context makeCurrentContext];
GLint interval = 0;
PRAGMA_WARN_PUSH
PRAGMA_WARN_DEPRECATION
[context setValues:&interval forParameter:NSOpenGLCPSwapInterval];
PRAGMA_WARN_POP
[context setValues:&interval
forParameter:NSOpenGLContextParameterSwapInterval];
const bool success = gladLoadGL() != 0;
if (!success) {
@@ -141,13 +118,14 @@ bool gl_platform_init_swapchain(struct gs_swap_chain *swap)
CGLLockContext(context_obj);
[context makeCurrentContext];
PRAGMA_WARN_PUSH
PRAGMA_WARN_DEPRECATION
#pragma clang diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
[context setView:swap->wi->view];
#pragma clang diagnostic pop
GLint interval = 0;
[context setValues:&interval
forParameter:NSOpenGLCPSwapInterval];
PRAGMA_WARN_POP
forParameter:NSOpenGLContextParameterSwapInterval];
gl_gen_framebuffers(1, &swap->wi->fbo);
gl_bind_framebuffer(GL_FRAMEBUFFER, swap->wi->fbo);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
@@ -205,10 +183,10 @@ struct gl_windowinfo *gl_windowinfo_create(const struct gs_init_data *info)
wi->view = info->window.view;
wi->view.window.colorSpace = NSColorSpace.sRGBColorSpace;
PRAGMA_WARN_PUSH
PRAGMA_WARN_DEPRECATION
#pragma clang diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
wi->view.wantsBestResolutionOpenGLSurface = YES;
PRAGMA_WARN_POP
#pragma clang diagnostic pop
return wi;
}
@@ -304,9 +282,8 @@ void device_load_swapchain(gs_device_t *device, gs_swapchain_t *swap)
}
}
bool device_is_present_ready(gs_device_t *device)
bool device_is_present_ready(gs_device_t *device __unused)
{
UNUSED_PARAMETER(device);
return true;
}
@@ -333,11 +310,8 @@ void device_present(gs_device_t *device)
[device->plat->context makeCurrentContext];
}
bool device_is_monitor_hdr(gs_device_t *device, void *monitor)
bool device_is_monitor_hdr(gs_device_t *device __unused, void *monitor __unused)
{
UNUSED_PARAMETER(device);
UNUSED_PARAMETER(monitor);
return false;
}
@@ -357,10 +331,17 @@ gs_texture_t *device_texture_create_from_iosurface(gs_device_t *device,
struct gs_texture_2d *tex = bzalloc(sizeof(struct gs_texture_2d));
OSType pf = IOSurfaceGetPixelFormat(ref);
const bool l10r = pf == 'l10r';
FourCharCode l10r_code = 0;
l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
FourCharCode bgra_code = 0;
bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
const bool l10r = pf == l10r_code;
if (pf == 0)
blog(LOG_ERROR, "Invalid IOSurface Buffer");
else if ((pf != 'BGRA') && !l10r)
else if ((pf != bgra_code) && !l10r)
blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf,
pf >> 24, pf >> 16, pf >> 8, pf);
@@ -379,8 +360,8 @@ gs_texture_t *device_texture_create_from_iosurface(gs_device_t *device,
tex->base.is_dynamic = false;
tex->base.is_render_target = false;
tex->base.gen_mipmaps = false;
tex->width = IOSurfaceGetWidth(ref);
tex->height = IOSurfaceGetHeight(ref);
tex->width = (uint32_t)IOSurfaceGetWidth(ref);
tex->height = (uint32_t)IOSurfaceGetHeight(ref);
if (!gl_gen_textures(1, &tex->base.texture))
goto fail;
@@ -439,19 +420,25 @@ bool gs_texture_rebind_iosurface(gs_texture_t *texture, void *iosurf)
if (!iosurf)
return false;
FourCharCode l10r_code = 0;
l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
FourCharCode bgra_code = 0;
bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
struct gs_texture_2d *tex = (struct gs_texture_2d *)texture;
IOSurfaceRef ref = (IOSurfaceRef)iosurf;
OSType pf = IOSurfaceGetPixelFormat(ref);
if (pf == 0) {
blog(LOG_ERROR, "Invalid IOSurface buffer");
} else if ((pf != 'BGRA') && (pf != 'l10r')) {
} else if ((pf != bgra_code) && (pf != l10r_code)) {
blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf,
pf >> 24, pf >> 16, pf >> 8, pf);
}
tex->width = IOSurfaceGetWidth(ref);
tex->height = IOSurfaceGetHeight(ref);
tex->width = (uint32_t)IOSurfaceGetWidth(ref);
tex->height = (uint32_t)IOSurfaceGetHeight(ref);
if (!gl_bind_texture(tex->base.gl_target, tex->base.texture))
return false;