diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-05 18:26:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 18:26:43 -0400 |
| commit | 41b98f21e50a6d57ba4b7fd8ba90066bba614e6a (patch) | |
| tree | 3b9b7eebc66b53149b57c8942f914111821f99c7 /render/gles2 | |
| parent | d6d1d57c69daf301bbefe76b81d8fb12f54a2812 (diff) | |
| parent | 9119be1dd1681e56147bc1d5cba637dd466e849f (diff) | |
Merge pull request #42 from acrisci/bug/no-switch-active-textures
Remove unnecessary calls to glActiveTexture
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/surface.c | 2 |
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)); |