From: Patrick Rudolph <siro@das-labor.org>
Date: Sun, 11 Sep 2016 09:05:01 +0000 (+0200)
Subject: st/nine: Move assert in NineSurface9_ctor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a1cce20b605aee4f8787b6d5ad59ee25ac7550f;p=mesa.git

st/nine: Move assert in NineSurface9_ctor

Move assert to function entry.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c
index 4d54309ece3..45a37f4cd51 100644
--- a/src/gallium/state_trackers/nine/surface9.c
+++ b/src/gallium/state_trackers/nine/surface9.c
@@ -76,6 +76,8 @@ NineSurface9_ctor( struct NineSurface9 *This,
     /* The only way we can have !pContainer is being created
      * from create_zs_or_rt_surface with params 0 0 0 */
     assert(pContainer || (Level == 0 && Layer == 0 && TextureType == 0));
+    /* Make sure no resource is passed for pool systemmem */
+    assert(pDesc->Pool != D3DPOOL_SYSTEMMEM || !pResource);
 
     This->data = (uint8_t *)user_buffer;
 
@@ -135,8 +137,6 @@ NineSurface9_ctor( struct NineSurface9 *This,
             return E_OUTOFMEMORY;
     }
 
-    assert(pDesc->Pool != D3DPOOL_SYSTEMMEM || !pResource);
-
     if (pResource && (pDesc->Usage & D3DUSAGE_DYNAMIC))
         pResource->flags |= NINE_RESOURCE_FLAG_LOCKABLE;