[PATCH 2/2] glamor: Add an assert to catch the previous bug.

Eric Anholt eric at anholt.net
Wed Jul 1 14:56:40 PDT 2015


Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor_transfer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
index aa5e861..155d7e0 100644
--- a/glamor/glamor_transfer.c
+++ b/glamor/glamor_transfer.c
@@ -186,6 +186,8 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
         BoxPtr                  boxes = in_boxes;
         int                     nbox = in_nbox;
 
+        /* This should not be called on GLAMOR_FBO_NO_FBO-allocated pixmaps. */
+        assert(fbo->fb);
         glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
 
         while (nbox--) {
-- 
2.1.4



More information about the xorg-devel mailing list