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

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-04-02 18:27:33 -03:00
parent 0aaaf6b6f0 901cc362df
commit 1eed86426b
7 changed files with 35 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+6 -4
View File
@@ -450,8 +450,8 @@ void Graphics::clear(Colorf c)
{
// This seems to be enough to fix the bug for me. Other methods I've
// tried (e.g. dummy draws) don't work in all cases.
glUseProgram(0);
glUseProgram(Shader::current->getProgram());
gl.useProgram(0);
gl.useProgram(Shader::current->getProgram());
}
}
@@ -528,8 +528,8 @@ void Graphics::clear(const std::vector<OptionalColorf> &colors)
{
// This seems to be enough to fix the bug for me. Other methods I've
// tried (e.g. dummy draws) don't work in all cases.
glUseProgram(0);
glUseProgram(Shader::current->getProgram());
gl.useProgram(0);
gl.useProgram(Shader::current->getProgram());
}
}
@@ -608,6 +608,7 @@ void Graphics::present()
// Reset the per-frame stat counts.
gl.stats.drawCalls = 0;
gl.stats.framebufferBinds = 0;
gl.stats.shaderSwitches = 0;
}
int Graphics::getWidth() const
@@ -1650,6 +1651,7 @@ Graphics::Stats Graphics::getStats() const
stats.drawCalls = gl.stats.drawCalls;
stats.canvasSwitches = gl.stats.framebufferBinds;
stats.shaderSwitches = gl.stats.shaderSwitches;
stats.canvases = Canvas::canvasCount;
stats.images = Image::imageCount;
stats.fonts = Font::fontCount;