Module: Mesa Branch: 7.10 Commit: b5d293e4fdb2944b27bea94204086c8ec9be8dbc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5d293e4fdb2944b27bea94204086c8ec9be8dbc
Author: Marek Olšák <mar...@gmail.com> Date: Sat Mar 12 21:44:04 2011 +0100 st/mesa: fail to alloc a renderbuffer if st_choose_renderbuffer_format fails This fixes: state_tracker/st_format.c:401:st_pipe_format_to_mesa_format: Assertion `0' failed. (cherry picked from commit fb5d9e1199cabe653ae1bb822bb66ce9f0ce7f55) Conflicts: src/mesa/state_tracker/st_cb_fbo.c --- src/mesa/state_tracker/st_cb_fbo.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index 15f8fb3..473ed4d 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -77,6 +77,10 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *r else format = st_choose_renderbuffer_format(screen, internalFormat, rb->NumSamples); + if (format == PIPE_FORMAT_NONE) { + return FALSE; + } + /* init renderbuffer fields */ strb->Base.Width = width; strb->Base.Height = height; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit