Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/include/misc.h
	xorg-server/os/utils.c

2 files changed, 5 insertions, 3 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
index 82474cd7b..2ff1af70a 100644
--- a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1556,6 +1556,7 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
    cso_save_geometry_shader(ctx->cso);
    cso_save_viewport(ctx->cso);
    cso_save_vertex_elements(ctx->cso);
+   cso_save_vertex_buffers(ctx->cso);
 
    /* bind our state */
    cso_set_blend(ctx->cso, &ctx->blend);
@@ -1679,4 +1680,5 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
    cso_restore_viewport(ctx->cso);
    cso_restore_vertex_elements(ctx->cso);
    cso_restore_stream_outputs(ctx->cso);
+   cso_restore_vertex_buffers(ctx->cso);
 }
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h
index 724b136b5..f35c35ffe 100644
--- a/mesalib/src/gallium/auxiliary/util/u_math.h
+++ b/mesalib/src/gallium/auxiliary/util/u_math.h
@@ -382,7 +382,7 @@ util_is_double_inf_or_nan(double x)
 {
    union di tmp;
    tmp.d = x;
-   return (tmp.ui & 0x7ff0000000000000) == 0x7ff0000000000000;
+   return (tmp.ui & 0x7ff0000000000000ULL) == 0x7ff0000000000000ULL;
 }
 
 
@@ -391,7 +391,7 @@ util_is_double_nan(double x)
 {
    union di tmp;
    tmp.d = x;
-   return (tmp.ui & 0x7fffffffffffffff) > 0x7ff0000000000000;
+   return (tmp.ui & 0x7fffffffffffffffULL) > 0x7ff0000000000000ULL;
 }
 
 
@@ -400,7 +400,7 @@ util_double_inf_sign(double x)
 {
    union di tmp;
    tmp.d = x;
-   if ((tmp.ui & 0x7fffffffffffffff) != 0x7ff0000000000000) {
+   if ((tmp.ui & 0x7fffffffffffffffULL) != 0x7ff0000000000000ULL) {
       return 0;
    }