dri: drop asserts to make build against stable libdrm
authorDave Airlie <airlied@linux.ie>
Tue, 1 Jul 2008 08:22:12 +0000 (18:22 +1000)
committerDave Airlie <airlied@linux.ie>
Tue, 1 Jul 2008 08:22:12 +0000 (18:22 +1000)
These asserts are of questionable use at the moment with things in flux.

src/mesa/drivers/dri/common/dri_bufmgr.c

index 4df006fb9f88815f22579466a8f657be572d64a9..8b5cb7628ed4918849d5b4f9d796a0c162ed389c 100644 (file)
@@ -40,11 +40,6 @@ dri_bo *
 dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
             unsigned int alignment, uint64_t location_mask)
 {
-   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
-                            DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
-                            DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
-                            DRM_BO_FLAG_MEM_PRIV3 | DRM_BO_FLAG_MEM_PRIV4 |
-                            DRM_BO_FLAG_CACHED | DRM_BO_FLAG_CACHED_MAPPED)) == 0);
    return bufmgr->bo_alloc(bufmgr, name, size, alignment, location_mask);
 }
 
@@ -53,12 +48,6 @@ dri_bo_alloc_static(dri_bufmgr *bufmgr, const char *name, unsigned long offset,
                    unsigned long size, void *virtual,
                    uint64_t location_mask)
 {
-   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
-                            DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
-                            DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
-                            DRM_BO_FLAG_MEM_PRIV3 |
-                            DRM_BO_FLAG_MEM_PRIV4)) == 0);
-
    return bufmgr->bo_alloc_static(bufmgr, name, offset, size, virtual,
                                  location_mask);
 }