import Mesa 11.0.6

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/mesa/src/mesa/drivers/x11/xm_buffer.c b/lib/mesa/src/mesa/drivers/x11/xm_buffer.c
index d945d8af5..f6e14270a 100644
--- a/lib/mesa/src/mesa/drivers/x11/xm_buffer.c
+++ b/lib/mesa/src/mesa/drivers/x11/xm_buffer.c
@@ -31,7 +31,6 @@
 
 #include "glxheader.h"
 #include "xmesaP.h"
-#include "main/errors.h"
 #include "main/imports.h"
 #include "main/formats.h"
 #include "main/framebuffer.h"
@@ -423,8 +422,7 @@ xmesa_MapRenderbuffer(struct gl_context *ctx,
                       struct gl_renderbuffer *rb,
                       GLuint x, GLuint y, GLuint w, GLuint h,
                       GLbitfield mode,
-                      GLubyte **mapOut, GLint *rowStrideOut,
-                      bool flip_y)
+                      GLubyte **mapOut, GLint *rowStrideOut)
 {
    struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb);
 
@@ -453,7 +451,7 @@ xmesa_MapRenderbuffer(struct gl_context *ctx,
 
          assert(xrb->pixmap);
 
-         /* Install error handler for XGetImage() in case the window
+         /* Install error handler for XGetImage() in case the the window
           * isn't mapped.  If we fail we'll create a temporary XImage.
           */
          mesaXErrorFlag = 0;
@@ -507,7 +505,7 @@ xmesa_MapRenderbuffer(struct gl_context *ctx,
 
    /* otherwise, this is an ordinary malloc-based renderbuffer */
    _swrast_map_soft_renderbuffer(ctx, rb, x, y, w, h, mode,
-                                 mapOut, rowStrideOut, false);
+                                 mapOut, rowStrideOut);
 }