brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use COGL to establish GL state for ClutterGLXTexturePixmap"

Browse Source 
This reverts commit f9d996a460.

The change from calling glBindTexture to using the material API with
cogl_material_flush_gl_state does not always work because it doesn't
necessarily leave the active texture unit as GL_TEXTURE0. For example,
if the previously rendered texture was multi-layered then the last
thing cogl_material_flush_gl_state will do is select GL_TEXTURE1 just
to disable it.
This commit is contained in:
Neil Roberts 2009-03-19 17:48:15 +00:00
parent e94e5ad65b
commit c4dcbb6bdb
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clutter/glx/clutter-glx-texture-pixmap.c
View File

@ -126,18 +126,26 @@ G_DEFINE_TYPE (ClutterGLXTexturePixmap, \
static gboolean
texture_bind (ClutterGLXTexturePixmap *tex)
{
CoglHandle cogl_material;
GLuint handle = 0;
GLenum target = 0;
CoglHandle cogl_tex;
/* It might be better to track if we've succesfully set a texture yet
* explicitly, rather than doing it indirectly like this.
*/
cogl_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE(tex));
if (cogl_tex == COGL_INVALID_HANDLE)
if (!cogl_texture_get_gl_texture (cogl_tex, &handle, &target))
return FALSE;
cogl_material = clutter_texture_get_cogl_material (CLUTTER_TEXTURE(tex));
cogl_material_flush_gl_state (cogl_material, NULL);
glEnable(target);
/* FIXME: fire off an error here? */
glBindTexture (target, handle);
if (clutter_texture_get_filter_quality (CLUTTER_TEXTURE (tex))
== CLUTTER_TEXTURE_QUALITY_HIGH && tex->priv->can_mipmap)
{
cogl_texture_set_filters (cogl_tex,
CGL_LINEAR_MIPMAP_LINEAR,
CGL_LINEAR);
}
return TRUE;
}