LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '12.0-development' into GraphicsBuffer

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-28 23:10:21 -04:00
parent d77dabaa6b e188740c18
commit 7fbb68e90e
32 changed files with 338 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Video.cpp
+3 -3
View File
@@ -120,14 +120,14 @@ void Video::draw(Graphics *gfx, const Matrix4 &m)
Matrix4 t(tm, m);
Graphics::StreamDrawCommand cmd;
Graphics::BatchedDrawCommand cmd;
cmd.formats[0] = getSinglePositionFormat(is2D);
cmd.formats[1] = CommonFormat::STf_RGBAub;
cmd.indexMode = TRIANGLEINDEX_QUADS;
cmd.vertexCount = 4;
cmd.standardShaderType = Shader::STANDARD_VIDEO;
Graphics::StreamVertexData data = gfx->requestStreamDraw(cmd);
Graphics::BatchedVertexData data = gfx->requestBatchedDraw(cmd);
if (is2D)
t.transformXY((Vector2 *) data.stream[0], vertices, 4);
@@ -148,7 +148,7 @@ void Video::draw(Graphics *gfx, const Matrix4 &m)
if (Shader::current != nullptr)
Shader::current->setVideoTextures(textures[0], textures[1], textures[2]);
gfx->flushStreamDraws();
gfx->flushBatchedDraws();
}
void Video::update()