diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2011-12-27 16:44:17 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-18 11:23:47 -0800 |
| commit | 27c4c0457dac307500859ca7a14a1e58465d5e0b (patch) | |
| tree | d25f445c270979a19cd07b8e7baa3180cbd51ea6 /glamor/glamor_picture.c | |
| parent | c65dc686228262894e0afc9fbe9fe6635d420e2f (diff) | |
Remove the assertion which is not safe sometimes.
The original version assumes that each drawable pixmap should
have a valid private pixmap pointer. But this is not true after
we create this libglamor. As the DDX layer may create a pure
software drawable pixmap which doesn't have a private pixmap
pointer.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'glamor/glamor_picture.c')
| -rw-r--r-- | glamor/glamor_picture.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index a021109b2..940c9d75a 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -16,9 +16,7 @@ glamor_upload_picture_to_texture(PicturePtr picture) glamor_pixmap_private *pixmap_priv; assert(picture->pDrawable); pixmap = glamor_get_drawable_pixmap(picture->pDrawable); - pixmap_priv = glamor_get_pixmap_private(pixmap); - assert(GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) == 1); return glamor_upload_pixmap_to_texture(pixmap); } @@ -65,8 +63,7 @@ glamor_create_picture(PicturePtr picture) pixmap_priv->is_picture = 1; pixmap_priv->pict_format = picture->format; /* XXX Some formats are compatible between glamor and ddx driver*/ - if (pixmap_priv->type == GLAMOR_TEXTURE_DRM - /*&& pixmap_priv->pict_format != PICT_b8g8r8a8*/) + if (pixmap_priv->type == GLAMOR_TEXTURE_DRM) glamor_set_pixmap_type(pixmap, GLAMOR_SEPARATE_TEXTURE); } return glamor_priv->saved_create_picture(picture); |