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>
This commit is contained in:
Eric Anholt 2014-01-11 21:11:18 -08:00
parent 7eb2bafe22
commit 64146e4560

View File

@ -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)