Merge remote-tracking branch 'origin/released'

* origin/released:
  pixman mesa fontconfig git update 12 nov 2013

Conflicts:
	mesalib/src/mesa/drivers/dri/swrast/swrast.c

3 files changed, 6 insertions, 3 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c b/mesalib/src/gallium/auxiliary/util/u_framebuffer.c
index 7803ec6a8..f84485d1f 100644
--- a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c
+++ b/mesalib/src/gallium/auxiliary/util/u_framebuffer.c
@@ -88,7 +88,8 @@ util_copy_framebuffer_state(struct pipe_framebuffer_state *dst,
    for (i = 0; i < src->nr_cbufs; i++)
       pipe_surface_reference(&dst->cbufs[i], src->cbufs[i]);
 
-   for (i = src->nr_cbufs; i < dst->nr_cbufs; i++)
+   /* Set remaining dest cbuf pointers to NULL */
+   for ( ; i < Elements(dst->cbufs); i++)
       pipe_surface_reference(&dst->cbufs[i], NULL);
 
    dst->nr_cbufs = src->nr_cbufs;
diff --git a/mesalib/src/glsl/opt_cse.cpp b/mesalib/src/glsl/opt_cse.cpp
index c0fdb23e6..c53b4c6e7 100644
--- a/mesalib/src/glsl/opt_cse.cpp
+++ b/mesalib/src/glsl/opt_cse.cpp
@@ -352,6 +352,7 @@ equals(ir_texture *a, ir_texture *b)
       if (!equals(a->lod_info.grad.dPdx, b->lod_info.grad.dPdx) ||
           !equals(a->lod_info.grad.dPdy, b->lod_info.grad.dPdy))
          return false;
+      break;
    case ir_txf_ms:
       if (!equals(a->lod_info.sample_index, b->lod_info.sample_index))
          return false;
@@ -359,6 +360,7 @@ equals(ir_texture *a, ir_texture *b)
    case ir_tg4:
       if (!equals(a->lod_info.component, b->lod_info.component))
          return false;
+      break;
    default:
       assert(!"Unrecognized texture op");
    }
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index f6570a5df..136a76fd9 100644..100755
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -669,7 +669,7 @@ dri_create_context(gl_api api,
 		   unsigned major_version,
 		   unsigned minor_version,
 		   uint32_t flags,
-           bool notify_reset,
+		   bool notify_reset,
 		   unsigned *error,
 		   void *sharedContextPrivate)
 {
@@ -836,7 +836,7 @@ static const struct __DriverAPIRec swrast_driver_api = {
     /*.SwapBuffers = */dri_swap_buffers,
     /*.MakeCurrent = */dri_make_current,
     /*.UnbindContext = */dri_unbind_context,
-	/*.AllocateBuffer = */NULL,
+    /*.AllocateBuffer = */NULL,
     /*.ReleaseBuffer = */NULL
 };