Skip to content

Commit 416e99c

Browse files
Upgrade tgfx to b8251c0 and adapt new vertex buffer API. (#3223)
1 parent ea3d023 commit 416e99c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"url": "${PAG_GROUP}/tgfx.git",
15-
"commit": "92250f90c3cdd7de1c2d9800ee3faf9eea4a5fb7",
15+
"commit": "b8251c0dd494a24fafa9735de3c265c20b144c7e",
1616
"dir": "third_party/tgfx"
1717
},
1818
{

src/rendering/filters/RuntimeFilter.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ std::shared_ptr<tgfx::RenderPipeline> RuntimeFilter::createPipeline(tgfx::GPU* g
100100
}
101101

102102
tgfx::RenderPipelineDescriptor descriptor = {};
103-
descriptor.vertex = tgfx::VertexDescriptor(vertexAttributes());
103+
tgfx::VertexBufferLayout vertexLayout(vertexAttributes());
104+
descriptor.vertex.bufferLayouts = {vertexLayout};
104105
descriptor.vertex.module = vertexShader;
105106
descriptor.fragment.module = fragmentShader;
106107
tgfx::PipelineColorAttachment colorAttachment = {};
@@ -257,7 +258,7 @@ bool RuntimeFilter::onDraw(tgfx::CommandEncoder* encoder,
257258
memcpy(data, vertices.data(), vertices.size() * sizeof(float));
258259
vertexBuffer->unmap();
259260

260-
renderPass->setVertexBuffer(vertexBuffer);
261+
renderPass->setVertexBuffer(0, vertexBuffer);
261262
renderPass->setTexture(0, inputTextures[0], resources->sampler);
262263

263264
for (size_t i = 1; i < inputTextures.size(); i++) {
@@ -266,7 +267,7 @@ bool RuntimeFilter::onDraw(tgfx::CommandEncoder* encoder,
266267

267268
onUpdateUniforms(renderPass.get(), gpu, inputTextures, offset);
268269

269-
renderPass->draw(tgfx::PrimitiveType::TriangleStrip, 0, vertexCount());
270+
renderPass->draw(tgfx::PrimitiveType::TriangleStrip, static_cast<uint32_t>(vertexCount()));
270271
renderPass->end();
271272
return true;
272273
}

0 commit comments

Comments
 (0)