Ivan Gyurdiev : wined3d: Correct vtrace usage.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Apr 21 05:02:44 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 74117baa6c4235d60312441101953915539c9a2f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=74117baa6c4235d60312441101953915539c9a2f

Author: Ivan Gyurdiev <ivg2 at cornell.edu>
Date:   Fri Apr 21 04:01:34 2006 -0400

wined3d: Correct vtrace usage.

---

 dlls/wined3d/device.c   |    8 ++++----
 dlls/wined3d/drawprim.c |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 790ac12..12d759b 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -308,17 +308,17 @@ #undef APPLY_STATE
            glDisable(GL_POINT_SMOOTH);
 
            /* Centre the texture on the vertex */
-           VTRACE("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n");
+           VTRACE(("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"));
            glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
 
-           VTRACE("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n");
+           VTRACE(("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"));
            glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
            checkGLcall("glTexEnvf(...)");
-           VTRACE("glEnable( GL_POINT_SPRITE_ARB )\n");
+           VTRACE(("glEnable( GL_POINT_SPRITE_ARB )\n"));
            glEnable( GL_POINT_SPRITE_ARB );
            checkGLcall("glEnable(...)");
         } else {
-           VTRACE("glDisable( GL_POINT_SPRITE_ARB )\n");
+           VTRACE(("glDisable( GL_POINT_SPRITE_ARB )\n"));
            glDisable( GL_POINT_SPRITE_ARB );
            checkGLcall("glEnable(...)");
         }
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index c2c8004..8753203 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -957,7 +957,7 @@ #if 0
 #endif
 
 
-            VTRACE(("glWeightPointerARB(%ld, GL_FLOAT, %ld, %p)\n",
+            VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %ld, %p)\n",
                 WINED3D_ATR_SIZE(blendWeights) ,
                 sd->u.s.blendWeights.dwStride,
                 sd->u.s.blendWeights.lpData));
@@ -1484,7 +1484,7 @@ static void drawStridedSlow(IWineD3DDevi
 		     D3DCOLOR_B_G(diffuseColor),
 		     D3DCOLOR_B_B(diffuseColor),
 		     D3DCOLOR_B_A(diffuseColor));
-            VTRACE(("glColor4ub: r,g,b,a=%u,%u,%u,%u\n", 
+            VTRACE(("glColor4ub: r,g,b,a=%lu,%lu,%lu,%lu\n", 
                     D3DCOLOR_B_R(diffuseColor),
 		    D3DCOLOR_B_G(diffuseColor),
 		    D3DCOLOR_B_B(diffuseColor),
@@ -1495,7 +1495,7 @@ static void drawStridedSlow(IWineD3DDevi
 
         /* Specular ------------------------------- */
         if (sd->u.s.specular.lpData != NULL) {
-            VTRACE(("glSecondaryColor4ub: r,g,b=%u,%u,%u\n", 
+            VTRACE(("glSecondaryColor4ub: r,g,b=%lu,%lu,%lu\n", 
                     D3DCOLOR_B_R(specularColor), 
                     D3DCOLOR_B_G(specularColor), 
                     D3DCOLOR_B_B(specularColor)));




More information about the wine-cvs mailing list