[gpu] Refactor and fix OpenGL backend using Skia by dacap · Pull Request #193 · aseprite/laf

dacap · 2026-08-04T20:05:58Z

New os::GpuContext class to wrap native OpenGL context
New os::SkiaGpuContext class to wrap Skia GrDirectContext
Added os::System::makePlatformGpuContext()
Added os::Window::clientSize()
Fixed makeCurrent/swapBuffers logic
Fixed support for multiple windows
Fixed macOS support

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2026-08-04T20:10:16Z

+
+inline bool handle_toggle_gpu_key(const os::Event& ev)
+{
+  os::WindowRef w = ev.window();


warning: the variable 'w' is copy-constructed from a const reference but is only used as const reference; consider making it a const reference [performance-unnecessary-copy-initialization]

Suggested change

os::WindowRef w = ev.window();

const os::WindowRef& w = ev.window();

aseprite-bot · 2026-08-04T20:10:16Z

+
+inline bool handle_toggle_gpu_key(const os::Event& ev)
+{
+  os::WindowRef w = ev.window();


warning: variable 'w' of type 'os::WindowRef' (aka 'Refos::Window') can be declared 'const' [misc-const-correctness]

Suggested change

os::WindowRef w = ev.window();

os::WindowRef const w = ev.window();

aseprite-bot · 2026-08-04T20:10:16Z

+  GLContextGLX(::Display* display) : m_display(display) {}

-  ~GLContextGLX() { destroyGLContext(); }
+  ~GLContextGLX() { destroyContext(); }


warning: Call to virtual method 'GLContextGLX::destroyContext' during destruction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]

~GLContextGLX() { destroyContext(); } ^

Additional context

os/gl/gl_context_glx.h:23: Call to virtual method 'GLContextGLX::destroyContext' during destruction bypasses virtual dispatch

~GLContextGLX() { destroyContext(); } ^

aseprite-bot · 2026-08-04T20:10:16Z

-  bool createGLContext() override
+  bool makeContext(Window* window, GpuContext* shared) override
  {
+    auto sharedGpuContext = (shared ? (GLXContext)shared->nativeHandle() : nullptr);


warning: 'auto sharedGpuContext' can be declared as 'auto *sharedGpuContext' [readability-qualified-auto]

Suggested change

auto sharedGpuContext = (shared ? (GLXContext)shared->nativeHandle() : nullptr);

auto *sharedGpuContext = (shared ? (GLXContext)shared->nativeHandle() : nullptr);

aseprite-bot · 2026-08-04T20:10:16Z

  GLContextNSGL();
  ~GLContextNSGL();

  void setView(id view);


warning: unknown type name 'id' [clang-diagnostic-error]

void setView(id view); ^

aseprite-bot · 2026-08-04T20:10:17Z

+  virtual ~GpuContext() {}
+  virtual bool isValid() { return false; }
+
+  virtual bool makeContext(Window* window, GpuContext* shared) { return false; }


warning: parameter 'window' is unused [misc-unused-parameters]

Suggested change

virtual bool makeContext(Window* window, GpuContext* shared) { return false; }

virtual bool makeContext(Window* /*window*/, GpuContext* shared) { return false; }

aseprite-bot · 2026-08-04T20:10:17Z

+  virtual void makeCurrent(Window* window) {}
+  virtual void swapBuffers(Window* window) {}
+  virtual void flush() {}
+  virtual RenderTarget makeRenderTarget(const gfx::Size& size,


warning: parameter 'size' is unused [misc-unused-parameters]

Suggested change

virtual RenderTarget makeRenderTarget(const gfx::Size& size,

virtual RenderTarget makeRenderTarget(const gfx::Size& /*size*/,

aseprite-bot · 2026-08-04T20:10:17Z

+  virtual void swapBuffers(Window* window) {}
+  virtual void flush() {}
+  virtual RenderTarget makeRenderTarget(const gfx::Size& size,
+                                        const int scale,


warning: parameter 'scale' is unused [misc-unused-parameters]

Suggested change

const int scale,

const int /*scale*/,

aseprite-bot · 2026-08-04T20:10:17Z

+  virtual void flush() {}
+  virtual RenderTarget makeRenderTarget(const gfx::Size& size,
+                                        const int scale,
+                                        const os::ColorSpaceRef& cs)


warning: parameter 'cs' is unused [misc-unused-parameters]

Suggested change

const os::ColorSpaceRef& cs)

const os::ColorSpaceRef& /*cs*/)

aseprite-bot · 2026-08-04T20:10:17Z

  m_screenMousePos = ev.window()->pointToScreen(ev.position());
 }

+std::unique_ptr<GpuContext> SystemWin::makePlatformGpuContext()


warning: method 'makePlatformGpuContext' can be made static [readability-convert-member-functions-to-static]

Suggested change

std::unique_ptr<GpuContext> SystemWin::makePlatformGpuContext()

static std::unique_ptr<GpuContext> SystemWin::makePlatformGpuContext()

* New os::GpuContext class to wrap native OpenGL context * New os::SkiaGpuContext class to wrap Skia GrDirectContext * Added os::System::makePlatformGpuContext() * Added os::Window::clientSize() * Fixed makeCurrent/swapBuffers logic * Fixed support for multiple windows * macOS support doesn't work Related to aseprite/aseprite#960

It partially works only on Linux at the moment.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2026-08-12T22:09:14Z

-      p.color(gfx::rgba(0, 0, 0));
-      surface->drawRect(gfx::Rect(rc.x, rc.y + rc.h - h, rc.w, h), p);
+      if (m_textLog.size() >= m_maxlines) {
+        int h = m_lineHeight * newlines;


warning: variable 'h' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int h = m_lineHeight * newlines;

int const h = m_lineHeight * newlines;

aseprite-bot · 2026-08-12T22:09:14Z

+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB          0x00000001
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+
+using PFNWGLCREATECONTEXTATTRIBSARBPROC = HGLRC(WINAPI*)(HDC, HGLRC, const int*);


warning: parameter 'window' is unused [misc-unused-parameters]

Suggested change

using PFNWGLCREATECONTEXTATTRIBSARBPROC = HGLRC(WINAPI*)(HDC, HGLRC, const int*);

bool makeContext(Window* /*window*/, GpuContext* shared) override

aseprite-bot · 2026-08-12T22:09:14Z

@@ -81,22 +103,27 @@ class GLContextWGL : public GLContext {
    }


warning: parameter 'window' is unused [misc-unused-parameters]

Suggested change

}

void swapBuffers(Window* /*window*/) override

…rget() Now it's possible to create offscreen framebuffers by clients.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2026-08-12T22:40:10Z

+  virtual void swapBuffers(Window* window) {}
+  virtual void flush() {}
+
+  virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)


warning: parameter 'cs' is unused [misc-unused-parameters]

Suggested change

virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)

virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& /*cs*/)

