[PATCH 4/4] glamor: Silence compilation warnings.

[Zhigang Gong <zhigang.gong@linux.intel.com>]

As we removed those #ifdef from the body of the code, some
functions are referenced even we haven't defined the GLAMOR
though those functions are never be called at run time. We
still need to inclue those prototypes or make a fake function
to silcent the compilation warnings.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
---
 src/intel_driver.c |    2 --
 src/intel_uxa.c    |    2 --
 uxa/uxa-accel.c    |    5 ++++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/intel_driver.c b/src/intel_driver.c
index bd57694..0f528f3 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -75,9 +75,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i915_drm.h"
 #include <xf86drmMode.h>
 
-#ifdef GLAMOR
 #include "intel_glamor.h"
-#endif
 
 /* *INDENT-OFF* */
 /*
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index a069980..81d5ec0 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -40,9 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <errno.h>
 
-#ifdef GLAMOR
 #include "intel_glamor.h"
-#endif
 
 static const int I830CopyROP[16] = {
 	ROP_0,			/* GXclear */
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index b2e5347..5b27aaa 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -38,7 +38,10 @@
 
 #ifdef GLAMOR
 #include "glamor.h"
-#endif
+#else
+#define glamor_fill_spans_nf(...)  FALSE
+#define glamor_poly_fill_rect_nf(...) FALSE
+#endif 
 
 static void
 uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
-- 
1.7.4.4