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

Merge from root

Browse Source
This commit is contained in:
Alexander Szpakowski
2013-01-17 20:29:48 -04:00
parent 9f8f493aed a72c981c32
commit ce75b3af69
7 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+4
View File
@@ -553,6 +553,8 @@ void Graphics::setBlendMode(Graphics::BlendMode mode)
glBlendFunc(GL_DST_COLOR, GL_ZERO);
else if (mode == BLEND_PREMULTIPLIED)
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
else if (mode == BLEND_NONE)
glBlendFunc(GL_ONE, GL_ZERO);
else // mode == BLEND_ADDITIVE || mode == BLEND_SUBTRACTIVE
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
}
@@ -588,6 +590,8 @@ Graphics::BlendMode Graphics::getBlendMode()
return BLEND_MULTIPLICATIVE;
else if (src == GL_ONE && dst == GL_ONE_MINUS_SRC_ALPHA) // && equation == GL_FUNC_ADD
return BLEND_PREMULTIPLIED;
else if (src == GL_ONE && dst == GL_ZERO)
return BLEND_NONE;
return BLEND_MAX_ENUM; // Should never be reached.
}
src/modules/graphics/opengl/Image.cpp
+1 -1
View File
@@ -357,7 +357,7 @@ void Image::drawv(const Matrix &t, const vertex *v) const
bool Image::hasNpot()
{
return GLEE_ARB_texture_non_power_of_two != 0;
return GLEE_VERSION_2_0 || GLEE_ARB_texture_non_power_of_two;
}
bool Image::hasMipmapSupport()