fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: make unsupported renderbuffer formats always fail as FBO incomplete

Browse source 
instead of failing to allocate a renderbuffer.

This also fixes piglit/get-renderbuffer-internalformat with non-renderable
formats.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2012-06-15 02:00:36 +02:00
parent e4b2e6b527
commit c760283159
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/state_tracker/st_cb_fbo.c
View file

@ -81,10 +81,13 @@ st_renderbuffer_alloc_sw_storage(struct gl_context * ctx,
}
else {
format = st_choose_renderbuffer_format(screen, internalFormat, 0);
}
if (format == PIPE_FORMAT_NONE) {
return FALSE;
/* Not setting gl_renderbuffer::Format here will cause
* FRAMEBUFFER_UNSUPPORTED and ValidateFramebuffer will not be called.
*/
if (format == PIPE_FORMAT_NONE) {
return GL_TRUE;
}
}
strb->Base.Format = st_pipe_format_to_mesa_format(format);
@ -133,8 +136,11 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx,
format = st_choose_renderbuffer_format(screen, internalFormat,
rb->NumSamples);
/* Not setting gl_renderbuffer::Format here will cause
* FRAMEBUFFER_UNSUPPORTED and ValidateFramebuffer will not be called.
*/
if (format == PIPE_FORMAT_NONE) {
return FALSE;
return GL_TRUE;
}
strb->Base.Format = st_pipe_format_to_mesa_format(format);