diff options
| author | Eric Anholt <eric@anholt.net> | 2014-01-11 21:11:18 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-17 14:30:57 -0700 |
| commit | 64146e4560fdf3c3a40d023ac8e22259915b05ad (patch) | |
| tree | b22be0a809e7dfa48da582e297ee75c7744126c6 | |
| parent | 7eb2bafe22dcc90c2fb94d2d9cae370b683dba7c (diff) | |
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>
| -rw-r--r-- | glamor/glamor_pixmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index bc7be9dd7..1bbcc551b 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) |