Implemented mipmap bias control for R3-R4.

Author: RainbowZerg

src/Layers/xrRender/r__dsgraph_build.cpp

@@ -837,15 +837,16 @@ void D3DXRenderBase::Reset(HWND hWnd, u32& dwWidth, u32& dwHeight, float& fWidth
 void D3DXRenderBase::SetupStates()
 {
     HW.Caps.Update();
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
-//  TODO: DX10: Implement Resetting of render states into default mode
-// VERIFY(!"D3DXRenderBase::SetupStates not implemented.");
+#if defined(USE_OGL)
+    // TODO: OGL: Implement SetupStates().
+#elif defined(USE_DX10) || defined(USE_DX11)
+    SSManager.SetMaxAnisotropy(ps_r__tf_Anisotropic);
+    SSManager.SetMipLODBias(ps_r__tf_Mipbias);
 #else //    USE_DX10
     for (u32 i = 0; i < HW.Caps.raster.dwStages; i++)
     {
-        float fBias = -.5f;
-        CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MAXANISOTROPY, 4));
-        CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MIPMAPLODBIAS, *(LPDWORD)&fBias));
+        CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MAXANISOTROPY, ps_r__tf_Anisotropic));
+        CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MIPMAPLODBIAS, *(LPDWORD)&ps_r__tf_Mipbias));
         CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MINFILTER, D3DTEXF_LINEAR));
         CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR));
         CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MIPFILTER, D3DTEXF_LINEAR));

src/Layers/xrRender/xrRender_console.cpp

@@ -100,11 +100,11 @@ float ps_r__ssaDONTSORT = 32.f; // RO
 float ps_r__ssaHZBvsTEX = 96.f; // RO
 
 int ps_r__tf_Anisotropic = 8;
+float ps_r__tf_Mipbias = 0.0f;
 
 // R1
 float ps_r1_ssaLOD_A = 64.f;
 float ps_r1_ssaLOD_B = 48.f;
-float ps_r1_tf_Mipbias = 0.0f;
 Flags32 ps_r1_flags = {R1FLAG_DLIGHTS}; // r1-only
 float ps_r1_lmodel_lerp = 0.1f;
 float ps_r1_dlights_clip = 40.f;
@@ -119,7 +119,6 @@ int ps_r1_SoftwareSkinning = 0; // r1-only
 // R2
 float ps_r2_ssaLOD_A = 64.f;
 float ps_r2_ssaLOD_B = 48.f;
-float ps_r2_tf_Mipbias = 0.0f;
 
 // R2-specific
 Flags32 ps_r2_ls_flags = {R2FLAG_SUN
@@ -299,9 +298,10 @@ class CCC_tf_MipBias : public CCC_Float
         if (nullptr == HW.pDevice)
             return;
 
-#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
-// TODO: DX10: Implement mip bias control
-//VERIFY(!"apply not implmemented.");
+#if defined(USE_OGL)
+            // TODO: OGL: Implement mipmap bias control.
+#elif defined(USE_DX10) || defined(USE_DX11)
+        SSManager.SetMipLODBias(*value);
 #else // USE_DX10
         for (u32 i = 0; i < HW.Caps.raster.dwStages; i++)
             CHK_DX(HW.pDevice->SetSamplerState(i, D3DSAMP_MIPMAPLODBIAS, *((LPDWORD)value)));
@@ -725,12 +725,12 @@ void xrRender_initconsole()
 #endif // DEBUG
 
     CMD2(CCC_tf_Aniso, "r__tf_aniso", &ps_r__tf_Anisotropic); // {1..16}
+    CMD2(CCC_tf_MipBias, "r__tf_mipbias", &ps_r__tf_Mipbias); // {-3 +3}
 
     // R1
     CMD4(CCC_Float, "r1_ssa_lod_a", &ps_r1_ssaLOD_A, 16, 96);
     CMD4(CCC_Float, "r1_ssa_lod_b", &ps_r1_ssaLOD_B, 16, 64);
     CMD4(CCC_Float, "r1_lmodel_lerp", &ps_r1_lmodel_lerp, 0, 0.333f);
-    CMD2(CCC_tf_MipBias, "r1_tf_mipbias", &ps_r1_tf_Mipbias); // {-3 +3}
     CMD3(CCC_Mask, "r1_dlights", &ps_r1_flags, R1FLAG_DLIGHTS);
     CMD4(CCC_Float, "r1_dlights_clip", &ps_r1_dlights_clip, 10.f, 150.f);
     CMD4(CCC_Float, "r1_pps_u", &ps_r1_pps_u, -1.f, +1.f);
@@ -751,7 +751,6 @@ void xrRender_initconsole()
     // R2
     CMD4(CCC_Float, "r2_ssa_lod_a", &ps_r2_ssaLOD_A, 16, 96);
     CMD4(CCC_Float, "r2_ssa_lod_b", &ps_r2_ssaLOD_B, 32, 64);
-    CMD2(CCC_tf_MipBias, "r2_tf_mipbias", &ps_r2_tf_Mipbias);
 
     // R2-specific
     CMD2(CCC_R2GM, "r2em", &ps_r2_gmaterial);
@@ -920,14 +919,4 @@ void xrRender_initconsole()
     //CMD3(CCC_Mask, "r2_sun_ignore_portals", &ps_r2_ls_flags, R2FLAG_SUN_IGNORE_PORTALS);
 }
 
