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

gl_engine: fix some typo inside GlRenderer

Browse source 
* Fix a typo error when prepare blit task
* Prevent repeated texture generation during task preparation
This commit is contained in:
RuiwenTang 2024-04-15 13:13:15 +08:00 • committed by Sergii Liebodkin
parent d6b923fe5c
commit bb793a2762
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/gl_engine/tvgGlRenderTask.cpp
View file

@ -236,4 +236,4 @@ void GlDrawBlitTask::run()
GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, getTargetFbo())); GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, getTargetFbo()));
GlRenderTask::run(); GlRenderTask::run();
} }

16
src/renderer/gl_engine/tvgGlRenderer.cpp
View file

@ -329,11 +329,13 @@ RenderData GlRenderer::prepare(Surface* image, const RenderMesh* mesh, RenderDat
sdata->viewHt = static_cast<float>(surface.h); sdata->viewHt = static_cast<float>(surface.h);
sdata->updateFlag = flags; sdata->updateFlag = flags;
sdata->texId = _genTexture(image); if (sdata->texId == 0) {
sdata->opacity = opacity; sdata->texId = _genTexture(image);
sdata->texColorSpace = image->cs; sdata->opacity = opacity;
sdata->texFlipY = (mesh && mesh->triangleCnt) ? 0 : 1; sdata->texColorSpace = image->cs;
sdata->geometry = make_unique<GlGeometry>(); sdata->texFlipY = (mesh && mesh->triangleCnt) ? 0 : 1;
sdata->geometry = make_unique<GlGeometry>();
}
sdata->geometry->updateTransform(transform, sdata->viewWd, sdata->viewHt); sdata->geometry->updateTransform(transform, sdata->viewWd, sdata->viewHt);
sdata->geometry->setViewport(RenderRegion{ sdata->geometry->setViewport(RenderRegion{
@ -706,7 +708,7 @@ void GlRenderer::prepareBlitTask(GlBlitTask* task)
void GlRenderer::prepareCmpTask(GlRenderTask* task) void GlRenderer::prepareCmpTask(GlRenderTask* task)
{ {
// we use 1:1 blit mapping since compositor fbo is same size as root fbo // we use 1:1 blit mapping since compositor fbo is same size as root fbo
Array<float> vertices(5 * 4); Array<float> vertices(4 * 4);
float left = -1.f; float left = -1.f;
float top = 1.f; float top = 1.f;
@ -744,7 +746,7 @@ void GlRenderer::prepareCmpTask(GlRenderTask* task)
indices.push(3); indices.push(3);
uint32_t vertexOffset = mGpuBuffer->push(vertices.data, vertices.count * sizeof(float)); uint32_t vertexOffset = mGpuBuffer->push(vertices.data, vertices.count * sizeof(float));
uint32_t indexOffset = mGpuBuffer->push(indices.data, vertices.count * sizeof(uint32_t)); uint32_t indexOffset = mGpuBuffer->push(indices.data, indices.count * sizeof(uint32_t));
task->addVertexLayout(GlVertexLayout{0, 2, 4 * sizeof(float), vertexOffset}); task->addVertexLayout(GlVertexLayout{0, 2, 4 * sizeof(float), vertexOffset});
task->addVertexLayout(GlVertexLayout{1, 2, 4 * sizeof(float), vertexOffset + 2 * sizeof(float)}); task->addVertexLayout(GlVertexLayout{1, 2, 4 * sizeof(float), vertexOffset + 2 * sizeof(float)});