xf86-video-intel: src/sna/blt.c src/sna/gen2_render.c src/sna/gen3_render.c src/sna/gen4_render.c src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c src/sna/kgem.c src/sna/sna_accel.c src/sna/sna_blt.c src/sna/sna_composite.c src/sna/sna_dri.c src/sna/sna_driver.c src/sna/sna_glyphs.c src/sna/sna_io.c src/sna/sna_render.c src/sna/sna_tiling.c src/sna/sna_trapezoids.c src/sna/sna_video_textured.c
Chris Wilson
ickle at kemper.freedesktop.org
Sun Oct 30 10:19:37 PDT 2011
src/sna/blt.c | 2 --
src/sna/gen2_render.c | 2 --
src/sna/gen3_render.c | 2 --
src/sna/gen4_render.c | 2 --
src/sna/gen5_render.c | 2 --
src/sna/gen6_render.c | 2 --
src/sna/gen7_render.c | 2 --
src/sna/kgem.c | 2 --
src/sna/sna_accel.c | 2 --
src/sna/sna_blt.c | 2 --
src/sna/sna_composite.c | 2 --
src/sna/sna_dri.c | 2 --
src/sna/sna_driver.c | 2 --
src/sna/sna_glyphs.c | 2 --
src/sna/sna_io.c | 2 --
src/sna/sna_render.c | 2 --
src/sna/sna_tiling.c | 2 --
src/sna/sna_trapezoids.c | 2 --
src/sna/sna_video_textured.c | 2 --
19 files changed, 38 deletions(-)
New commits:
commit 1eefb75c91fb769551b485f1b2c6b59023c69906
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 30 17:17:36 2011 +0000
sna: Don't mess with NDEBUG
This is set in configure and redefining it later inside the C files just
leads to trouble and broken compilation.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/blt.c b/src/sna/blt.c
index ac20372..3b07d83 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -34,8 +34,6 @@
#if DEBUG_BLT
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
void
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index d2a296c..2577493 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -41,8 +41,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_COMPOSITE 0
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index eca841e..bf68841 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -40,8 +40,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_COMPOSITE 0
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index c603e67..8f59dc1 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -47,8 +47,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
/* gen4 has a serious issue with its shaders that we need to flush
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 3006bd1..c48e828 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -47,8 +47,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define DBG_NO_STATE_CACHE 0
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index b7f0ed0..51d26c8 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -47,8 +47,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_COMPOSITE 0
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 4667bad..3be87b7 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -47,8 +47,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_COMPOSITE 0
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 4827fb8..86cde01 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -72,8 +72,6 @@ static inline void list_replace(struct list *old,
#if DEBUG_KGEM
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define PAGE_SIZE 4096
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index c285c97..eb8295c 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -52,8 +52,6 @@
#if DEBUG_ACCEL
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define FORCE_GPU_ONLY 0
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index ffe81df..1630b35 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -44,8 +44,6 @@
#if DEBUG_BLT
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_BLT_COMPOSITE 0
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 0373bad..7c599be 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -39,8 +39,6 @@
#if DEBUG_COMPOSITE
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
static void dst_move_area_to_cpu(PicturePtr picture,
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 2fcc060..f724026 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -72,8 +72,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#if DEBUG_DRI
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_TRIPPLE_BUFFER 0
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 83abdb3..3e3f65c 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -78,8 +78,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#if DEBUG_DRIVER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
static OptionInfoRec sna_options[] = {
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 7b98b0c..7c4b73f 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -73,8 +73,6 @@
#if DEBUG_GLYPHS
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define FALLBACK 0
diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
index f97b88a..a36adc9 100644
--- a/src/sna/sna_io.c
+++ b/src/sna/sna_io.c
@@ -38,8 +38,6 @@
#if DEBUG_IO
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define PITCH(x, y) ALIGN((x)*(y), 4)
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 4017f91..badde7c 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -34,8 +34,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_REDIRECT 0
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 295936b..bab299e 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -37,8 +37,6 @@
#if DEBUG_RENDER
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
struct sna_tile_state {
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 80b4733..a6b8562 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -41,8 +41,6 @@
#if DEBUG_TRAPEZOIDS
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define NO_ACCEL 0
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 6ff0868..64d54ec 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -42,8 +42,6 @@
#if DEBUG_VIDEO_TEXTURED
#undef DBG
#define DBG(x) ErrorF x
-#else
-#define NDEBUG 1
#endif
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
More information about the xorg-commit
mailing list