Attachment 1625 Details for Bug 1648 – r200_projtex_fix2.diff.txt

[patch] r200_projtex_fix2.diff.txt

r200_projtex_fix2.diff.txt (text/plain), 2.33 KB, created by Andreas Stenglein on 2005-01-03 13:55:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Stenglein

Created: 2005-01-03 13:55:52 UTC

Size: 2.33 KB

patch

obsolete

>Index: Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c,v
>retrieving revision 1.21
>diff -u -r1.21 r200_swtcl.c
>--- Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c	23 Nov 2004 18:49:18 -0000	1.21
>+++ Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c	3 Jan 2005 21:46:10 -0000
>@@ -110,6 +110,16 @@
>       EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F, R200_VTX_XY | R200_VTX_Z0 | R200_VTX_W0 );
>       offset = 4;
>    }
>+   else if (index & _TNL_BITS_TEX_ANY) {	/* for projtex */
>+      GLuint vap = rmesa->hw.vap.cmd[VAP_SE_VAP_CNTL];
>+      vap &= ~R200_VAP_FORCE_W_TO_ONE;
>+      if (vap != rmesa->hw.vap.cmd[VAP_SE_VAP_CNTL]) {
>+	 R200_STATECHANGE( rmesa, vap );
>+	 rmesa->hw.vap.cmd[VAP_SE_VAP_CNTL] = vap;
>+      }
>+      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F, R200_VTX_XY | R200_VTX_Z0 | R200_VTX_W0 );
>+      offset = 4;
>+   }
>    else {
>       EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_3F, R200_VTX_XY | R200_VTX_Z0 );
>       offset = 3;
>@@ -230,11 +240,13 @@
> 	|| (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
>       rmesa->swtcl.needproj = GL_TRUE;
>       vte |= R200_VTX_XY_FMT | R200_VTX_Z_FMT;
>+      vte &= ~R200_VTX_W0_FMT;
>       vap |= R200_VAP_FORCE_W_TO_ONE;
>    }
>    else {
>       rmesa->swtcl.needproj = GL_FALSE;
>       vte &= ~(R200_VTX_XY_FMT | R200_VTX_Z_FMT);
>+      vte |= R200_VTX_W0_FMT;
>       vap &= ~R200_VAP_FORCE_W_TO_ONE;
>    }
> 
>@@ -751,6 +763,7 @@
>       GLuint vap = rmesa->hw.vap.cmd[VAP_SE_VAP_CNTL];
> 
>       vte &= ~(R200_VTX_XY_FMT | R200_VTX_Z_FMT);
>+      vte |= R200_VTX_W0_FMT;
>       vap &= ~R200_VAP_FORCE_W_TO_ONE;
> 
>       rmesa->swtcl.vertex_size = 5;
>Index: Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c,v
>retrieving revision 1.17
>diff -u -r1.17 r200_tcl.c
>--- Mesa/src/mesa/drivers/dri/r200/r200_tcl.c	14 Dec 2004 09:11:53 -0000	1.17
>+++ Mesa/src/mesa/drivers/dri/r200/r200_tcl.c	3 Jan 2005 21:46:11 -0000
>@@ -560,6 +560,7 @@
>    
>    R200_STATECHANGE( rmesa, vte );
>    rmesa->hw.vte.cmd[VTE_SE_VTE_CNTL] &= ~(R200_VTX_XY_FMT|R200_VTX_Z_FMT);
>+   rmesa->hw.vte.cmd[VTE_SE_VTE_CNTL] |= R200_VTX_W0_FMT;
> 
>    if (R200_DEBUG & DEBUG_FALLBACKS) 
>       fprintf(stderr, "R200 end tcl fallback\n");
>

Actions: View | Splinter Review

Attachments on bug 1648: 1609 | 1625 | 1759

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.