renderer: code refactoring.

removed unnused return value.
This commit is contained in:
Hermet Park 2024-02-01 18:20:19 +09:00
parent 9f4a8de253
commit 6df111bc23
7 changed files with 13 additions and 20 deletions

View file

@ -280,15 +280,14 @@ bool GlRenderer::renderShape(RenderData data)
} }
bool GlRenderer::dispose(RenderData data) void GlRenderer::dispose(RenderData data)
{ {
auto sdata = static_cast<GlShape*>(data); auto sdata = static_cast<GlShape*>(data);
if (!sdata) return false; if (!sdata) return;
if (sdata->texId) glDeleteTextures(1, &sdata->texId); if (sdata->texId) glDeleteTextures(1, &sdata->texId);
delete sdata; delete sdata;
return true;
} }
static GLuint _genTexture(Surface* image) static GLuint _genTexture(Surface* image)

View file

@ -59,7 +59,7 @@ public:
bool renderShape(RenderData data) override; bool renderShape(RenderData data) override;
bool renderImage(RenderData data) override; bool renderImage(RenderData data) override;
bool postRender() override; bool postRender() override;
bool dispose(RenderData data) override;; void dispose(RenderData data) override;;
RenderRegion region(RenderData data) override; RenderRegion region(RenderData data) override;
RenderRegion viewport() override; RenderRegion viewport() override;
bool viewport(const RenderRegion& vp) override; bool viewport(const RenderRegion& vp) override;

View file

@ -63,7 +63,7 @@ struct SwTask : Task
return region; return region;
} }
virtual bool dispose() = 0; virtual void dispose() = 0;
virtual bool clip(SwRleData* target) = 0; virtual bool clip(SwRleData* target) = 0;
virtual SwRleData* rle() = 0; virtual SwRleData* rle() = 0;
@ -196,10 +196,9 @@ struct SwShapeTask : SwTask
shapeDelOutline(&shape, mpool, tid); shapeDelOutline(&shape, mpool, tid);
} }
bool dispose() override void dispose() override
{ {
shapeFree(&shape); shapeFree(&shape);
return true;
} }
}; };
@ -250,10 +249,9 @@ struct SwSceneTask : SwTask
} }
} }
bool dispose() override void dispose() override
{ {
rleFree(sceneRle); rleFree(sceneRle);
return true;
} }
}; };
@ -318,10 +316,9 @@ struct SwImageTask : SwTask
imageDelOutline(&image, mpool, tid); imageDelOutline(&image, mpool, tid);
} }
bool dispose() override void dispose() override
{ {
imageFree(&image); imageFree(&image);
return true;
} }
}; };
@ -703,17 +700,15 @@ ColorSpace SwRenderer::colorSpace()
} }
bool SwRenderer::dispose(RenderData data) void SwRenderer::dispose(RenderData data)
{ {
auto task = static_cast<SwTask*>(data); auto task = static_cast<SwTask*>(data);
if (!task) return true; if (!task) return;
task->done(); task->done();
task->dispose(); task->dispose();
if (task->pushed) task->disposed = true; if (task->pushed) task->disposed = true;
else delete(task); else delete(task);
return true;
} }

View file

@ -43,7 +43,7 @@ public:
bool renderShape(RenderData data) override; bool renderShape(RenderData data) override;
bool renderImage(RenderData data) override; bool renderImage(RenderData data) override;
bool postRender() override; bool postRender() override;
bool dispose(RenderData data) override; void dispose(RenderData data) override;
RenderRegion region(RenderData data) override; RenderRegion region(RenderData data) override;
RenderRegion viewport() override; RenderRegion viewport() override;
bool viewport(const RenderRegion& vp) override; bool viewport(const RenderRegion& vp) override;

View file

@ -286,7 +286,7 @@ public:
virtual bool renderShape(RenderData data) = 0; virtual bool renderShape(RenderData data) = 0;
virtual bool renderImage(RenderData data) = 0; virtual bool renderImage(RenderData data) = 0;
virtual bool postRender() = 0; virtual bool postRender() = 0;
virtual bool dispose(RenderData data) = 0; virtual void dispose(RenderData data) = 0;
virtual RenderRegion region(RenderData data) = 0; virtual RenderRegion region(RenderData data) = 0;
virtual RenderRegion viewport() = 0; virtual RenderRegion viewport() = 0;
virtual bool viewport(const RenderRegion& vp) = 0; virtual bool viewport(const RenderRegion& vp) = 0;

View file

@ -174,11 +174,10 @@ bool WgRenderer::postRender()
} }
bool WgRenderer::dispose(RenderData data) void WgRenderer::dispose(RenderData data)
{ {
auto renderData = (WgRenderDataPaint*)data; auto renderData = (WgRenderDataPaint*)data;
if (renderData) renderData->release(mContext); if (renderData) renderData->release(mContext);
return true;
} }

View file

@ -40,7 +40,7 @@ public:
bool renderShape(RenderData data); bool renderShape(RenderData data);
bool renderImage(RenderData data); bool renderImage(RenderData data);
bool postRender(); bool postRender();
bool dispose(RenderData data); void dispose(RenderData data);
RenderRegion region(RenderData data); RenderRegion region(RenderData data);
RenderRegion viewport(); RenderRegion viewport();
bool viewport(const RenderRegion& vp); bool viewport(const RenderRegion& vp);