Attachment 8637 Details for Bug 9910 – fix up wpos handling in r300 vertex programs

[patch] fix up wpos handling in r300 vertex programs

r300wpos.diff (text/plain), 2.71 KB, created by Roland Scheidegger on 2007-02-08 12:03:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2007-02-08 12:03:07 UTC

Size: 2.71 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/r300_vertexprog.c b/src/mesa/drivers/dri/r300/r300_vertexprog.c
>index c08c987..a6dbb95 100644
>--- a/src/mesa/drivers/dri/r300/r300_vertexprog.c
>+++ b/src/mesa/drivers/dri/r300/r300_vertexprog.c
>@@ -960,26 +960,23 @@ #endif					
> 
> static void insert_wpos(struct r300_vertex_program *vp,
> 		       struct gl_program *prog,
>-		       GLint pos)
>+		       GLuint temp_index)
> {
> 
> 	GLint tokens[6] = { STATE_INTERNAL, STATE_R300_WINDOW_DIMENSION, 0, 0, 0, 0 };
> 	struct prog_instruction *vpi;
> 	struct prog_instruction *vpi_insert;
>-	GLuint temp_index;
> 	GLuint window_index;
> 	int i = 0;
> 	
> 	vpi = malloc((prog->NumInstructions + 5) * sizeof(struct prog_instruction));
>-	memcpy(vpi, prog->Instructions, (pos+1) * sizeof(struct prog_instruction));
>+	/* all but END */
>+	memcpy(vpi, prog->Instructions, (prog->NumInstructions - 1) * sizeof(struct prog_instruction));
>+	/* END */
>+	memcpy(&vpi[prog->NumInstructions + 4], &prog->Instructions[prog->NumInstructions - 1],
>+		sizeof(struct prog_instruction));
> 	
>-	vpi_insert = &vpi[pos];
>-
>-	/* make a copy before outputting VERT_RESULT_HPOS */
>-	vpi_insert->DstReg.File = vpi_insert->SrcReg[2].File;
>-	vpi_insert->DstReg.Index = temp_index = vpi_insert->SrcReg[2].Index;
>-	
>-	vpi_insert++;
>+	vpi_insert = &vpi[prog->NumInstructions - 1];
> 	memset(vpi_insert, 0, 5 * sizeof(struct prog_instruction));
> 
> 	vpi_insert[i].Opcode = OPCODE_MOV;
>@@ -1062,8 +1059,6 @@ static void insert_wpos(struct r300_vert
> 	vpi_insert[i].SrcReg[1].Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_ONE, SWIZZLE_ONE);
> 	i++;
> 
>-	memcpy(&vpi_insert[i], &prog->Instructions[pos+1], (prog->NumInstructions-(pos+1)) * sizeof(struct prog_instruction));
>-
> 	free(prog->Instructions);
> 
> 	prog->Instructions = vpi;
>@@ -1072,24 +1067,23 @@ static void insert_wpos(struct r300_vert
> 	vpi = &prog->Instructions[prog->NumInstructions-1];
> 
> 	assert(vpi->Opcode == OPCODE_END);
>-	/* we need position, don't we ? :) */
>-	prog->InputsRead |= (1 << VERT_ATTRIB_POS);
> }
> 
> static void pos_as_texcoord(struct r300_vertex_program *vp,
> 			    struct gl_program *prog)
> {
> 	struct prog_instruction *vpi;
>-	int pos = 0;
>-	
>-	for(vpi = prog->Instructions; vpi->Opcode != OPCODE_END; vpi++, pos++){
>+	GLuint tempregi = prog->NumTemporaries + 1;
>+	/* should fix up number of (native) temps maybe? */
>+
>+	for(vpi = prog->Instructions; vpi->Opcode != OPCODE_END; vpi++){
> 		if( vpi->DstReg.File == PROGRAM_OUTPUT &&
> 		    vpi->DstReg.Index == VERT_RESULT_HPOS ){
>-			insert_wpos(vp, prog, pos);
>-			break;
>+			vpi->DstReg.File = PROGRAM_TEMPORARY;
>+			vpi->DstReg.Index = tempregi;
> 		}
> 	}
>-
>+	insert_wpos(vp, prog, tempregi);
> }
> 
> static struct r300_vertex_program *build_program(struct r300_vertex_program_key *wanted_key,

Actions: View | Splinter Review

Attachments on bug 9910: 8632 | 8637 | 8740 | 8763 | 8764 | 8765

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.