diff options
| author | Eric Anholt <eric@anholt.net> | 2006-12-27 18:14:59 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-12-27 18:14:59 -0800 |
| commit | f830c55e5f4efc97451240f8f18b49f46e8bce0f (patch) | |
| tree | 48359ae66973a55b1b1e9e27b592442d29aba561 /src | |
| parent | a75b416c91085df1db4027a25eafcd04fef1e57c (diff) | |
Make the assert() in i965_video.c actually work and expose an error.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_video.c | 5 | ||||
| -rw-r--r-- | src/i830_video.h | 5 | ||||
| -rw-r--r-- | src/i965_video.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 2e4a85bd..3153041b 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -131,11 +131,6 @@ static Atom xvGamma0, xvGamma1, xvGamma2, xvGamma3, xvGamma4, xvGamma5; #define IMAGE_MAX_WIDTH_LEGACY 1024 #define IMAGE_MAX_HEIGHT_LEGACY 1088 -/* - * Broadwater requires a bit of extra video memory for state information - */ -#define BRW_LINEAR_EXTRA (32*1024) - #if !VIDEO_DEBUG #define ErrorF Edummy static void diff --git a/src/i830_video.h b/src/i830_video.h index a00cd508..356a8f7f 100644 --- a/src/i830_video.h +++ b/src/i830_video.h @@ -81,6 +81,11 @@ typedef struct { #define GET_PORT_PRIVATE(pScrn) \ (I830PortPrivPtr)((I830PTR(pScrn))->adaptor->pPortPrivates[0].ptr) +/* + * Broadwater requires a bit of extra video memory for state information + */ +#define BRW_LINEAR_EXTRA (32*1024) + void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, diff --git a/src/i965_video.c b/src/i965_video.c index 96ba8f14..d4403df5 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -40,6 +40,10 @@ #include "brw_defines.h" #include "brw_structs.h" +/* Make assert() work. */ +#undef NDEBUG +#include <assert.h> + static const CARD32 sip_kernel_static[][4] = { /* wait (1) a0<1>UW a145<0,1,0>UW { align1 + } */ { 0x00000030, 0x20000108, 0x00001220, 0x00000000 }, |