blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #42 from acrisci/bug/no-switch-active-textures 

Remove unnecessary calls to glActiveTexture
This commit is contained in:
Drew DeVault 2017-08-05 18:26:43 -04:00 committed by GitHub
parent d6d1d57c69 9119be1dd1
commit 41b98f21e5
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
render/gles2/surface.c
View File

@ -51,7 +51,6 @@ static bool gles2_surface_attach_shm(struct wlr_surface_state *surface,
surface->wlr_surface->format = format; surface->wlr_surface->format = format;
surface->pixel_format = fmt; surface->pixel_format = fmt;
GL_CALL(glActiveTexture(GL_TEXTURE0));
GL_CALL(glGenTextures(1, &surface->tex_id)); GL_CALL(glGenTextures(1, &surface->tex_id));
GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id)); GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch)); 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) { 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(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_MIN_FILTER, GL_LINEAR));
GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));