Move the new render symbols to dixsym.c instead so they are grouped with

    the other render symbols.
Initialize screen_x and screen_y to 0. This fixes a problem with the new
    Damage based sprite, where intersection test against the root pixmap
    would fail because the two fields were not initialized (damage.c,
    166-170).

3 files changed, 13 insertions, 9 deletions

diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index e47999dbb..e3abf2b4c 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -73,6 +73,11 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
     fbInitializeDrawable (&pPixmap->drawable);
 #endif
 
+#ifdef COMPOSITE
+    pPixmap->screen_x = 0;
+    pPixmap->screen_y = 0;
+#endif
+
     return pPixmap;
 }
 
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 8a0489ab6..7c46b7cea 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.2 2004/04/23 19:54:06 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.3 2004/08/09 02:08:35 kem Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
  * 17:11:29 tsi Exp $ */
 
@@ -81,6 +81,7 @@
 #include "dgaproc.h"
 #ifdef RENDER
 #include "mipict.h"
+#include "renderedge.h"
 #endif
 #include "selection.h"
 #ifdef XKB
@@ -404,6 +405,11 @@ LOOKUP dixLookupTab[] = {
     SYMFUNC(PictureSetFilterAlias)
     SYMFUNC(PictureGetSubpixelOrder)
     SYMFUNC(PictureSetSubpixelOrder)
+    SYMFUNC(RenderSampleCeilY)
+    SYMFUNC(RenderSampleFloorY)
+    SYMFUNC(RenderEdgeStep)
+    SYMFUNC(RenderEdgeInit)
+    SYMFUNC(RenderLineFixedEdgeInit)
 #endif
 
     {0, 0}
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index a5a495191..76682e783 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.2 2004/04/23 19:54:06 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.3 2004/08/08 17:02:19 krh Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */
 
 /*
@@ -32,7 +32,6 @@
 #include "panoramiX.h"
 #endif
 #include "sleepuntil.h"
-#include "renderedge.h"
 
 #ifdef HAS_SHM
 extern int ShmCompletionCode;
@@ -78,11 +77,5 @@ LOOKUP extLookupTab[] = {
     SYMVAR(XRC_DRAWABLE)
 #endif
 
-    SYMFUNC(RenderSampleCeilY)
-    SYMFUNC(RenderSampleFloorY)
-    SYMFUNC(RenderEdgeStep)
-    SYMFUNC(RenderEdgeInit)
-    SYMFUNC(RenderLineFixedEdgeInit)
-
     {0, 0}
 };