Disable mipfilter when mipmap surface isn't filled

elishacloud · Aug 1, 2024 · 4e1896d · 4e1896d
1 parent c67a90c
commit 4e1896d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7077 
+#define BUILD_NUMBER 7078 
diff --git a/ddraw/IDirect3DDeviceX.cpp b/ddraw/IDirect3DDeviceX.cpp
@@ -4210,6 +4210,16 @@ inline void m_IDirect3DDeviceX::SetDrawStates(DWORD dwVertexTypeDesc, DWORD& dwF
 				}
 			}
 		}
+		if (!Config.DdrawForceMipMapAutoGen)
+		{
+			for (UINT x = 0; x < MaxTextureStages; x++)
+			{
+				if (ssMipFilter[x] != D3DTEXF_NONE && CurrentTextureSurfaceX[x] && !CurrentTextureSurfaceX[x]->IsMipMapReady())
+				{
+					(*d3d9Device)->SetSamplerState(x, D3DSAMP_MIPFILTER, D3DTEXF_NONE);
+				}
+			}
+		}
 		if (rsColorKeyEnabled)
 		{
 			// Check for color key alpha texture
@@ -4274,6 +4284,16 @@ inline void m_IDirect3DDeviceX::RestoreDrawStates(DWORD dwVertexTypeDesc, DWORD
 		{
 			lpCurrentRenderTargetX->SetDirtyFlag();
 		}
+		if (!Config.DdrawForceMipMapAutoGen)
+		{
+			for (UINT x = 0; x < MaxTextureStages; x++)
+			{
+				if (ssMipFilter[x] != D3DTEXF_NONE && CurrentTextureSurfaceX[x] && !CurrentTextureSurfaceX[x]->IsMipMapReady())
+				{
+					(*d3d9Device)->SetSamplerState(x, D3DSAMP_MIPFILTER, ssMipFilter[x]);
+				}
+			}
+		}
 		if (Config.DdrawFixByteAlignment > 1)
 		{
 			for (UINT x = 0; x < MaxTextureStages; x++)

diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
@@ -2683,6 +2683,19 @@ HRESULT m_IDirectDrawSurfaceX::Lock2(LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSur
 						<< " MipMapLevel: " << MipMapLevel);
 				}
 				MipMaps[Level].lPitch = LockedRect.Pitch;
+				MipMaps[Level].HasData = true;
+				if (!IsMipMapReadyToUse)
+				{
+					IsMipMapReadyToUse = true;
+					for (UINT x = 0; x < min(MaxMipMapLevel, MipMaps.size()); x++)
+					{
+						if (!MipMaps[x].HasData)
+						{
+							IsMipMapReadyToUse = false;
+							break;
+						}
+					}
+				}
 			}
 			else
 			{

diff --git a/ddraw/IDirectDrawSurfaceX.h b/ddraw/IDirectDrawSurfaceX.h
@@ -57,6 +57,7 @@ class m_IDirectDrawSurfaceX : public IUnknown, public AddressLookupTableDdrawObj
 		DWORD dwWidth = 0;
 		DWORD dwHeight = 0;
 		LONG lPitch = 0;
+		bool HasData = false;
 	};
 
 	// For aligning bits after a lock for games that hard code the pitch
@@ -146,6 +147,7 @@ class m_IDirectDrawSurfaceX : public IUnknown, public AddressLookupTableDdrawObj
 	m_IDirectDrawX *ddrawParent = nullptr;				// DirectDraw parent device
 	std::vector<MIPMAP> MipMaps;						// For MipMaps
 	DWORD MaxMipMapLevel = 1;							// For MipMaps
+	bool IsMipMapReadyToUse = false;					// For MipMaps
 	LPDIRECT3DTEXTURE9 PrimaryDisplayTexture = nullptr;	// Used for the texture surface for the primary surface
 	m_IDirectDrawPalette *attachedPalette = nullptr;	// Associated palette
 	m_IDirectDrawClipper *attachedClipper = nullptr;	// Associated clipper
@@ -453,6 +455,7 @@ class m_IDirectDrawSurfaceX : public IUnknown, public AddressLookupTableDdrawObj
 	inline bool IsUsingEmulation() { return (surface.emu && surface.emu->DC && surface.emu->GameDC && surface.emu->pBits); }
 	inline bool IsEmulationDCReady() { return (IsUsingEmulation() && !surface.emu->UsingGameDC); }
 	inline bool IsSurfaceDirty() { return surface.IsDirtyFlag; }
+	inline bool IsMipMapReady() { return IsMipMapReadyToUse; }
 	void SetDirtyFlag();
 	void ClearDirtyFlags();
 	bool GetColorKeyForShader(float(&lowColorKey)[4], float(&highColorKey)[4]);