-void xrRender_apply_tf()
-{
-    Console->Execute("r__tf_aniso");
-#if RENDER == R_R1
-    Console->Execute("r1_tf_mipbias");
-#else
-    Console->Execute("r2_tf_mipbias");
-#endif
-}
-
 #endif

src/Layers/xrRender/xrRender_console.h

@@ -54,11 +54,11 @@ extern ECORE_API float ps_r__ssaDISCARD;
 extern ECORE_API float ps_r__ssaDONTSORT;
 extern ECORE_API float ps_r__ssaHZBvsTEX;
 extern ECORE_API int ps_r__tf_Anisotropic;
+extern ECORE_API float ps_r__tf_Mipbias;
 
 // R1
 extern ECORE_API float ps_r1_ssaLOD_A;
 extern ECORE_API float ps_r1_ssaLOD_B;
-extern ECORE_API float ps_r1_tf_Mipbias;
 extern ECORE_API float ps_r1_lmodel_lerp;
 extern ECORE_API float ps_r1_dlights_clip;
 extern ECORE_API float ps_r1_pps_u;
@@ -79,7 +79,6 @@ enum
 // R2
 extern ECORE_API float ps_r2_ssaLOD_A;
 extern ECORE_API float ps_r2_ssaLOD_B;
-extern ECORE_API float ps_r2_tf_Mipbias;
 
 // R2-specific
 extern ECORE_API Flags32 ps_r2_ls_flags; // r2-only
@@ -209,6 +208,5 @@ enum
 
 extern void xrRender_initconsole();
 extern BOOL xrRender_test_hw();
-extern void xrRender_apply_tf();
 
 #endif

src/Layers/xrRenderDX10/StateManager/dx10SamplerStateCache.cpp

@@ -6,7 +6,7 @@ using dx10StateUtils::operator==;
 
 dx10SamplerStateCache SSManager;
 
-dx10SamplerStateCache::dx10SamplerStateCache() : m_uiMaxAnisotropy(1)
+dx10SamplerStateCache::dx10SamplerStateCache() : m_uiMaxAnisotropy(1), m_uiMipLODBias(0.0f)
 {
     static const int iMaxRSStates = 10;
     m_StateArray.reserve(iMaxRSStates);
@@ -20,6 +20,8 @@ dx10SamplerStateCache::SHandle dx10SamplerStateCache::GetState(D3D_SAMPLER_DESC&
     //	MaxAnisitropy is reset by ValidateState if not aplicable
     //	to the filter mode used.
     desc.MaxAnisotropy = m_uiMaxAnisotropy;
+    // RZ
+    desc.MipLODBias = m_uiMipLODBias;
 
     dx10StateUtils::ValidateState(desc);
 
@@ -140,7 +142,7 @@ void dx10SamplerStateCache::CSApplySamplers(HArray& samplers)
 }
 #endif
 
-void dx10SamplerStateCache::SetMaxAnisotropy(UINT uiMaxAniso)
+void dx10SamplerStateCache::SetMaxAnisotropy(u32 uiMaxAniso)
 {
     clamp(uiMaxAniso, (u32)1, (u32)16);
 
@@ -168,3 +170,26 @@ void dx10SamplerStateCache::SetMaxAnisotropy(UINT uiMaxAniso)
         CreateState(desc, &rec.m_pState);
     }
 }
+
+void dx10SamplerStateCache::SetMipLODBias(float uiMipLODBias)
+{
+    if (m_uiMipLODBias == uiMipLODBias)
+        return;
+
+    m_uiMipLODBias = uiMipLODBias;
+
+    for (u32 i = 0; i < m_StateArray.size(); ++i)
+    {
+        StateRecord& rec = m_StateArray[i];
+        StateDecs desc;
+
+        rec.m_pState->GetDesc(&desc);
+
+        desc.MipLODBias = m_uiMipLODBias;
+        dx10StateUtils::ValidateState(desc);
+
+        // This can cause fragmentation if called too often
+        rec.m_pState->Release();
+        CreateState(desc, &rec.m_pState);
+    }
+}

src/Layers/xrRenderDX10/StateManager/dx10SamplerStateCache.h

@@ -31,7 +31,8 @@ class dx10SamplerStateCache
     void CSApplySamplers(HArray& samplers);
 #endif
 
