From 64146e4560fdf3c3a40d023ac8e22259915b05ad Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sat, 11 Jan 2014 21:11:18 -0800
Subject: [PATCH] glamor: Add an assert about an invariant the upload code
 relies on.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
---
 glamor/glamor_pixmap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index bc7be9d..1bbcc55 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -725,6 +725,7 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex,
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 
+    assert(pbo || bits != 0);
     if (bits == NULL)
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
     if (non_sub)
-- 
2.7.4