[gtk+/rendering-cleanup] gdk: Drop last references to Xrender and configure.ac check

[Kristian Høgsberg <krh src gnome org>]

commit 5f160a7bf45a0723d076ab7436bdf4ff6dc5e00f
Author: Kristian Høgsberg <krh bitplanet net>
Date:   Thu Aug 5 10:10:45 2010 -0400

    gdk: Drop last references to Xrender and configure.ac check
    
    GTK+ no longer depends on the render extension!

 configure.ac              |   14 ++++++--------
 gdk/x11/gdkdisplay-x11.h  |    3 ---
 gdk/x11/gdkdrawable-x11.c |    7 -------
 gdk/x11/gdkdrawable-x11.h |    2 --
 4 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c755b7f..bde7a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -942,11 +942,11 @@ if test "x$gdktarget" = "xx11"; then
   #
   # Check for basic X packages; we use pkg-config if available
   #
-  if $PKG_CONFIG --exists x11 xext xrender; then
+  if $PKG_CONFIG --exists x11 xext; then
     have_base_x_pc=true
-    X_PACKAGES="$X_PACKAGES x11 xext xrender"
-    x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
+    X_PACKAGES="$X_PACKAGES x11 xext"
+    x_libs="`$PKG_CONFIG --libs x11 xext`"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
 
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -967,9 +967,9 @@ if test "x$gdktarget" = "xx11"; then
     fi
 
     x_cflags="$X_CFLAGS"
-    x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
+    x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
 
-    GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
+    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
   fi
 
   # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
@@ -988,8 +988,6 @@ if test "x$gdktarget" = "xx11"; then
                 AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
   AC_CHECK_FUNC(XextFindDisplay, :,
                 AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
-  AC_CHECK_FUNC(XRenderQueryExtension, :,
-                AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
 
   # Check for xReply
 
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 697632b..86beda5 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -147,9 +147,6 @@ struct _GdkDisplayX11
   guint have_input_shapes : 1;
   gint shape_event_base;
 
-  /* Alpha mask picture format */
-  XRenderPictFormat *mask_format;
-
   /* The offscreen window that has the pointer in it (if any) */
   GdkWindow *active_offscreen_window;
 };
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 8fba6eb..9204745 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -107,13 +107,6 @@ _gdk_x11_drawable_finish (GdkDrawable *drawable)
 {
   GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable);
   
-  if (impl->picture)
-    {
-      XRenderFreePicture (GDK_SCREEN_XDISPLAY (impl->screen),
-			  impl->picture);
-      impl->picture = None;
-    }
-  
   if (impl->cairo_surface)
     {
       cairo_surface_finish (impl->cairo_surface);
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 2b88536..4d387c1 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -32,7 +32,6 @@
 #include <gdk/gdkdrawable.h>
 
 #include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
 
 G_BEGIN_DECLS
 
@@ -68,7 +67,6 @@ struct _GdkDrawableImplX11
   Window xid;
   GdkScreen *screen;
 
-  Picture picture;
   cairo_surface_t *cairo_surface;
 };