projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
877d71a
)
Remove non-gles2 glEnable(GL_TEXTURE_2D) call
author
Kristian Høgsberg
<krh@bitplanet.net>
Fri, 10 Sep 2010 12:51:09 +0000
(08:51 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Fri, 10 Sep 2010 12:51:09 +0000
(08:51 -0400)
compositor.c
patch
|
blob
|
history
diff --git
a/compositor.c
b/compositor.c
index e27ed70b832b686afbad8e2e5d3e49117bf09c46..f71b7e6d0c4b4ac9542df9e44e72929da4584d98 100644
(file)
--- a/
compositor.c
+++ b/
compositor.c
@@
-313,7
+313,6
@@
wlsc_surface_draw(struct wlsc_surface *es, struct wlsc_output *output)
}
glBindTexture(GL_TEXTURE_2D, es->texture);
- glEnable(GL_TEXTURE_2D);
glBindBuffer(GL_ARRAY_BUFFER, ec->vbo);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
5 * sizeof(GLfloat), NULL);