xserver/hw/xgl Makefile.am,1.7,1.8 xglpict.c,1.5,1.6

Committed by: davidr

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv30494/hw/xgl

Modified Files:
	Makefile.am xglpict.c 
Log Message:
Build fixes

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	7 Jun 2005 08:53:40 -0000	1.7
+++ Makefile.am	13 Jun 2005 16:38:06 -0000	1.8
@@ -1,4 +1,12 @@
-SUBDIRS = . $(XGLX_DIRS) $(XEGL_DIRS)
+if XGLXSERVER
+XGLX_SUBDIRS = glx
+endif
+
+if XEGLSERVER
+XEGL_SUBDIRS = egl
+endif
+
+SUBDIRS = . $(XGLX_SUBDIRS) $(XEGL_SUBDIRS)
 
 INCLUDES =		   \
 	@XGL_INCS@	   \
@@ -8,6 +16,7 @@
 noinst_LIBRARIES = libxgl.a
 
 libxgl_a_SOURCES =     \
+	xgl.h	       \
 	xglinput.c     \
 	xgloutput.c    \
 	xglcmap.c      \

Index: xglpict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglpict.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xglpict.c	13 Apr 2005 14:27:47 -0000	1.5
+++ xglpict.c	13 Jun 2005 16:38:06 -0000	1.6
@@ -456,10 +456,7 @@
     if (!fbPictureInit (pScreen, pFormats, nformats))
 	return FALSE;
 
-    if (PictureAddFilter (pScreen,
-			  FilterConvolution,
-			  miFilterValidateParams) < 0)
-	return FALSE;
+    PictureAddFilter (pScreen, FilterConvolution, miFilterValidateParams);
     
     return TRUE;
 }