[cogl/wip/rib/master-next: 1/5] texture-pixmap-x11: initialize ->use_winsys_texture
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/rib/master-next: 1/5] texture-pixmap-x11: initialize ->use_winsys_texture
- Date: Mon, 18 Jul 2011 14:27:19 +0000 (UTC)
commit 1a0c6666d7265098f5c8b8d60b694921ea74e09b
Author: Robert Bragg <robert linux intel com>
Date: Fri Jul 15 19:35:55 2011 +0100
texture-pixmap-x11: initialize ->use_winsys_texture
This ensures that tex_pixmap->use_winsys_texture is always initialized
during cogl_texture_pixmap_x11_new - either according to the result of
winsys->texture_pixmap_x11_create, or if the winsys doesn't support tfp
we explicitly initialize to FALSE.
cogl/winsys/cogl-texture-pixmap-x11.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/winsys/cogl-texture-pixmap-x11.c
index 134d193..3b5de24 100644
--- a/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -329,7 +329,12 @@ cogl_texture_pixmap_x11_new (guint32 pixmap,
winsys = _cogl_texture_pixmap_x11_get_winsys (tex_pixmap);
if (winsys->texture_pixmap_x11_create)
- winsys->texture_pixmap_x11_create (tex_pixmap);
+ {
+ tex_pixmap->use_winsys_texture =
+ winsys->texture_pixmap_x11_create (tex_pixmap);
+ }
+ else
+ tex_pixmap->use_winsys_texture = FALSE;
return _cogl_texture_pixmap_x11_handle_new (tex_pixmap);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]