From cfb8dea815086b9aafd27bd314e02739e04dfc7d Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 24 Aug 2009 07:22:14 -0700
Subject: [PATCH] glamor: Hook up miGetImage to fix some invalid accesses.

---
 glamor/glamor.c      | 3 +++
 glamor/glamor_priv.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 05e05511b..a03274a54 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -196,6 +196,9 @@ glamor_init(ScreenPtr screen)
     glamor_priv->saved_get_spans = screen->GetSpans;
     screen->GetSpans = glamor_get_spans;
 
+    glamor_priv->saved_get_image = screen->GetImage;
+    screen->GetImage = miGetImage;
+
 #ifdef RENDER
     glamor_priv->saved_composite = ps->Composite;
     ps->Composite = glamor_composite;
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 6484c9495..5d47c2590 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -43,6 +43,7 @@ typedef struct glamor_screen_private {
     CreatePixmapProcPtr saved_create_pixmap;
     DestroyPixmapProcPtr saved_destroy_pixmap;
     GetSpansProcPtr saved_get_spans;
+    GetImageProcPtr saved_get_image;
     CompositeProcPtr saved_composite;
     TrapezoidsProcPtr saved_trapezoids;