From 43205d26d637af75caa4c50c600a3be870101f07 Mon Sep 17 00:00:00 2001
From: Elisha Riedlinger <elisha@novicemail.com>
Date: Sat, 7 Sep 2024 14:40:20 -0700
Subject: [PATCH] Disable byte alignment by default

---
 Dllmain/BuildNo.rc         | 2 +-
 Settings/AllSettings.ini   | 2 +-
 Settings/Settings.h        | 4 ++--
 Settings/Settings.ini      | 2 +-
 ddraw/IDirect3DTypes.cpp   | 2 +-
 ddraw/IDirectDrawTypes.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
index 4db10b60..47a63f45 100644
--- a/Dllmain/BuildNo.rc
+++ b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7120 
+#define BUILD_NUMBER 7121 
diff --git a/Settings/AllSettings.ini b/Settings/AllSettings.ini
index a172c93e..f13a0bb7 100644
--- a/Settings/AllSettings.ini
+++ b/Settings/AllSettings.ini
@@ -61,7 +61,7 @@ DdrawEmulateLock           = 0
 DdrawForceMipMapAutoGen    = 0
 DdrawFlipFillColor         = 0
 DdrawFixByteAlignment      = 0
-DdrawDisableByteAlignment  = 0
+DdrawEnableByteAlignment   = 0
 DdrawRemoveScanlines       = 0
 DdrawRemoveInterlacing     = 0
 DdrawReadFromGDI           = 0
diff --git a/Settings/Settings.h b/Settings/Settings.h
index aaee8484..28d09b92 100644
--- a/Settings/Settings.h
+++ b/Settings/Settings.h
@@ -27,7 +27,7 @@
 	visit(DdrawClippedHeight) \
 	visit(DdrawCustomWidth) \
 	visit(DdrawCustomHeight) \
-	visit(DdrawDisableByteAlignment) \
+	visit(DdrawEnableByteAlignment) \
 	visit(DdrawDisableDirect3DCaps) \
 	visit(DdrawEmulateLock) \
 	visit(DdrawForceMipMapAutoGen) \
@@ -213,7 +213,7 @@ struct CONFIG
 	bool DDrawCompatNoProcAffinity = false;		// Disables DDrawCompat single processor affinity
 	bool DdrawAutoFrameSkip = false;			// Automatically skips frames to reduce input lag
 	DWORD DdrawFixByteAlignment = false;		// Fixes lock with surfaces that have unaligned byte sizes, 1) just byte align, 2) byte align + D3DTEXF_NONE, 3) byte align + D3DTEXF_LINEAR
-	bool DdrawDisableByteAlignment = false;		// Disables 32bit / 64bit byte alignment
+	bool DdrawEnableByteAlignment = false;		// Disables 32bit / 64bit byte alignment
 	DWORD DdrawResolutionHack = 0;				// Removes the artificial resolution limit from Direct3D7 and below https://github.com/UCyborg/LegacyD3DResolutionHack
 	bool DdrawRemoveScanlines = 0;				// Experimental feature to removing interlaced black lines in a single frame
 	bool DdrawRemoveInterlacing = 0;			// Experimental feature to removing interlacing between frames
diff --git a/Settings/Settings.ini b/Settings/Settings.ini
index 7d4d32cf..3cb22f29 100644
--- a/Settings/Settings.ini
+++ b/Settings/Settings.ini
@@ -48,7 +48,7 @@ DdrawEmulateLock           = 0
 DdrawForceMipMapAutoGen    = 0
 DdrawFlipFillColor         = 0
 DdrawFixByteAlignment      = 0
-DdrawDisableByteAlignment  = 0
+DdrawEnableByteAlignment   = 0
 DdrawRemoveScanlines       = 0
 DdrawRemoveInterlacing     = 0
 DdrawReadFromGDI           = 0
diff --git a/ddraw/IDirect3DTypes.cpp b/ddraw/IDirect3DTypes.cpp
index 74a43e6d..f0d2de64 100644
--- a/ddraw/IDirect3DTypes.cpp
+++ b/ddraw/IDirect3DTypes.cpp
@@ -471,9 +471,9 @@ void ConvertDeviceDesc(D3DDEVICEDESC7 &Desc7, D3DCAPS9 &Caps9)
 		D3DPTEXTURECAPS_TRANSPARENCY |
 		D3DPTEXTURECAPS_BORDER |
 		D3DPTEXTURECAPS_COLORKEYBLEND |
+		D3DPTEXTURECAPS_POW2 |
 		(Caps9.TextureCaps &
 			(D3DPTEXTURECAPS_PERSPECTIVE |
-			D3DPTEXTURECAPS_POW2 |
 			D3DPTEXTURECAPS_ALPHA |
 			D3DPTEXTURECAPS_SQUAREONLY |
 			D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE |
diff --git a/ddraw/IDirectDrawTypes.cpp b/ddraw/IDirectDrawTypes.cpp
index 1a39f1f1..2f18bdde 100644
--- a/ddraw/IDirectDrawTypes.cpp
+++ b/ddraw/IDirectDrawTypes.cpp
@@ -411,7 +411,7 @@ void AdjustVidMemory(LPDWORD lpdwTotal, LPDWORD lpdwFree)
 
 DWORD GetByteAlignedWidth(DWORD Width, DWORD BitCount)
 {
-	if (!Config.DdrawDisableByteAlignment)
+	if (Config.DdrawEnableByteAlignment)
 	{
 		while ((Width * BitCount) % 64)
 		{