Don't update extra pixels in byte aligned texture

#260
elishacloud · May 9, 2024 · 3054a05 · 3054a05
1 parent 0d5dcaa
commit 3054a05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7010 
+#define BUILD_NUMBER 7011 
diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
@@ -4814,18 +4814,12 @@ void m_IDirectDrawSurfaceX::LockEmuLock(LPRECT lpDestRect, LPDDSURFACEDESC2 lpDD
 		DWORD InPitch = EmuLock.Pitch;
 		BYTE* OutAddr = EmuLock.Mem.data();
 		DWORD OutPitch = EmuLock.NewPitch;
-		if (InPitch == OutPitch)
+		size_t MemWidth = (EmuLock.BBP / 8) * EmuLock.Width;
+		for (DWORD x = 0; x < EmuLock.Height; x++)
 		{
-			memcpy(OutAddr, InAddr, OutPitch * EmuLock.Height);
-		}
-		else
-		{
-			for (DWORD x = 0; x < EmuLock.Height; x++)
-			{
-				memcpy(OutAddr, InAddr, OutPitch);
-				InAddr += InPitch;
-				OutAddr += OutPitch;
-			}
+			memcpy(OutAddr, InAddr, MemWidth);
+			InAddr += InPitch;
+			OutAddr += OutPitch;
 		}
 
 		// Mark as byte align locked
@@ -4843,18 +4837,12 @@ void m_IDirectDrawSurfaceX::UnlockEmuLock()
 		DWORD InPitch = EmuLock.NewPitch;
 		BYTE* OutAddr = (BYTE*)EmuLock.Addr;
 		DWORD OutPitch = EmuLock.Pitch;
-		if (InPitch == OutPitch)
+		size_t MemWidth = (EmuLock.BBP / 8) * EmuLock.Width;
+		for (DWORD x = 0; x < EmuLock.Height; x++)
 		{
-			memcpy(OutAddr, InAddr, OutPitch * EmuLock.Height);
-		}
-		else
-		{
-			for (DWORD x = 0; x < EmuLock.Height; x++)
-			{
-				memcpy(OutAddr, InAddr, OutPitch);
-				InAddr += InPitch;
-				OutAddr += OutPitch;
-			}
+			memcpy(OutAddr, InAddr, MemWidth);
+			InAddr += InPitch;
+			OutAddr += OutPitch;
 		}
 
 		EmuLock.Locked = false;