-    void SetMaxAnisotropy(UINT uiMaxAniso);
+    void SetMaxAnisotropy(u32 uiMaxAniso);
+    void SetMipLODBias(float uiMipLODBias);
 
 private:
     typedef ID3DSamplerState IDeviceState;
@@ -55,6 +56,7 @@ class dx10SamplerStateCache
     xr_vector<StateRecord> m_StateArray;
 
     u32 m_uiMaxAnisotropy;
+    float m_uiMipLODBias;
 };
 
 extern dx10SamplerStateCache SSManager;

src/Layers/xrRenderDX10/dx10StateUtils.cpp

@@ -340,8 +340,9 @@ bool operator==(const D3D_SAMPLER_DESC& desc1, const D3D_SAMPLER_DESC& desc2)
         return false;
     if (desc1.AddressW != desc2.AddressW)
         return false;
-    if (desc1.MipLODBias != desc2.MipLODBias)
-        return false;
+    //  RZ
+    //  if (desc1.MipLODBias != desc2.MipLODBias)
+    //    return false;
     //	Ignore anisotropy since it's set up automatically by the manager
     //	if( desc1.MaxAnisotropy != desc2.MaxAnisotropy) return false;
     if (desc1.ComparisonFunc != desc2.ComparisonFunc)
@@ -457,7 +458,8 @@ u32 GetHash(const D3D_SAMPLER_DESC& desc)
     Hash.AddData(&desc.AddressU, sizeof(desc.AddressU));
     Hash.AddData(&desc.AddressV, sizeof(desc.AddressV));
     Hash.AddData(&desc.AddressW, sizeof(desc.AddressW));
-    Hash.AddData(&desc.MipLODBias, sizeof(desc.MipLODBias));
+    //  RZ
+    //  Hash.AddData(&desc.MipLODBias, sizeof(desc.MipLODBias));
     //	Ignore anisotropy since it's set up automatically by the manager
     //	Hash.AddData( &desc.MaxAnisotropy, sizeof(desc.MaxAnisotropy) );
     Hash.AddData(&desc.ComparisonFunc, sizeof(desc.ComparisonFunc));

src/Layers/xrRenderPC_GL/rgl.cpp

@@ -369,7 +369,6 @@ void CRender::create()
     //R_CHK						(HW.pDevice->CreateQuery(D3DQUERYTYPE_EVENT,&q_sync_point[0]));
     //R_CHK						(HW.pDevice->CreateQuery(D3DQUERYTYPE_EVENT,&q_sync_point[1]));
 
-    xrRender_apply_tf();
     PortalTraverser.initialize();
     //	TODO: OGL: Implement FluidManager.
     //	FluidManager.Initialize( 70, 70, 70 );
@@ -432,7 +431,6 @@ void CRender::reset_end()
 
     Target = new CRenderTarget();
 
-    xrRender_apply_tf();
     //FluidManager.SetScreenSize(Device.dwWidth, Device.dwHeight);
 
     // Set this flag true to skip the first render frame,

src/Layers/xrRenderPC_R1/FStaticRender.cpp

@@ -100,7 +100,6 @@ void CRender::create()
     PSLibrary.OnCreate();
     //.	HWOCC.occq_create			(occq_size);
 
-    xrRender_apply_tf();
     ::PortalTraverser.initialize();
 }
 
@@ -134,7 +133,6 @@ void CRender::reset_begin()
 
 void CRender::reset_end()
 {
-    xrRender_apply_tf();
     //.	HWOCC.occq_create			(occq_size);
     Target = new CRenderTarget();
     if (L_Projector)

src/Layers/xrRenderPC_R2/r2.cpp

@@ -328,7 +328,6 @@ void CRender::create()
     for (u32 i = 0; i < HW.Caps.iGPUNum; ++i)
         R_CHK(HW.pDevice->CreateQuery(D3DQUERYTYPE_EVENT, &q_sync_point[i]));
 
-    xrRender_apply_tf();
     ::PortalTraverser.initialize();
 }
 
@@ -404,8 +403,6 @@ void CRender::reset_end()
     }
     //-AVO
 
-    xrRender_apply_tf();
-
     // Set this flag true to skip the first render frame,
     // that some data is not ready in the first frame (for example device camera position)
     m_bFirstFrameAfterReset = true;

src/Layers/xrRenderPC_R3/r3.cpp

@@ -439,7 +439,6 @@ void CRender::create()
         R_CHK(HW.pDevice->CreateQuery(&qdesc, &q_sync_point[i]));
     q_sync_point[0]->End();
 
-    xrRender_apply_tf();
     ::PortalTraverser.initialize();
     FluidManager.Initialize(70, 70, 70);
     //	FluidManager.Initialize( 100, 100, 100 );
@@ -527,7 +526,6 @@ void CRender::reset_end()
     }
     //-AVO
 
-    xrRender_apply_tf();
     FluidManager.SetScreenSize(Device.dwWidth, Device.dwHeight);
 
     // Set this flag true to skip the first render frame,