From 200957f92455f425923bf9265917896838ea1733 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 11 Jun 2021 09:48:25 +0200 Subject: [PATCH] gpu/headless: remove macOS context preparation no longer necessary Signed-off-by: Elias Naur --- gpu/headless/headless_darwin.go | 8 +------- gpu/headless/headless_ios.m | 3 --- gpu/headless/headless_macos.m | 8 -------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/gpu/headless/headless_darwin.go b/gpu/headless/headless_darwin.go index 106c2f1a..fedc68b4 100644 --- a/gpu/headless/headless_darwin.go +++ b/gpu/headless/headless_darwin.go @@ -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_clearCurrentContext(CFTypeRef ctxRef); __attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef); -__attribute__ ((visibility ("hidden"))) void gio_headless_prepareContext(CFTypeRef ctxRef); */ import "C" type nsContext struct { - ctx C.CFTypeRef - prepared bool + ctx C.CFTypeRef } func newGLContext() (context, error) { @@ -36,10 +34,6 @@ func (c *nsContext) API() gpu.API { func (c *nsContext) MakeCurrent() error { C.gio_headless_makeCurrentContext(c.ctx) - if !c.prepared { - C.gio_headless_prepareContext(c.ctx) - c.prepared = true - } return nil } diff --git a/gpu/headless/headless_ios.m b/gpu/headless/headless_ios.m index fd72d254..4de4e65c 100644 --- a/gpu/headless/headless_ios.m +++ b/gpu/headless/headless_ios.m @@ -27,6 +27,3 @@ void gio_headless_makeCurrentContext(CFTypeRef ctxRef) { EAGLContext *ctx = (__bridge EAGLContext *)ctxRef; [EAGLContext setCurrentContext:ctx]; } - -void gio_headless_prepareContext(CFTypeRef ctxRef) { -} diff --git a/gpu/headless/headless_macos.m b/gpu/headless/headless_macos.m index 46deb375..ce5dca7f 100644 --- a/gpu/headless/headless_macos.m +++ b/gpu/headless/headless_macos.m @@ -43,11 +43,3 @@ void gio_headless_makeCurrentContext(CFTypeRef ctxRef) { [ctx makeCurrentContext]; 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); -}