git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 13:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

example: ++gl, wgpu safety

Browse source 
Free the canvas in the reverse order of their creation.
This commit is contained in:
Hermet Park 2024-11-25 11:02:16 +09:00
parent 4010496e8b
commit ba8a764ec3
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/Example.h
View file

@ -156,6 +156,7 @@ struct Window
virtual ~Window() virtual ~Window()
{ {
delete(canvas);
delete(example); delete(example);
//Terminate the SDL //Terminate the SDL
@ -270,8 +271,6 @@ struct Window
struct SwWindow : Window struct SwWindow : Window
{ {
unique_ptr<tvg::SwCanvas> canvas = nullptr;
SwWindow(Example* example, uint32_t width, uint32_t height, uint32_t threadsCnt) : Window(tvg::CanvasEngine::Sw, example, width, height, threadsCnt) SwWindow(Example* example, uint32_t width, uint32_t height, uint32_t threadsCnt) : Window(tvg::CanvasEngine::Sw, example, width, height, threadsCnt)
{ {
if (!initialized) return; if (!initialized) return;
@ -279,14 +278,12 @@ struct SwWindow : Window
window = SDL_CreateWindow("ThorVG Example (Software)", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE); window = SDL_CreateWindow("ThorVG Example (Software)", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE);
//Create a Canvas //Create a Canvas
canvas = tvg::SwCanvas::gen(); canvas = tvg::SwCanvas::gen().release();
if (!canvas) { if (!canvas) {
cout << "SwCanvas is not supported. Did you enable the SwEngine?" << endl; cout << "SwCanvas is not supported. Did you enable the SwEngine?" << endl;
return; return;
} }
Window::canvas = canvas.get();
resize(); resize();
} }
@ -296,7 +293,7 @@ struct SwWindow : Window
if (!surface) return; if (!surface) return;
//Set the canvas target and draw on it. //Set the canvas target and draw on it.
verify(canvas->target((uint32_t*)surface->pixels, surface->w, surface->pitch / 4, surface->h, tvg::SwCanvas::ARGB8888)); verify(static_cast<tvg::SwCanvas*>(canvas)->target((uint32_t*)surface->pixels, surface->w, surface->pitch / 4, surface->h, tvg::SwCanvas::ARGB8888));
canvas->clear(false); canvas->clear(false);
} }
@ -315,8 +312,6 @@ struct GlWindow : Window
{ {
SDL_GLContext context; SDL_GLContext context;
unique_ptr<tvg::GlCanvas> canvas = nullptr;
GlWindow(Example* example, uint32_t width, uint32_t height, uint32_t threadsCnt) : Window(tvg::CanvasEngine::Gl, example, width, height, threadsCnt) GlWindow(Example* example, uint32_t width, uint32_t height, uint32_t threadsCnt) : Window(tvg::CanvasEngine::Gl, example, width, height, threadsCnt)
{ {
if (!initialized) return; if (!initialized) return;
@ -334,26 +329,28 @@ struct GlWindow : Window
context = SDL_GL_CreateContext(window); context = SDL_GL_CreateContext(window);
//Create a Canvas //Create a Canvas
canvas = tvg::GlCanvas::gen(); canvas = tvg::GlCanvas::gen().release();
if (!canvas) { if (!canvas) {
cout << "GlCanvas is not supported. Did you enable the GlEngine?" << endl; cout << "GlCanvas is not supported. Did you enable the GlEngine?" << endl;
return; return;
} }
Window::canvas = canvas.get();
resize(); resize();
} }
virtual ~GlWindow() virtual ~GlWindow()
{ {
//Free in the reverse order of their creation.
delete(canvas);
canvas = nullptr;
SDL_GL_DeleteContext(context); SDL_GL_DeleteContext(context);
} }
void resize() override void resize() override
{ {
//Set the canvas target and draw on it. //Set the canvas target and draw on it.
verify(canvas->target(0, width, height)); verify(static_cast<tvg::GlCanvas*>(canvas)->target(0, width, height));
} }
void refresh() override void refresh() override
@ -370,8 +367,6 @@ struct GlWindow : Window
struct WgWindow : Window struct WgWindow : Window
{ {
unique_ptr<tvg::WgCanvas> canvas = nullptr;
WGPUInstance instance; WGPUInstance instance;
WGPUSurface surface; WGPUSurface surface;
@ -425,19 +420,21 @@ struct WgWindow : Window
surface = wgpuInstanceCreateSurface(instance, &surfaceDesc); surface = wgpuInstanceCreateSurface(instance, &surfaceDesc);
//Create a Canvas //Create a Canvas
canvas = tvg::WgCanvas::gen(); canvas = tvg::WgCanvas::gen().release();
if (!canvas) { if (!canvas) {
cout << "WgCanvas is not supported. Did you enable the WgEngine?" << endl; cout << "WgCanvas is not supported. Did you enable the WgEngine?" << endl;
return; return;
} }
Window::canvas = canvas.get();
resize(); resize();
} }
virtual ~WgWindow() virtual ~WgWindow()
{ {
//Free in the reverse order of their creation.
delete(canvas);
canvas = nullptr;
wgpuSurfaceRelease(surface); wgpuSurfaceRelease(surface);
wgpuInstanceRelease(instance); wgpuInstanceRelease(instance);
} }
@ -445,7 +442,7 @@ struct WgWindow : Window
void resize() override void resize() override
{ {
//Set the canvas target and draw on it. //Set the canvas target and draw on it.
verify(canvas->target(instance, surface, width, height)); verify(static_cast<tvg::WgCanvas*>(canvas)->target(instance, surface, width, height));
} }
void refresh() override void refresh() override