[Mesa-dev] [PATCH 3/4] st/mesa: make unsupported renderbuffer formats always fail as FBO incomplete

[Marek Olšák]

instead of failing to allocate a renderbuffer.

This also fixes piglit/get-renderbuffer-internalformat with non-renderable
formats.
---
 src/mesa/state_tracker/st_cb_fbo.c |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 0126999..88c6fa2 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -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);
-- 
1.7.9.5