Mesa (mesa_7_5_branch): i965: added intelFlush() call in intel_get_tex_image()

[Ian Romanick]

Module: Mesa
Branch: mesa_7_5_branch
Commit: 19218fe71269d03e1a2e9fcfd0c06a9adb5cb21d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19218fe71269d03e1a2e9fcfd0c06a9adb5cb21d

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jun  9 15:07:39 2009 -0600

i965: added intelFlush() call in intel_get_tex_image()

Fixes the render-to-texture test in progs/tests/getteximage.c
(cherry picked from commit a03b349153660e449daf4f56d750f1caef23b1a5)

---

 src/mesa/drivers/dri/intel/intel_tex_image.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 66a3b4e..5e61e9e 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -637,6 +637,12 @@ intel_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
    struct intel_context *intel = intel_context(ctx);
    struct intel_texture_image *intelImage = intel_texture_image(texImage);
 
+   /* If we're reading from a texture that has been rendered to, need to
+    * make sure rendering is complete.
+    * We could probably predicate this on texObj->_RenderToTexture
+    */
+   intelFlush(ctx);
+
    /* Map */
    if (intelImage->mt) {
       /* Image is stored in hardware format in a buffer managed by the