diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-01-04 14:40:24 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-12-18 11:23:47 -0800 |
| commit | a65e1c736aaa1bb2440a83c42c0410d9d9b58007 (patch) | |
| tree | 6cc0512993763157c23268af8e8625da8eb7a8ee /glamor/glamor_render.c | |
| parent | e1789893e5fe07fdbd8f21b7fa8a15f6db066592 (diff) | |
Reduce the double check of pixmap's private pointer.
As we now add the checking to the Macro, we don't need to check
the pointer outside the Macro.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'glamor/glamor_render.c')
| -rw-r--r-- | glamor/glamor_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 4a2a4388a..487171c8e 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -754,7 +754,7 @@ glamor_composite_with_shader(CARD8 op, GLfloat source_solid_color[4], mask_solid_color[4]; dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap); - if (!dest_pixmap_priv || !GLAMOR_PIXMAP_PRIV_HAS_FBO(dest_pixmap_priv)) { + if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dest_pixmap_priv)) { glamor_fallback("dest has no fbo.\n"); goto fail; } @@ -1220,7 +1220,7 @@ _glamor_composite(CARD8 op, dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap); /* Currently. Always fallback to cpu if destination is in CPU memory. */ - if (!dest_pixmap_priv || !GLAMOR_PIXMAP_PRIV_HAS_FBO(dest_pixmap_priv)) { + if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dest_pixmap_priv)) { goto fail; } |