KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <maraeo@gmail.com>
This commit is contained in:
Brian Paul 2012-02-27 20:28:09 -07:00
parent 84870e2156
commit 9e68a8fa72
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gallium/auxiliary/util/u_blitter.c
View File

@ -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)