joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: merge .m files with their .go counterparts

Browse Source 
The only reason for separate files is Objective-C callbacks into Go,
or when the Go side is common, yet the Objective-C side differs from
macOS to iOS.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-08-05 19:13:19 +02:00
parent 7d84e419c9
commit 2059862416
11 changed files with 194 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpu/headless/headless_darwin.go
+1 -2
View File
@@ -13,7 +13,6 @@ import (
#include <CoreFoundation/CoreFoundation.h>
__attribute__ ((visibility ("hidden"))) CFTypeRef gio_headless_newContext(void);
__attribute__ ((visibility ("hidden"))) void gio_headless_releaseContext(CFTypeRef ctxRef);
__attribute__ ((visibility ("hidden"))) void gio_headless_clearCurrentContext(CFTypeRef ctxRef);
__attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef);
*/
@@ -43,7 +42,7 @@ func (c *nsContext) ReleaseCurrent() {
func (d *nsContext) Release() {
if d.ctx != 0 {
C.gio_headless_releaseContext(d.ctx)
C.CFRelease(d.ctx)
d.ctx = 0
}
}
gpu/headless/headless_ios.m
-4
View File
@@ -7,10 +7,6 @@
#include <CoreFoundation/CoreFoundation.h>
#include "_cgo_export.h"
void gio_headless_releaseContext(CFTypeRef ctxRef) {
CFBridgingRelease(ctxRef);
}
CFTypeRef gio_headless_newContext(void) {
EAGLContext *ctx = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
if (ctx == nil) {
gpu/headless/headless_macos.m
-4
View File
@@ -10,10 +10,6 @@
#include <CoreFoundation/CoreFoundation.h>
#include "_cgo_export.h"
void gio_headless_releaseContext(CFTypeRef ctxRef) {
CFBridgingRelease(ctxRef);
}
CFTypeRef gio_headless_newContext(void) {
NSOpenGLPixelFormatAttribute attr[] = {
NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,