DPRINTF->TRACE dlls/ddraw

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Change Log: Replace DPRINTF with TRACE

Files changed: dlls/ddrawd3dexecutebuffer.c
               dlls/ddrawd3dvertexbuffer.c
               dlls/ddrawmain.c

--

Tony Lambregts









Index: d3dexecutebuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3dexecutebuffer.c,v
retrieving revision 1.24
diff -u -r1.24 d3dexecutebuffer.c
--- d3dexecutebuffer.c	23 Jan 2003 21:32:36 -0000	1.24
+++ d3dexecutebuffer.c	14 Mar 2003 22:52:50 -0000
@@ -154,22 +154,22 @@
         if (TRACE_ON(ddraw)) {				\
 	    /* Wireframe */				\
 	    if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)	\
-	        DPRINTF("EDGEENABLE1 ");		\
+	        TRACE("EDGEENABLE1 ");		\
 	    if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2)	\
-	        DPRINTF("EDGEENABLE2 ");		\
+	        TRACE("EDGEENABLE2 ");		\
 	    if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)	\
-	        DPRINTF("EDGEENABLE3 ");		\
+	        TRACE("EDGEENABLE3 ");		\
 							\
 	    /* Strips / Fans */				\
 	    if (ci->wFlags == D3DTRIFLAG_EVEN)		\
-	        DPRINTF("EVEN ");			\
+	        TRACE("EVEN ");			\
 	    if (ci->wFlags == D3DTRIFLAG_ODD)		\
-	        DPRINTF("ODD ");			\
+	        TRACE("ODD ");			\
 	    if (ci->wFlags == D3DTRIFLAG_START)		\
-	        DPRINTF("START ");			\
+	        TRACE("START ");			\
 	    if ((ci->wFlags > 0) && (ci->wFlags < 30))	\
-	        DPRINTF("STARTFLAT(%d) ", ci->wFlags);	\
-	    DPRINTF("\n");				\
+	        TRACE("STARTFLAT(%d) ", ci->wFlags);	\
+	    TRACE("\n");				\
         }						\
 							\
         /* Draw the triangle */				\
@@ -461,18 +461,18 @@
 		    TRACE("  Flags : ");
 		    if (TRACE_ON(ddraw)) {
 		        if (ci->dwFlags & D3DPROCESSVERTICES_COPY)
-			    DPRINTF("COPY ");
+			    TRACE("COPY ");
 			if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
-			    DPRINTF("NOCOLOR ");
+			    TRACE("NOCOLOR ");
 			if (ci->dwFlags == D3DPROCESSVERTICES_OPMASK)
-			    DPRINTF("OPMASK ");
+			    TRACE("OPMASK ");
 			if (ci->dwFlags & D3DPROCESSVERTICES_TRANSFORM)
-			    DPRINTF("TRANSFORM ");
+			    TRACE("TRANSFORM ");
 			if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT)
-			    DPRINTF("TRANSFORMLIGHT ");
+			    TRACE("TRANSFORMLIGHT ");
 			if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
