Attachment 40233 Details for Bug 31544 – set texImage->TexFormat field in r600SetTexBuffer2()

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

r600_texstate.c.patch (text/plain), 1.66 KB, created by Brian Paul on 2010-11-12 06:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2010-11-12 06:25:08 UTC

Size: 1.66 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
>index fd928cf..f371244 100644
>--- a/src/mesa/drivers/dri/r600/r600_texstate.c
>+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
>@@ -1060,6 +1060,7 @@ void r600SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
> 	switch (rb->cpp) {
> 	case 4:
> 		if (glx_texture_format == __DRI_TEXTURE_FORMAT_RGB) {
>+			texImage->TexFormat = MESA_FORMAT_RGB888;
> 			SETfield(t->SQ_TEX_RESOURCE1, FMT_8_8_8_8,
> 				 SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
> 
>@@ -1072,6 +1073,7 @@ void r600SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
> 			SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_1,
> 				 SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
> 		} else {
>+			texImage->TexFormat = MESA_FORMAT_ARGB8888;
> 			SETfield(t->SQ_TEX_RESOURCE1, FMT_8_8_8_8,
> 				 SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
> 
>@@ -1089,6 +1091,7 @@ void r600SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
> 	case 3:
> 	default:
> 		// FMT_8_8_8 ???
>+		texImage->TexFormat = MESA_FORMAT_RGB888;
> 		SETfield(t->SQ_TEX_RESOURCE1, FMT_8_8_8_8,
> 			 SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
> 
>@@ -1103,6 +1106,7 @@ void r600SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
> 		pitch_val /= 4;
> 		break;
> 	case 2:
>+		texImage->TexFormat = MESA_FORMAT_RGB565;
> 		SETfield(t->SQ_TEX_RESOURCE1, FMT_5_6_5,
> 			 SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
>

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.