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

Reduce redundant glActiveTexture calls.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-21 22:19:16 -03:00
parent b9c01b8674
commit 14f1afa446
11 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+5 -5
View File
@@ -217,7 +217,7 @@ bool Canvas::loadVolatile()
requested_samples = std::max(requested_samples, 0);
glGenTextures(1, &texture);
gl.bindTexture(texture);
gl.bindTextureToUnit(texture, 0, false);
if (GLAD_ANGLE_texture_usage)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_USAGE_ANGLE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
@@ -311,7 +311,7 @@ void Canvas::drawv(const Matrix4 &t, const Vertex *v)
OpenGL::TempTransform transform(gl);
transform.get() *= t;
gl.bindTexture(texture);
gl.bindTextureToUnit(texture, 0, false);
gl.useVertexAttribArrays(ATTRIBFLAG_POS | ATTRIBFLAG_TEXCOORD);
@@ -339,7 +339,7 @@ void Canvas::setFilter(const Texture::Filter &f)
throw love::Exception("Invalid texture filter.");
filter = f;
gl.bindTexture(texture);
gl.bindTextureToUnit(texture, 0, false);
gl.setTextureFilter(filter);
}
@@ -366,7 +366,7 @@ bool Canvas::setWrap(const Texture::Wrap &w)
wrap.t = WRAP_CLAMP;
}
gl.bindTexture(texture);
gl.bindTextureToUnit(texture, 0, false);
gl.setTextureWrap(wrap);
return success;
@@ -936,7 +936,7 @@ bool Canvas::isFormatSupported(Canvas::Format format)
GLuint texture = 0;
glGenTextures(1, &texture);
gl.bindTexture(texture);
gl.bindTextureToUnit(texture, 0, false);
Texture::Filter f;
f.min = f.mag = Texture::FILTER_NEAREST;