Module: Mesa Branch: master Commit: 9e68a8fa728c5d737a8b0c66aba066afddd67e9a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e68a8fa728c5d737a8b0c66aba066afddd67e9a
Author: Brian Paul <[email protected]> Date: Mon Feb 27 20:28:09 2012 -0700 util: fix assertions in u_blitter.c code Assertions of the form assert(a && b) should be written as separate assertions so that you can actually tell which part is false when there's a failure. Reviewed-by: Marek Olšák <[email protected]> --- src/gallium/auxiliary/util/u_blitter.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 48808ae..5784a7c 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -351,12 +351,12 @@ static void blitter_unset_running_flag(struct blitter_context_priv *ctx) static void blitter_check_saved_vertex_states(struct blitter_context_priv *ctx) { - assert(ctx->base.saved_num_vertex_buffers != ~0 && - ctx->base.saved_velem_state != INVALID_PTR && - ctx->base.saved_vs != INVALID_PTR && - (!ctx->has_geometry_shader || ctx->base.saved_gs != INVALID_PTR) && - (!ctx->has_stream_out || ctx->base.saved_num_so_targets != ~0) && - ctx->base.saved_rs_state != INVALID_PTR); + assert(ctx->base.saved_num_vertex_buffers != ~0); + assert(ctx->base.saved_velem_state != INVALID_PTR); + assert(ctx->base.saved_vs != INVALID_PTR); + assert(!ctx->has_geometry_shader || ctx->base.saved_gs != INVALID_PTR); + assert(!ctx->has_stream_out || ctx->base.saved_num_so_targets != ~0); + assert(ctx->base.saved_rs_state != INVALID_PTR); } static void blitter_restore_vertex_states(struct blitter_context_priv *ctx) @@ -410,9 +410,9 @@ static void blitter_restore_vertex_states(struct blitter_context_priv *ctx) static void blitter_check_saved_fragment_states(struct blitter_context_priv *ctx) { - assert(ctx->base.saved_fs != INVALID_PTR && - ctx->base.saved_dsa_state != INVALID_PTR && - ctx->base.saved_blend_state != INVALID_PTR); + assert(ctx->base.saved_fs != INVALID_PTR); + assert(ctx->base.saved_dsa_state != INVALID_PTR); + assert(ctx->base.saved_blend_state != INVALID_PTR); } static void blitter_restore_fragment_states(struct blitter_context_priv *ctx) @@ -453,8 +453,8 @@ static void blitter_restore_fb_state(struct blitter_context_priv *ctx) static void blitter_check_saved_textures(struct blitter_context_priv *ctx) { - assert(ctx->base.saved_num_sampler_states != ~0 && - ctx->base.saved_num_sampler_views != ~0); + assert(ctx->base.saved_num_sampler_states != ~0); + assert(ctx->base.saved_num_sampler_views != ~0); } static void blitter_restore_textures(struct blitter_context_priv *ctx) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
