Merge branch 'mesa_7_6_branch'

diff --cc src/mesa/main/fbobject.c
index 85d3d3db997df1d0924ced0723b19f81e5f1be6b,ed1db0feca6a6751b9bdd295d46c8ce14e0d5738..0040099a69fdee388c167273d9e8684761304878
--- 1/src/mesa/main/fbobject.c
--- 2/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@@ -1501,19 -1511,12 +1501,7 @@@ framebuffer_texture(GLcontext *ctx, con
        return;
     }
  
-    if (texObj && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-       /* the texture format must be depth+stencil */
-       const struct gl_texture_image *texImg;
-       texImg = texObj->Image[0][texObj->BaseLevel];
-       if (!texImg || texImg->_BaseFormat != GL_DEPTH_STENCIL) {
-          _mesa_error(ctx, GL_INVALID_OPERATION,
-                      "glFramebufferTexture%sEXT(texture is not"
-                      " DEPTH_STENCIL format)", caller);
-          return;
-       }
-    }
- 
     FLUSH_CURRENT(ctx, _NEW_BUFFERS);
 -   /* The above doesn't fully flush the drivers in the way that a
 -    * glFlush does, but that is required here:
 -    */
 -   if (ctx->Driver.Flush)
 -      ctx->Driver.Flush(ctx);
  
     _glthread_LOCK_MUTEX(fb->Mutex);
     if (texObj) {