-			    DPRINTF("UPDATEEXTENTS ");
-			DPRINTF("\n");
+			    TRACE("UPDATEEXTENTS ");
+			TRACE("\n");
 		    }
 		    
 		    /* This is where doing Direct3D on top on OpenGL is quite difficult.
Index: d3dvertexbuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3dvertexbuffer.c,v
retrieving revision 1.12
diff -u -r1.12 d3dvertexbuffer.c
--- d3dvertexbuffer.c	12 Feb 2003 21:40:25 -0000	1.12
+++ d3dvertexbuffer.c	14 Mar 2003 22:52:50 -0000
@@ -365,12 +365,12 @@
 	    if (dwVertexTypeDesc & D3DFVF_NORMAL) { 
 	        D3DVALUE *normal = 
 		  (D3DVALUE *) (((char *) lpStrideData->normal.lpvData) + i * lpStrideData->normal.dwStride);	    
-		DPRINTF(" / %f %f %f", normal[0], normal[1], normal[2]);
+		TRACE(" / %f %f %f", normal[0], normal[1], normal[2]);
 	    }
 	    if (dwVertexTypeDesc & D3DFVF_DIFFUSE) {
 	        DWORD *color_d = 
 		  (DWORD *) (((char *) lpStrideData->diffuse.lpvData) + i * lpStrideData->diffuse.dwStride);
-		DPRINTF(" / %02lx %02lx %02lx %02lx",
+		TRACE(" / %02lx %02lx %02lx %02lx",
 			(*color_d >> 16) & 0xFF,
 			(*color_d >>  8) & 0xFF,
 			(*color_d >>  0) & 0xFF,
@@ -379,7 +379,7 @@
 	    if (dwVertexTypeDesc & D3DFVF_SPECULAR) { 
 	        DWORD *color_s = 
 		  (DWORD *) (((char *) lpStrideData->specular.lpvData) + i * lpStrideData->specular.dwStride);
-		DPRINTF(" / %02lx %02lx %02lx %02lx",
+		TRACE(" / %02lx %02lx %02lx %02lx",
 			(*color_s >> 16) & 0xFF,
 			(*color_s >>  8) & 0xFF,
 			(*color_s >>  0) & 0xFF,
@@ -389,9 +389,9 @@
 	        D3DVALUE *tex_coord =
 		  (D3DVALUE *) (((char *) lpStrideData->textureCoords[tex_index].lpvData) + 
 				i * lpStrideData->textureCoords[tex_index].dwStride);
-		DPRINTF(" / %f %f", tex_coord[0], tex_coord[1]);
+		TRACE(" / %f %f", tex_coord[0], tex_coord[1]);
 	    }
-	    DPRINTF("\n");
+	    TRACE("\n");
 	}
     }
 
@@ -419,8 +419,8 @@
     TRACE("(%p/%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx)\n", This, iface, dwVertexOp, dwDestIndex, dwCount, lpSrcBuffer, dwSrcIndex, lpD3DDevice, dwFlags);    
 
     if (TRACE_ON(ddraw)) {
-        DPRINTF(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
-	DPRINTF(" - flags             : "); dump_D3DPV(dwFlags);
+        TRACE(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
+	TRACE(" - flags             : "); dump_D3DPV(dwFlags);
     }
 
     if ((dwVertexOp & D3DVOP_TRANSFORM) == 0) return DDERR_INVALIDPARAMS;
@@ -446,9 +446,9 @@
 
     TRACE("(%p/%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx)\n", This, iface, dwVertexOp, dwDestIndex, dwCount, lpStrideData, dwVertexTypeDesc, lpD3DDevice, dwFlags);
     if (TRACE_ON(ddraw)) {
-        DPRINTF(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
-	DPRINTF(" - flags             : "); dump_D3DPV(dwFlags);
-	DPRINTF(" - vertex format     : "); dump_flexible_vertex(dwVertexTypeDesc);
+        TRACE(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
+	TRACE(" - flags             : "); dump_D3DPV(dwFlags);
+	TRACE(" - vertex format     : "); dump_flexible_vertex(dwVertexTypeDesc);
     }
 
     if ((dwVertexOp & D3DVOP_TRANSFORM) == 0) return DDERR_INVALIDPARAMS;
Index: main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/main.c,v
retrieving revision 1.30
diff -u -r1.30 main.c
--- main.c	13 Jan 2003 18:30:47 -0000	1.30
+++ main.c	14 Mar 2003 22:52:51 -0000
@@ -65,14 +65,14 @@
     TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags);
 
     if (TRACE_ON(ddraw)) {
-	DPRINTF("  Flags : ");
+	TRACE("  Flags : ");
 	if (dwFlags & DDENUM_ATTACHEDSECONDARYDEVICES)
-	    DPRINTF("DDENUM_ATTACHEDSECONDARYDEVICES ");
+	    TRACE("DDENUM_ATTACHEDSECONDARYDEVICES ");
 	if (dwFlags & DDENUM_DETACHEDSECONDARYDEVICES)
-	    DPRINTF("DDENUM_DETACHEDSECONDARYDEVICES ");
+	    TRACE("DDENUM_DETACHEDSECONDARYDEVICES ");
 	if (dwFlags & DDENUM_NONDISPLAYDEVICES)
-	    DPRINTF("DDENUM_NONDISPLAYDEVICES ");
-	DPRINTF("\n");
+	    TRACE("DDENUM_NONDISPLAYDEVICES ");
+	TRACE("\n");
     }
 
     for (i=0; i<DDRAW_num_drivers; i++)

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux