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

Fixed up some code.

Browse Source
This commit is contained in:
Alex Szpakowski
2015-11-30 02:26:59 -04:00
parent 4c82c96369
commit 6036454a20
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+8
View File
@@ -361,6 +361,14 @@ bool Canvas::setWrap(const Texture::Wrap &w)
wrap.s = wrap.t = WRAP_CLAMP; wrap.s = wrap.t = WRAP_CLAMP;
} }
if (!gl.isClampZeroTextureWrapSupported())
{
if (wrap.s == WRAP_CLAMP_ZERO)
wrap.s = WRAP_CLAMP;
if (wrap.t == WRAP_CLAMP_ZERO)
wrap.t = WRAP_CLAMP;
}
gl.bindTexture(texture); gl.bindTexture(texture);
gl.setTextureWrap(wrap); gl.setTextureWrap(wrap);
src/modules/graphics/opengl/Image.cpp
+9 -1
View File
@@ -531,8 +531,16 @@ bool Image::setWrap(const Texture::Wrap &w)
wrap.s = wrap.t = WRAP_CLAMP; wrap.s = wrap.t = WRAP_CLAMP;
} }
if (!gl.isClampZeroTextureWrapSupported())
{
if (wrap.s == WRAP_CLAMP_ZERO)
wrap.s = WRAP_CLAMP;
if (wrap.t == WRAP_CLAMP_ZERO)
wrap.t = WRAP_CLAMP;
}
gl.bindTexture(texture); gl.bindTexture(texture);
gl.setTextureWrap(w); gl.setTextureWrap(wrap);
return success; return success;
} }
src/modules/graphics/opengl/OpenGL.cpp
-3
View File
@@ -604,9 +604,6 @@ void OpenGL::setTextureFilter(graphics::Texture::Filter &f)
GLint OpenGL::getGLWrapMode(Texture::WrapMode wmode) GLint OpenGL::getGLWrapMode(Texture::WrapMode wmode)
{ {
if (wmode == Texture::WRAP_CLAMP_ZERO && !isClampZeroTextureWrapSupported())
wmode = Texture::WRAP_CLAMP;
switch (wmode) switch (wmode)
{ {
case Texture::WRAP_CLAMP: case Texture::WRAP_CLAMP: