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

diff --cc src/gallium/auxiliary/draw/draw_vs_exec.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_vs_sse.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_exec.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_sse2.c
Simple merge

diff --cc src/gallium/auxiliary/util/u_mm.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_fs_sse.c
Simple merge

diff --cc src/mesa/main/texenvprogram.c
Simple merge

diff --cc src/mesa/shader/prog_uniform.c
Simple merge

diff --cc src/mesa/shader/shader_api.c
Simple merge

diff --cc src/mesa/state_tracker/st_atom_framebuffer.c
index b4f42c6f93f6a4182e759667d8a9f09462345401,2916886610d8984bb1d5030d66608b471879e624..ca1a719a9ac720e5a1fc34a37eeb0fd04cb58c79
--- 1/src/mesa/state_tracker/st_atom_framebuffer.c
--- 2/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);

diff --cc src/mesa/state_tracker/st_cb_clear.c
Simple merge

diff --cc src/mesa/state_tracker/st_framebuffer.c
Simple merge