Attachment 1759 Details for Bug 1648 – slightly different projtex fix

[patch] slightly different projtex fix

r200_projtex_fix3.diff (text/plain), 2.05 KB, created by Roland Scheidegger on 2005-01-27 08:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2005-01-27 08:31:55 UTC

Size: 2.05 KB

patch

obsolete

>Index: 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
>--- r200_swtcl.c	23 Nov 2004 18:49:18 -0000	1.21
>+++ r200_swtcl.c	27 Jan 2005 15:47:08 -0000
>@@ -106,7 +106,7 @@
>    /* EMIT_ATTR's must be in order as they tell t_vertex.c how to
>     * build up a hardware vertex.
>     */
>-   if ( !rmesa->swtcl.needproj ) {
>+   if ( !rmesa->swtcl.needproj || (index & _TNL_BITS_TEX_ANY)) { /* need w coord for projected textures */
>       EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F, R200_VTX_XY | R200_VTX_Z0 | R200_VTX_W0 );
>       offset = 4;
>    }
>@@ -230,11 +230,18 @@
> 	|| (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
>       rmesa->swtcl.needproj = GL_TRUE;
>       vte |= R200_VTX_XY_FMT | R200_VTX_Z_FMT;
>-      vap |= R200_VAP_FORCE_W_TO_ONE;
>+      vte &= ~R200_VTX_W0_FMT;
>+      if (tnl->render_inputs & _TNL_BITS_TEX_ANY) {
>+	 vap &= ~R200_VAP_FORCE_W_TO_ONE;
>+      }
>+      else {
>+	 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 +758,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: 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
>--- r200_tcl.c	14 Dec 2004 09:11:53 -0000	1.17
>+++ r200_tcl.c	27 Jan 2005 15:47:09 -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.