diff options
author | Eric Anholt <eric@anholt.net> | 2014-02-28 13:02:28 -0500 |
---|---|---|
committer | Zhigang Gong <zhigang.gong@gmail.com> | 2014-03-13 21:52:34 +0800 |
commit | bc04fd75b37b7e553289e97692ba279480874294 (patch) | |
tree | b3bd5d7264be869510eec74423b9070534cc2bb1 | |
parent | 652250c3925c98f19107b7ff5101e4e5fe6a576c (diff) |
glamor: Don't try to fallback sub-upload to an in-memory pixmap.
This path needs to draw to the pixmap using its fbo, while an
in-memory pixmap doesn't have one.
Ported from Eric's xserver glamor tree.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | src/glamor_pixmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c index fc71151..617ed26 100644 --- a/src/glamor_pixmap.c +++ b/src/glamor_pixmap.c @@ -831,6 +831,9 @@ ready_to_upload: return TRUE; } + if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) + return FALSE; + if (need_flip) ptexcoords = texcoords; else |