Attachment 40217 Details for Bug 31544 – set texImage->TexFormat field in radeonSetTexBuffer2()

[patch] set texImage->TexFormat field in radeonSetTexBuffer2()

radeon_texstate.c.patch (text/plain), 1.16 KB, created by Brian Paul on 2010-11-11 16:40:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2010-11-11 16:40:36 UTC

Size: 1.16 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
>index f852116..05c765c 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
>@@ -705,18 +705,24 @@ void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_form
> 	t->override_offset = 0;
> 	switch (rb->cpp) {
> 	case 4:
>-		if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
>+		if (texture_format == __DRI_TEXTURE_FORMAT_RGB) {
> 			t->pp_txformat = tx_table[MESA_FORMAT_RGB888].format;
>-		else
>+			texImage->TexFormat = MESA_FORMAT_RGB888;
>+		}
>+		else {
> 			t->pp_txformat = tx_table[MESA_FORMAT_ARGB8888].format;
>+			texImage->TexFormat = MESA_FORMAT_ARGB8888;
>+		}
> 		t->pp_txfilter |= tx_table[MESA_FORMAT_ARGB8888].filter;
> 		break;
> 	case 3:
> 	default:
>+		texImage->TexFormat = MESA_FORMAT_RGB888;
> 		t->pp_txformat = tx_table[MESA_FORMAT_RGB888].format;
> 		t->pp_txfilter |= tx_table[MESA_FORMAT_RGB888].filter;
> 		break;
> 	case 2:
>+		texImage->TexFormat = MESA_FORMAT_RGB565;
> 		t->pp_txformat = tx_table[MESA_FORMAT_RGB565].format;
> 		t->pp_txfilter |= tx_table[MESA_FORMAT_RGB565].filter;
> 		break;

Actions: View | Splinter Review

Attachments on bug 31544: 40198 | 40205 | 40210 | 40216 | 40217 | 40233

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.