Attachment 29700 Details for Bug 22741 – fix v2

[patch] fix v2

fog_and_wpos.patch (text/plain), 1.48 KB, created by Maciej Cencora on 2009-09-19 09:45:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maciej Cencora

Created: 2009-09-19 09:45:03 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
>index 469c278..0bdc90b 100644
>--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
>+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
>@@ -99,8 +99,8 @@ static void insert_WPOS_trailer(struct r300_fragment_program_compiler *compiler,
> {
> 	int i;
> 
>+	fp->wpos_attr = FRAG_ATTRIB_MAX;
> 	if (!(compiler->Base.Program.InputsRead & FRAG_BIT_WPOS)) {
>-		fp->wpos_attr = FRAG_ATTRIB_MAX;
> 		return;
> 	}
> 
>@@ -112,6 +112,13 @@ static void insert_WPOS_trailer(struct r300_fragment_program_compiler *compiler,
> 		}
> 	}
> 
>+	/* No free texcoord found, fall-back to software rendering */
>+	if (fp->wpos_attr == FRAG_ATTRIB_MAX)
>+	{
>+		compiler->Base.Error = 1;
>+		return;
>+	}
>+
> 	rc_transform_fragment_wpos(&compiler->Base, FRAG_ATTRIB_WPOS, fp->wpos_attr);
> }
> 
>@@ -127,8 +134,8 @@ static void rewriteFog(struct r300_fragment_program_compiler *compiler, struct r
> 	struct prog_src_register src;
> 	int i;
> 
>+	fp->fog_attr = FRAG_ATTRIB_MAX;
> 	if (!(compiler->Base.Program.InputsRead & FRAG_BIT_FOGC)) {
>-		fp->fog_attr = FRAG_ATTRIB_MAX;
> 		return;
> 	}
> 
>@@ -140,6 +147,13 @@ static void rewriteFog(struct r300_fragment_program_compiler *compiler, struct r
> 		}
> 	}
> 
>+	/* No free texcoord found, fall-back to software rendering */
>+	if (fp->fog_attr == FRAG_ATTRIB_MAX)
>+	{
>+		compiler->Base.Error = 1;
>+		return;
>+	}
>+
> 	memset(&src, 0, sizeof(src));
> 	src.File = PROGRAM_INPUT;
> 	src.Index = fp->fog_attr;

Actions: View | Splinter Review

Attachments on bug 22741: 29697 | 29700

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.