Mesa (master): mesa/st: Handle empty frame-buffers without asserting.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Apr 24 13:54:05 UTC 2014
Module: Mesa
Branch: master
Commit: 878877d3c46ddb7b2a67c289b3f432435b95114c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=878877d3c46ddb7b2a67c289b3f432435b95114c
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Apr 24 14:48:37 2014 +0100
mesa/st: Handle empty frame-buffers without asserting.
Fixes assertion failures with radeonsi.
Tested-by: Marek Olšák <maraeo at gmail.com>
---
src/mesa/state_tracker/st_atom_framebuffer.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index a17417c..eb5f783 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -147,11 +147,10 @@ update_framebuffer_state( struct st_context *st )
}
#endif
- /* _mesa_test_framebuffer_completeness refuses framebuffers with no
- * attachments, so this should never happen.
- */
- assert(framebuffer->width != UINT_MAX);
- assert(framebuffer->height != UINT_MAX);
+ if (framebuffer->width == UINT_MAX)
+ framebuffer->width = 0;
+ if (framebuffer->height == UINT_MAX)
+ framebuffer->height = 0;
cso_set_framebuffer(st->cso_context, framebuffer);
}
More information about the mesa-commit
mailing list