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

Fix love.graphics.drawLayer.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-05-20 15:37:29 -03:00
parent fe81d79c6a
commit e03c763215
10 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+9 -10
View File
@@ -388,19 +388,13 @@ void Graphics::setShader(love::graphics::Shader *shader)
if (shader == nullptr)
return setShader();
flushStreamDraws();
shader->attach();
states.back().shader.set(shader);
}
void Graphics::setShader()
{
flushStreamDraws();
Shader::attachDefault(Shader::STANDARD_DEFAULT);
states.back().shader.set(nullptr);
}
@@ -613,16 +607,14 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawRequest &
StreamBufferState &state = streamBufferState;
if (state.vertexCount == 0 && Shader::current != nullptr && req.texture != nullptr)
Shader::current->checkMainTexture(req.texture);
bool shouldflush = false;
bool shouldresize = false;
if (req.primitiveMode != state.primitiveMode
|| req.formats[0] != state.formats[0] || req.formats[1] != state.formats[1]
|| ((req.indexMode != TriangleIndexMode::NONE) != (state.indexCount > 0))
|| req.texture != state.texture)
|| req.texture != state.texture
|| req.standardShaderType != state.standardShaderType)
{
shouldflush = true;
}
@@ -681,8 +673,15 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawRequest &
state.formats[0] = req.formats[0];
state.formats[1] = req.formats[1];
state.texture = req.texture;
state.standardShaderType = req.standardShaderType;
}
if (state.vertexCount == 0 && Shader::isDefaultActive())
Shader::attachDefault(state.standardShaderType);
if (state.vertexCount == 0 && Shader::current != nullptr && req.texture != nullptr)
Shader::current->checkMainTexture(req.texture);
if (shouldresize)
{
for (int i = 0; i < 2; i++)