summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-02-28 13:02:25 -0500
committerZhigang Gong <zhigang.gong@gmail.com>2014-03-13 21:52:34 +0800
commit5044c1d10b44ead9312c38b6f40f5cc49ae8d5b1 (patch)
treefd6e7f24260c5e127a6e7316e08c242dae1c0d23
parent73ab7f48c779fa6b6d7e796789c3c525123d59ec (diff)
glamor: Add am assert about an invariant the upload code relies on.
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c
index 72cf7b2..36e285f 100644
--- a/src/glamor_pixmap.c
+++ b/src/glamor_pixmap.c
@@ -723,6 +723,7 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex,
GL_NEAREST);
dispatch->glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
+ assert(pbo || bits != 0);
if (bits == NULL)
dispatch->glBindBuffer(GL_PIXEL_UNPACK_BUFFER,
pbo);