Mesa (9.2): r600g: fix texture buffer object cache flushing

[Carl Worth]

Module: Mesa
Branch: 9.2
Commit: 42b6d94537660c311b8d0dd80e36bcfa6b30a8bb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42b6d94537660c311b8d0dd80e36bcfa6b30a8bb

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Sep 19 15:07:41 2013 +0200

r600g: fix texture buffer object cache flushing

Cc: "9.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f7d004b9ad0deec99d465600ed7df683146b6cd7)

Conflicts:
	src/gallium/drivers/r600/r600_hw_context.c

---

 src/gallium/drivers/r600/r600_hw_context.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index 266d5f5..4a8f8ae 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -247,7 +247,10 @@ void r600_flush_emit(struct r600_context *rctx)
 							: S_0085F0_TC_ACTION_ENA(1);
 	}
 	if (rctx->flags & R600_CONTEXT_INV_TEX_CACHE) {
-		cp_coher_cntl |= S_0085F0_TC_ACTION_ENA(1);
+		/* Textures use the texture cache.
+		 * Texture buffer objects use the vertex cache. */
+		cp_coher_cntl |= S_0085F0_TC_ACTION_ENA(1) |
+				 (rctx->has_vertex_cache ? S_0085F0_VC_ACTION_ENA(1) : 0);
 	}
 
 	/* Don't use the DB CP COHER logic on r6xx.