Mesa (master): gallium: Handle non-NULL data pointer in EXA ModifyPixmapHeader hook.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: f3c7d6ff866cdd96cdd55baee94f58698a9656a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3c7d6ff866cdd96cdd55baee94f58698a9656a3

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Apr 23 14:47:31 2009 +0100

gallium: Handle non-NULL data pointer in EXA ModifyPixmapHeader hook.

Need to use the data pointed to for pixmap contents in that case.

Fixes RENDER based text rendering.

---

 src/gallium/state_trackers/xorg/xorg_exa.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index d743e1e..7913174 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -37,6 +37,8 @@
 #include "pipe/p_state.h"
 #include "pipe/p_inlines.h"
 
+#include "util/u_rect.h"
+
 struct exa_entity
 {
     ExaDriverPtr pExa;
@@ -436,6 +438,18 @@ ExaModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
 	priv->tex = exa->scrn->texture_create(exa->scrn, &template);
     }
 
+    if (pPixData) {
+	struct pipe_transfer *transfer =
+	    exa->scrn->get_tex_transfer(exa->scrn, priv->tex, 0, 0, 0,
+					PIPE_TRANSFER_WRITE,
+					0, 0, width, height);
+        pipe_copy_rect(exa->scrn->transfer_map(exa->scrn, transfer),
+                       &priv->tex->block, transfer->stride, 0, 0,
+                       width, height, pPixData, pPixmap->devKind, 0, 0);
+        exa->scrn->transfer_unmap(exa->scrn, transfer);
+        exa->scrn->tex_transfer_destroy(transfer);
+    }
+
     return TRUE;
 }