aseprite-bot · 2026-08-12T22:40:11Z

+  virtual void swapBuffers(Window* window) {}
+  virtual void flush() {}
+
+  virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)


warning: parameter 'size' is unused [misc-unused-parameters]

Suggested change

virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)

virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& /*size*/, const os::ColorSpaceRef& cs)

aseprite-bot · 2026-08-12T22:40:11Z

+    return {};
+  }
+
+  virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)


warning: parameter 'cs' is unused [misc-unused-parameters]

Suggested change

virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)

virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& /*cs*/)

aseprite-bot · 2026-08-12T22:40:11Z

+    return {};
+  }
+
+  virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)


warning: parameter 'size' is unused [misc-unused-parameters]

Suggested change

virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)

virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& /*size*/, const os::ColorSpaceRef& cs)

* Fixed using shared OpenGL contexts with [NSOpenGLContext initWithFormat...] * NSView requires an wantsUpdateLayer/updateLayer when using GPU acceleration to call [NSOpenGLContext update]. There is still a bug/crash when we go back to CPU/raster backend after enabling the GPU acceleration.

dacap self-assigned this Aug 4, 2026

aseprite-bot reviewed Aug 4, 2026

View reviewed changes

dacap mentioned this pull request Aug 4, 2026

[gpu] Initial (relatively stable) OpenGL support for Windows and Linux aseprite/aseprite#5966

Merged

dacap added 3 commits August 11, 2026 08:50

[gpu] Link with OpenGL library (even for LAF_BACKEND=none)

dcb07c0

[glx] Fix memory leak from glXChooseVisual()

1d234f3

dacap force-pushed the gpu branch from ba8f07f to 1d234f3 Compare August 11, 2026 11:51

dacap added 2 commits August 12, 2026 18:45

[gpu] Fix allevents example when GPU is enabled

e236eec

[gpu] Add LAF_DEBUG_GPU to debug OpenGL calls with RenderDoc

8e9959a

It partially works only on Linux at the moment.

aseprite-bot reviewed Aug 12, 2026

View reviewed changes

dacap added 3 commits August 12, 2026 19:17

[gpu] Move GrDirectContext::flush() to SkiaGpuContext::flush()

68a295f

Add os::Surface::size() member function

1069d5f

[gpu] Refactor RenderTarget with GpuContext::makeOn/OffscreenRenderTa…

58faacf

…rget() Now it's possible to create offscreen framebuffers by clients.

aseprite-bot reviewed Aug 12, 2026

View reviewed changes

dacap marked this pull request as ready for review August 12, 2026 22:56

dacap merged commit 5d107ba into aseprite:beta Aug 13, 2026
12 checks passed

dacap deleted the gpu branch August 13, 2026 12:47

	os::WindowRef w = ev.window();
	const os::WindowRef& w = ev.window();

	os::WindowRef w = ev.window();
	os::WindowRef const w = ev.window();

	auto sharedGpuContext = (shared ? (GLXContext)shared->nativeHandle() : nullptr);
	auto *sharedGpuContext = (shared ? (GLXContext)shared->nativeHandle() : nullptr);

	virtual bool makeContext(Window* window, GpuContext* shared) { return false; }
	virtual bool makeContext(Window* /window/, GpuContext* shared) { return false; }

	virtual RenderTarget makeRenderTarget(const gfx::Size& size,
	virtual RenderTarget makeRenderTarget(const gfx::Size& /size/,

	const os::ColorSpaceRef& cs)
	const os::ColorSpaceRef& /cs/)

	std::unique_ptr<GpuContext> SystemWin::makePlatformGpuContext()
	static std::unique_ptr<GpuContext> SystemWin::makePlatformGpuContext()

	int h = m_lineHeight * newlines;
	int const h = m_lineHeight * newlines;

	using PFNWGLCREATECONTEXTATTRIBSARBPROC = HGLRC(WINAPI)(HDC, HGLRC, const int);
	bool makeContext(Window* /window/, GpuContext* shared) override

		@@ -81,22 +103,27 @@ class GLContextWGL : public GLContext {
		}

	virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)
	virtual SurfaceRef makeOnscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& /cs/)

	virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& cs)
	virtual SurfaceRef makeOffscreenRenderTarget(const gfx::Size& size, const os::ColorSpaceRef& /cs/)

Uh oh!

Conversation

dacap commented Aug 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dacap commented Aug 4, 2026 •

edited

Loading