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-03-22 20:53:09 -03:00
parent 6533665f15 090c50795a
commit 9efbe4892c
10 changed files with 100 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+3 -6
View File
@@ -252,8 +252,6 @@ bool Graphics::setMode(int width, int height)
created = true;
setViewportSize(width, height);
// Enable blending
glEnable(GL_BLEND);
@@ -310,6 +308,8 @@ bool Graphics::setMode(int width, int height)
if (quadIndices == nullptr)
quadIndices = new QuadIndices(20);
setViewportSize(width, height);
// Restore the graphics state.
restoreState(states.back());
@@ -1658,13 +1658,10 @@ Graphics::Stats Graphics::getStats() const
double Graphics::getSystemLimit(SystemLimit limittype) const
{
GLfloat limits[2];
switch (limittype)
{
case Graphics::LIMIT_POINT_SIZE:
glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, limits);
return (double) limits[1];
return (double) gl.getMaxPointSize();
case Graphics::LIMIT_TEXTURE_SIZE:
return (double) gl.getMaxTextureSize();
case Graphics::LIMIT_MULTI_CANVAS: