diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc index dbd9405a..fe27c831 100644 --- a/Dllmain/BuildNo.rc +++ b/Dllmain/BuildNo.rc @@ -1 +1 @@ -#define BUILD_NUMBER 7126 +#define BUILD_NUMBER 7127 diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp index bce3deab..04a837fa 100644 --- a/ddraw/IDirectDrawSurfaceX.cpp +++ b/ddraw/IDirectDrawSurfaceX.cpp @@ -6308,6 +6308,7 @@ HRESULT m_IDirectDrawSurfaceX::CopySurface(m_IDirectDrawSurfaceX* pSourceSurface // Use D3DXLoadSurfaceFromSurface to copy the surface if (!IsUsingEmulation() && !IsColorKey && !IsMirrorLeftRight && !IsMirrorUpDown && + pSourceSurface->surface.Type == surface.Type && // D3DXLoadSurfaceFromSurface is very slow when copying from offplain to texture !surface.UsingSurfaceMemory && !pSourceSurface->surface.UsingSurfaceMemory && (pSourceSurface->IsPalette() == IsPalette())) {