[Mesa-dev] [PATCH 51/75] st/nine: Move assert in NineSurface9_ctor

Axel Davy axel.davy at ens.fr
Wed Oct 5 20:09:24 UTC 2016


From: Patrick Rudolph <siro at das-labor.org>

Move assert to function entry.

Signed-off-by: Patrick Rudolph <siro at das-labor.org>
Reviewed-by: Axel Davy <axel.davy at ens.fr>
---
 src/gallium/state_trackers/nine/surface9.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c
index 4d54309..45a37f4 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;
 
-- 
2.10.0



More information about the mesa-dev mailing list