aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-08-05 10:41:05 -0400
committerTony Crisci <tony@dubstepdish.com>2017-08-05 10:41:05 -0400
commit9119be1dd1681e56147bc1d5cba637dd466e849f (patch)
treea6cf541f52d6b447eb1a598f75bc4402d204c261 /render
parentce886c03539319f7b3327a4adde3c912e349e0f4 (diff)
Remove unnecessary calls to glActiveTexture
Since wlroots shaders only use one texture at a time (ie there is only one sampler2D variable in any shader), it is unnecessary to switch between active texture units at this time.
Diffstat (limited to 'render')
-rw-r--r--render/gles2/surface.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/render/gles2/surface.c b/render/gles2/surface.c
index 33d8b0dc..8a92907f 100644
--- a/render/gles2/surface.c
+++ b/render/gles2/surface.c
@@ -51,7 +51,6 @@ static bool gles2_surface_attach_shm(struct wlr_surface_state *surface,
surface->wlr_surface->format = format;
surface->pixel_format = fmt;
- GL_CALL(glActiveTexture(GL_TEXTURE0));
GL_CALL(glGenTextures(1, &surface->tex_id));
GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch));
@@ -76,7 +75,6 @@ static void gles2_surface_get_matrix(struct wlr_surface_state *surface,
}
static void gles2_surface_bind(struct wlr_surface_state *surface) {
- GL_CALL(glActiveTexture(GL_TEXTURE0 + 1));
GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));