From 255d9e38378b12b8881708f571a928b4a96d793d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Wed, 31 Oct 2007 13:35:52 +0000
Subject: [PATCH] Updates.

svn path=/trunk/KDE/kdebase/workspace/; revision=731348
---
 COMPOSITE_HOWTO | 42 ++++++++++++++++++++++++++++++++++++++++--
 HACKING         |  4 ++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/COMPOSITE_HOWTO b/COMPOSITE_HOWTO
index 8829e62c18..d2c0197cec 100644
--- a/COMPOSITE_HOWTO
+++ b/COMPOSITE_HOWTO
@@ -46,7 +46,7 @@ ATI:
 ========
 
 The radeon driver should work for R200 chips, it's worse with R300 chips.
-TODO - fglrx - no idea
+The fglrx driver requires XGL for versions older than 8.42.3.
 
 You need in xorg.conf the XComposite extension enabled:
 
@@ -68,7 +68,45 @@ running kwin may be necessary).
 Intel:
 =======
 
-TODO - no idea. Possibly similar to ATI.
+It should work with both the i810 and intel drivers.
+
+You need in xorg.conf the XComposite extension enabled:
+
+Section "Extensions"
+ Option "Composite" "Enable"
+EndSection
+
+Also in xorg.conf, you need the DRI module loaded, and AIGLX needs to be enabled:
+
+Section "Module"
+ Load "dri"
+EndSection
+Section "ServerFlags"
+ Option "AIGLX"
+EndSection
+
+DRI also needs some options in xorg.conf (they should be there by default):
+
+Section "DRI"
+ Group "video"
+ Mode 0660
+EndSection
+
+For the TFP mode AIGLX needs to work. With AIGLX direct rendering should be disabled
+(see GLDirect below, with X.org older than 7.2 "export LIBGL_ALWAYS_INDIRECT=1" before
+running kwin may be necessary).
+
+Issues:
+-------
+
+With the i810 driver, DRI works only on the first running X (if you use second X session,
+    compositing won't work there), the intel driver doesn't seem to have this problem.
+You may get only white rectangles if DRI is not enabled or fails to initialize
+    - check your X log (/var/log/X*) and your xorg.conf
+
+
+XGL:
+=====
 
 
 Configuration options:
diff --git a/HACKING b/HACKING
index 223185d95a..4b05ac7f79 100644
--- a/HACKING
+++ b/HACKING
@@ -188,6 +188,10 @@ the "fix-before-submit" thing).
 
 - there is not space before (, i.e. it's "foo(", not "foo (". Rationale: This makes it simpler to grep for functions.
 
+- a null pointer is NULL, not a zero. Not that I really insist on this one, but the only reason for using 0
+is being way too lazy to type. Rationale: NULL says it's a pointer, and with many compilers it actually is a pointer,
+making it possible to detect some mistakes.
+
 That's all. Bonus points if you try to follow the existing coding style in general, but I don't think
 I really care about the rest, as long as these rules are followed. If I find out I care about more,
 I'll add them here.