joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

gpu/headless: remove macOS context preparation no longer necessary

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-06-11 09:48:25 +02:00
parent 39eeaaff94
commit 200957f924
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpu/headless/headless_darwin.go
-6
View File
@@ -16,13 +16,11 @@ __attribute__ ((visibility ("hidden"))) CFTypeRef gio_headless_newContext(void);
__attribute__ ((visibility ("hidden"))) void gio_headless_releaseContext(CFTypeRef ctxRef); __attribute__ ((visibility ("hidden"))) void gio_headless_releaseContext(CFTypeRef ctxRef);
__attribute__ ((visibility ("hidden"))) void gio_headless_clearCurrentContext(CFTypeRef ctxRef); __attribute__ ((visibility ("hidden"))) void gio_headless_clearCurrentContext(CFTypeRef ctxRef);
__attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef); __attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef);
__attribute__ ((visibility ("hidden"))) void gio_headless_prepareContext(CFTypeRef ctxRef);
*/ */
import "C" import "C"
type nsContext struct { type nsContext struct {
ctx C.CFTypeRef ctx C.CFTypeRef
prepared bool
} }
func newGLContext() (context, error) { func newGLContext() (context, error) {
@@ -36,10 +34,6 @@ func (c *nsContext) API() gpu.API {
func (c *nsContext) MakeCurrent() error { func (c *nsContext) MakeCurrent() error {
C.gio_headless_makeCurrentContext(c.ctx) C.gio_headless_makeCurrentContext(c.ctx)
if !c.prepared {
C.gio_headless_prepareContext(c.ctx)
c.prepared = true
}
return nil return nil
} }
gpu/headless/headless_ios.m
-3
View File
@@ -27,6 +27,3 @@ void gio_headless_makeCurrentContext(CFTypeRef ctxRef) {
EAGLContext *ctx = (__bridge EAGLContext *)ctxRef; EAGLContext *ctx = (__bridge EAGLContext *)ctxRef;
[EAGLContext setCurrentContext:ctx]; [EAGLContext setCurrentContext:ctx];
} }
void gio_headless_prepareContext(CFTypeRef ctxRef) {
}
gpu/headless/headless_macos.m
-8
View File
@@ -43,11 +43,3 @@ void gio_headless_makeCurrentContext(CFTypeRef ctxRef) {
[ctx makeCurrentContext]; [ctx makeCurrentContext];
CGLLockContext([ctx CGLContextObj]); CGLLockContext([ctx CGLContextObj]);
} }
void gio_headless_prepareContext(CFTypeRef ctxRef) {
// Bind a default VBA to emulate OpenGL ES 2.
GLuint defVBA;
glGenVertexArrays(1, &defVBA);
glBindVertexArray(defVBA);
glEnable(GL_FRAMEBUFFER_SRGB);
}