| 1 |
dberkholz 08/07/01 08:35:10 |
| 2 |
|
| 3 |
Added: |
| 4 |
0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch |
| 5 |
Log: |
| 6 |
Fix build with libdrm 2.3.1. |
| 7 |
(Portage version: 2.1.5.6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch |
| 16 |
=================================================================== |
| 17 |
From d3f7b463c3975c070503053e4ad70af99016a756 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Dave Airlie <airlied@×××××.ie> |
| 19 |
Date: Tue, 1 Jul 2008 18:22:12 +1000 |
| 20 |
Subject: [PATCH] dri: drop asserts to make build against stable libdrm |
| 21 |
|
| 22 |
These asserts are of questionable use at the moment with things in flux. |
| 23 |
--- |
| 24 |
src/mesa/drivers/dri/common/dri_bufmgr.c | 11 ----------- |
| 25 |
1 files changed, 0 insertions(+), 11 deletions(-) |
| 26 |
|
| 27 |
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c |
| 28 |
index 4df006f..8b5cb76 100644 |
| 29 |
--- a/src/mesa/drivers/dri/common/dri_bufmgr.c |
| 30 |
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.c |
| 31 |
@@ -40,11 +40,6 @@ dri_bo * |
| 32 |
dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size, |
| 33 |
unsigned int alignment, uint64_t location_mask) |
| 34 |
{ |
| 35 |
- assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT | |
| 36 |
- DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 | |
| 37 |
- DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 | |
| 38 |
- DRM_BO_FLAG_MEM_PRIV3 | DRM_BO_FLAG_MEM_PRIV4 | |
| 39 |
- DRM_BO_FLAG_CACHED | DRM_BO_FLAG_CACHED_MAPPED)) == 0); |
| 40 |
return bufmgr->bo_alloc(bufmgr, name, size, alignment, location_mask); |
| 41 |
} |
| 42 |
|
| 43 |
@@ -53,12 +48,6 @@ dri_bo_alloc_static(dri_bufmgr *bufmgr, const char *name, unsigned long offset, |
| 44 |
unsigned long size, void *virtual, |
| 45 |
uint64_t location_mask) |
| 46 |
{ |
| 47 |
- assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT | |
| 48 |
- DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 | |
| 49 |
- DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 | |
| 50 |
- DRM_BO_FLAG_MEM_PRIV3 | |
| 51 |
- DRM_BO_FLAG_MEM_PRIV4)) == 0); |
| 52 |
- |
| 53 |
return bufmgr->bo_alloc_static(bufmgr, name, offset, size, virtual, |
| 54 |
location_mask); |
| 55 |
} |
| 56 |
-- |
| 57 |
1.5.5.4 |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
-- |
| 63 |
gentoo-commits@l.g.o mailing list |
Archives