From d6ad1b79b97974ad3e3bd2a1b2c7474f0dd797b0 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Mon, 2 May 2022 21:15:28 +0200 Subject: Fix crash when destroying OpenGL views that haven't been realized --- test/meson.build | 3 ++- test/test_gl_free_unrealized.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 test/test_gl_free_unrealized.c (limited to 'test') diff --git a/test/meson.build b/test/meson.build index d8b27a9..e16e818 100644 --- a/test/meson.build +++ b/test/meson.build @@ -65,7 +65,8 @@ cairo_tests = [ gl_tests = [ 'gl', - 'gl_hints' + 'gl_free_unrealized', + 'gl_hints', ] vulkan_tests = [ diff --git a/test/test_gl_free_unrealized.c b/test/test_gl_free_unrealized.c new file mode 100644 index 0000000..c4d3fcd --- /dev/null +++ b/test/test_gl_free_unrealized.c @@ -0,0 +1,61 @@ +// Copyright 2022 David Robillard +// SPDX-License-Identifier: ISC + +/* + Tests that deleting an unrealized view works properly. + + This was a crash bug with OpenGL backends. +*/ + +#undef NDEBUG + +#include "test_utils.h" + +#include "pugl/gl.h" +#include "pugl/pugl.h" + +#include +#include +#include + +typedef struct { + PuglWorld* world; + PuglView* view; + PuglTestOptions opts; +} PuglTest; + +static PuglStatus +onEvent(PuglView* const view, const PuglEvent* const event) +{ + PuglTest* const test = (PuglTest*)puglGetHandle(view); + + if (test->opts.verbose) { + printEvent(event, "Event: ", true); + } + + return PUGL_SUCCESS; +} + +int +main(int argc, char** argv) +{ + PuglTest test = { + puglNewWorld(PUGL_PROGRAM, 0), NULL, puglParseTestOptions(&argc, &argv)}; + + // Set up view + test.view = puglNewView(test.world); + puglSetClassName(test.world, "Pugl Test"); + puglSetWindowTitle(test.view, "Pugl Free View Test"); + puglSetBackend(test.view, puglGlBackend()); + puglSetHandle(test.view, &test); + puglSetEventFunc(test.view, onEvent); + puglSetDefaultSize(test.view, 512, 512); + + assert(!puglGetVisible(test.view)); + + // Tear everything down without ever realizing the view + puglFreeView(test.view); + puglFreeWorld(test.world); + + return 0; +} -- cgit v1.2.1