From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 12 Jul 2013 23:22:24 +0000 (+0800)
Subject: ilo: move a santiy check into its assert()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d4ac9854969dfd6f8f39dbd6adeb3c8cfd60092;p=mesa.git

ilo: move a santiy check into its assert()

The compiler does not know that ilo_3d_pipeline_estimate_size() is pure and
can be eliminated in a release build in gen6_pipeline_end().  Move the call
into the assert().
---

diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
index d2f3300ceb3..eefb2f96b59 100644
--- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
+++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
@@ -1351,12 +1351,9 @@ gen6_pipeline_end(struct ilo_3d_pipeline *p,
                   const struct ilo_context *ilo,
                   struct gen6_pipeline_session *session)
 {
-   int used, estimate;
-
    /* sanity check size estimation */
-   used = session->init_cp_space - ilo_cp_space(p->cp);
-   estimate = ilo_3d_pipeline_estimate_size(p, ILO_3D_PIPELINE_DRAW, ilo);
-   assert(used <= estimate);
+   assert(session->init_cp_space - ilo_cp_space(p->cp) <=
+         ilo_3d_pipeline_estimate_size(p, ILO_3D_PIPELINE_DRAW, ilo));
 
    p->state.reduced_prim = session->reduced_prim;
    p->state.primitive_restart = ilo->draw->primitive_restart;