svn merge ^/branches/released .

1 files changed, 13 insertions, 0 deletions

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index a961e68cb..68a141d29 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -418,6 +418,15 @@ _mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
          case GL_RG:

             fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;

             return;

+         case GL_RGB:

+            switch (rb->Format) {

+            case MESA_FORMAT_RGB9_E5_FLOAT:

+               fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;

+               return;

+            default:;

+            }

+            break;

+

          default:

             /* render buffer format is supported by software rendering */

             ;

@@ -1175,6 +1184,10 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
    case GL_INTENSITY32F_ARB:

       return ctx->Extensions.ARB_texture_float &&

              ctx->Extensions.ARB_framebuffer_object ? GL_INTENSITY : 0;

+   case GL_RGB9_E5:

+      return ctx->Extensions.EXT_texture_shared_exponent ? GL_RGB : 0;

+   case GL_R11F_G11F_B10F:

+      return ctx->Extensions.EXT_packed_float ? GL_RGB : 0;

    /* XXX add integer formats eventually */

    default:

       return 0;