Mesa (master): r300: set gl_texture_image:: TexFormat field in r300SetTexBuffer2()

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Nov 15 09:24:42 2010 -0700

r300: set gl_texture_image::TexFormat field in r300SetTexBuffer2()

See https://bugs.freedesktop.org/show_bug.cgi?id=31544

Note: this is a candidate for the 7.9 branch

---

 src/mesa/drivers/dri/r300/r300_texstate.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 0116c5d..a4fbd99 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -481,18 +481,24 @@ void r300SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format
 	pitch_val = rb->pitch;
 	switch (rb->cpp) {
 	case 4:
-		if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
+		if (texture_format == __DRI_TEXTURE_FORMAT_RGB) {
+			texImage->TexFormat = MESA_FORMAT_RGB888;
 			t->pp_txformat = R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8);
-		else
+		}
+		else {
+			texImage->TexFormat = MESA_FORMAT_ARGB8888;
 			t->pp_txformat = R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8);
+		}
 		pitch_val /= 4;
 		break;
 	case 3:
 	default:
+		texImage->TexFormat = MESA_FORMAT_RGB888;
 		t->pp_txformat = R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8);
 		pitch_val /= 4;
 		break;
 	case 2:
+		texImage->TexFormat = MESA_FORMAT_RGB565;
 		t->pp_txformat = R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5);
 		pitch_val /= 2;
 		break;