Add fps debug channel, so we can see how the d3d code is performing and

dlls/d3d8/d3d8_private.h

@@ -326,10 +326,11 @@ struct IDirect3DDevice8Impl
     UINT                          currentPalette;
 
     /* Optimization */
-    D3DMATRIX                     lastProj;
-    D3DMATRIX                     lastView;
-    D3DMATRIX                     lastWorld0;
-    D3DMATRIX                     lastTexTrans[8];
+    BOOL                          modelview_valid;
+    BOOL                          proj_valid;
+    BOOL                          view_ident;        /* true iff view matrix is identity                */
+    BOOL                          last_was_rhw;      /* true iff last draw_primitive was in xyzrhw mode */
+
 
     /* OpenGL related */
     GLXContext                    glCtx;

dlls/d3d8/directx.c

@@ -1083,6 +1083,12 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
        IDirect3DDevice8Impl_SetViewport((LPDIRECT3DDEVICE8) object, &vp);
     }
 
+    /* Initialize the current view state */
+    object->modelview_valid = 1;
+    object->proj_valid = 0;
+    object->view_ident = 1;
+    object->last_was_rhw = 0;
+
     TRACE("(%p,%d) All defaults now set up, leaving CreateDevice\n", This, Adapter);
     return D3D_OK;
 }

dlls/d3d8/drawprim.c

@@ -172,11 +172,16 @@ BOOL primitiveInitState(LPDIRECT3DDEVICE8 iface, BOOL vtx_transformed, BOOL vtx_
         isLightingOn = glIsEnabled(GL_LIGHTING);
         glDisable(GL_LIGHTING);
         checkGLcall("glDisable(GL_LIGHTING);");
-        TRACE("Enabled lighting as no normals supplied, old state = %d\n", isLightingOn);
+        TRACE("Disabled lighting as no normals supplied, old state = %d\n", isLightingOn);
     }
 
     if (vtx_transformed) {
+
+        /* If the last draw was transformed as well, no need to reapply all the matrixes */
+        if (!This->last_was_rhw) {
+
             double X, Y, height, width, minZ, maxZ;
+            This->last_was_rhw = TRUE;
 
             /* Transformed already into viewport coordinates, so we do not need transform
                matrices. Reset all matrices to identity and leave the default matrix in world 
@@ -206,17 +211,33 @@ BOOL primitiveInitState(LPDIRECT3DDEVICE8 iface, BOOL vtx_transformed, BOOL vtx_
                a pixel (See comment above glTranslate below)                         */
             glTranslatef(0.5, 0.5, 0);
             checkGLcall("glTranslatef(0.5, 0.5, 0)");
+        }
 
     } else {
 
         /* Untransformed, so relies on the view and projection matrices */
+
+        if (This->last_was_rhw || !This->modelview_valid) {
+            /* Only reapply when have to */
+            This->modelview_valid = TRUE;
             glMatrixMode(GL_MODELVIEW);
             checkGLcall("glMatrixMode");
+
+            /* In the general case, the view matrix is the identity matrix */
+            if (This->view_ident) {
+                glLoadMatrixf((float *) &This->StateBlock->transforms[D3DTS_WORLDMATRIX(0)].u.m[0][0]);
+                checkGLcall("glLoadMatrixf");
+            } else {
                 glLoadMatrixf((float *) &This->StateBlock->transforms[D3DTS_VIEW].u.m[0][0]);
                 checkGLcall("glLoadMatrixf");
                 glMultMatrixf((float *) &This->StateBlock->transforms[D3DTS_WORLDMATRIX(0)].u.m[0][0]);
                 checkGLcall("glMultMatrixf");
+            }
+        }
 
+        if (This->last_was_rhw || !This->proj_valid) {
+            /* Only reapply when have to */
+            This->proj_valid = TRUE;
             glMatrixMode(GL_PROJECTION);
             checkGLcall("glMatrixMode");
 
@@ -232,7 +253,9 @@ BOOL primitiveInitState(LPDIRECT3DDEVICE8 iface, BOOL vtx_transformed, BOOL vtx_
             checkGLcall("glTranslatef (1.0/width, -1.0/height, 0)");
             glMultMatrixf((float *) &This->StateBlock->transforms[D3DTS_PROJECTION].u.m[0][0]);
             checkGLcall("glLoadMatrixf");
+        }
 
+        This->last_was_rhw = FALSE;
     }
     return isLightingOn;
 }