projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4dcbb6
)
[glx-texture-pixmap] Don't enable the texture target when binding the texture
author
Neil Roberts
<neil@linux.intel.com>
Thu, 19 Mar 2009 17:54:17 +0000
(17:54 +0000)
committer
Neil Roberts
<neil@linux.intel.com>
Thu, 19 Mar 2009 17:54:17 +0000
(17:54 +0000)
There's no need to enable the texture target unless it is going to be
used for rendering. Enabling it directly with glEnable calls confuses
Cogl's state caching.
This is a replacement for the patch in bug 1483 which was reverted.
clutter/glx/clutter-glx-texture-pixmap.c
patch
|
blob
|
history
diff --git
a/clutter/glx/clutter-glx-texture-pixmap.c
b/clutter/glx/clutter-glx-texture-pixmap.c
index
ecc6e8d
..
4a41070
100644
(file)
--- a/
clutter/glx/clutter-glx-texture-pixmap.c
+++ b/
clutter/glx/clutter-glx-texture-pixmap.c
@@
-134,8
+134,6
@@
texture_bind (ClutterGLXTexturePixmap *tex)
if (!cogl_texture_get_gl_texture (cogl_tex, &handle, &target))
return FALSE;
- glEnable(target);
-
/* FIXME: fire off an error here? */
glBindTexture (target, handle);