diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-04 10:36:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:36:18 +0200 |
| commit | fc8f37239f3af088819c18f5632b2608954af73a (patch) | |
| tree | 012ded3d00546b7f2fa807f466643eadf6f815ba /mesalib/src/gallium/auxiliary | |
| parent | fdef5bff99e6079f64bc6b91c91b42195c85adeb (diff) | |
| download | vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.gz vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.tar.bz2 vcxsrv-fc8f37239f3af088819c18f5632b2608954af73a.zip | |
mesa xserver git update 4 Jul 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c | 2 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_math.h | 6 |
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; } |