From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 5 Nov 2008 22:58:09 +0000 (-0700)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80a718a63bf2fa817e346f0f5731ee9ef2e0e68b;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/rtasm/rtasm_execmem.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/shader/slang/slang_log.c
	src/mesa/state_tracker/st_atom_framebuffer.c
---

80a718a63bf2fa817e346f0f5731ee9ef2e0e68b
diff --cc src/mesa/state_tracker/st_atom_framebuffer.c
index b4f42c6f93f,2916886610d..ca1a719a9ac
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@@ -108,18 -108,21 +108,19 @@@ update_framebuffer_state( struct st_con
      * to determine which surfaces to draw to
      */
     framebuffer->num_cbufs = 0;
 -   for (j = 0; j < MAX_DRAW_BUFFERS; j++) {
 -      for (i = 0; i < fb->_NumColorDrawBuffers[j]; i++) {
 -         strb = st_renderbuffer(fb->_ColorDrawBuffers[j][i]);
 -
 -         /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/
 -         if (strb->rtt) {
 -            /* rendering to a GL texture, may have to update surface */
 -            update_renderbuffer_surface(st, strb);
 -         }
 +   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
 +      strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
  
 -         if (strb->surface) {
 -            framebuffer->cbufs[framebuffer->num_cbufs] = strb->surface;
 -            framebuffer->num_cbufs++;
 -         }
 +      /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/
 +      if (strb->rtt) {
 +         /* rendering to a GL texture, may have to update surface */
 +         update_renderbuffer_surface(st, strb);
 +      }
-       
-       assert(strb->surface);
-       framebuffer->cbufs[framebuffer->num_cbufs] = strb->surface;
-       framebuffer->num_cbufs++;
++
++      if (strb->surface) {
++         framebuffer->cbufs[framebuffer->num_cbufs] = strb->surface;
++         framebuffer->num_cbufs++;
+       }
     }
  
     strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);