diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2013-08-10 15:27:49 -0400 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-08-15 15:19:47 +0200 |
| commit | 86e5c3c97b0a9e3f34f0f3caf71131a5b401a948 (patch) | |
| tree | ea60800952a098e144ebb52e13d31dc496f86d89 | |
| parent | b57875bbb3c677eee8930b41b03fbd2544278a6b (diff) | |
| download | external_mesa3d-86e5c3c97b0a9e3f34f0f3caf71131a5b401a948.zip external_mesa3d-86e5c3c97b0a9e3f34f0f3caf71131a5b401a948.tar.gz external_mesa3d-86e5c3c97b0a9e3f34f0f3caf71131a5b401a948.tar.bz2 | |
nvc0: standardize on using #if for NVC0_DEBUG_FENCE
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video.h | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video_bsp.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video_ppp.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_video_vp.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_video.c b/src/gallium/drivers/nvc0/nvc0_video.c index 2fc9233..58eb39f 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.c +++ b/src/gallium/drivers/nvc0/nvc0_video.c @@ -141,7 +141,7 @@ nvc0_decoder_destroy(struct pipe_video_decoder *decoder) nouveau_bo_ref(NULL, &dec->bitplane_bo); nouveau_bo_ref(NULL, &dec->inter_bo[0]); nouveau_bo_ref(NULL, &dec->inter_bo[1]); -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE nouveau_bo_ref(NULL, &dec->fence_bo); #endif nouveau_bo_ref(NULL, &dec->fw_bo); diff --git a/src/gallium/drivers/nvc0/nvc0_video.h b/src/gallium/drivers/nvc0/nvc0_video.h index 271ed5c..67eca7c 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.h +++ b/src/gallium/drivers/nvc0/nvc0_video.h @@ -33,9 +33,9 @@ #define VP_OFFSET 0x200 #define COMM_OFFSET 0x500 -//#define NVC0_DEBUG_FENCE 1 +#define NVC0_DEBUG_FENCE 0 -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE # define NVC0_VIDEO_QDEPTH 1 #else # define NVC0_VIDEO_QDEPTH 2 @@ -59,7 +59,7 @@ struct nvc0_decoder { struct nouveau_object *channel[3], *bsp, *vp, *ppp; struct nouveau_pushbuf *pushbuf[3]; -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE /* dump fence and comm, as needed.. */ unsigned *fence_map; struct comm *comm; diff --git a/src/gallium/drivers/nvc0/nvc0_video_bsp.c b/src/gallium/drivers/nvc0/nvc0_video_bsp.c index 8f93861..bdb9c64 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_bsp.c +++ b/src/gallium/drivers/nvc0/nvc0_video_bsp.c @@ -261,7 +261,7 @@ nvc0_decoder_bsp(struct nvc0_decoder *dec, union pipe_desc desc, struct nouveau_pushbuf_refn bo_refs[] = { { bsp_bo, NOUVEAU_BO_RD | NOUVEAU_BO_VRAM }, { inter_bo, NOUVEAU_BO_WR | NOUVEAU_BO_VRAM }, -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE { dec->fence_bo, NOUVEAU_BO_WR | NOUVEAU_BO_GART }, #endif { dec->bitplane_bo, NOUVEAU_BO_RDWR | NOUVEAU_BO_VRAM }, @@ -271,7 +271,7 @@ nvc0_decoder_bsp(struct nvc0_decoder *dec, union pipe_desc desc, if (!dec->bitplane_bo) num_refs--; -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE fence_extra = 4; #endif diff --git a/src/gallium/drivers/nvc0/nvc0_video_ppp.c b/src/gallium/drivers/nvc0/nvc0_video_ppp.c index 823e360..836add3 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_ppp.c +++ b/src/gallium/drivers/nvc0/nvc0_video_ppp.c @@ -36,7 +36,7 @@ nvc0_decoder_setup_ppp(struct nvc0_decoder *dec, struct nouveau_vp3_video_buffer { NULL, NOUVEAU_BO_WR | NOUVEAU_BO_VRAM }, { NULL, NOUVEAU_BO_WR | NOUVEAU_BO_VRAM }, { dec->ref_bo, NOUVEAU_BO_RD | NOUVEAU_BO_VRAM }, -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE { dec->fence_bo, NOUVEAU_BO_WR | NOUVEAU_BO_GART }, #endif }; diff --git a/src/gallium/drivers/nvc0/nvc0_video_vp.c b/src/gallium/drivers/nvc0/nvc0_video_vp.c index 7c1691c..74e3915 100644 --- a/src/gallium/drivers/nvc0/nvc0_video_vp.c +++ b/src/gallium/drivers/nvc0/nvc0_video_vp.c @@ -543,7 +543,7 @@ nvc0_decoder_vp(struct nvc0_decoder *dec, union pipe_desc desc, { inter_bo, NOUVEAU_BO_WR | NOUVEAU_BO_VRAM }, { dec->ref_bo, NOUVEAU_BO_WR | NOUVEAU_BO_VRAM }, { bsp_bo, NOUVEAU_BO_RD | NOUVEAU_BO_VRAM }, -#ifdef NVC0_DEBUG_FENCE +#if NVC0_DEBUG_FENCE { dec->fence_bo, NOUVEAU_BO_WR | NOUVEAU_BO_GART }, #endif { dec->fw_bo, NOUVEAU_BO_RD | NOUVEAU_BO_VRAM }, |