Merge branch 'ajaus/stateblock_bugfixs_2' into 'main'

[REMIX-3586] Additional Bridge Client Device State changes and fixes.

See merge request lightspeedrtx/bridge-remix-nv!115

Author: nv-ajaus

src/client/d3d9_device.cpp

@@ -1468,14 +1468,15 @@ template<bool EnableSync>
 HRESULT Direct3DDevice9Ex_LSS<EnableSync>::GetLightEnable(DWORD Index, BOOL* pEnable) {
   ZoneScoped;
   LogFunctionCall();
-
   if (pEnable == nullptr) {
     return D3DERR_INVALIDCALL;
   }
 
   {
     BRIDGE_DEVICE_LOCKGUARD();
-    *pEnable = m_state.bLightEnables[Index];
+    // This is the true value for light-enables found through experimentation
+    constexpr BOOL LightEnableTrue = 128;
+    *pEnable = m_state.bLightEnables[Index] ? LightEnableTrue : 0;
   }
   return S_OK;
 }
@@ -1757,6 +1758,7 @@ void Direct3DDevice9Ex_LSS<EnableSync>::StateBlockSetCaptureFlags(D3DSTATEBLOCKT
   if (Type == D3DSBT_ALL) {
     std::fill(std::begin(flags.textures), std::end(flags.textures), true);
     std::fill(std::begin(flags.streams), std::end(flags.streams), true);
+    std::fill(std::begin(flags.streamOffsetsAndStrides), std::end(flags.streamOffsetsAndStrides), true);
 
     flags.indices = true;
     flags.viewport = true;
@@ -2200,7 +2202,7 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetPaletteEntries(UINT PaletteNumber,
 
   {
     BRIDGE_DEVICE_LOCKGUARD();
-    m_palleteEntries[PaletteNumber] = *pEntries;
+    m_paletteEntries[PaletteNumber] = *pEntries;
   }
   return S_OK;
 }
@@ -2216,7 +2218,7 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::GetPaletteEntries(UINT PaletteNumber,
 
   {
     BRIDGE_DEVICE_LOCKGUARD();
-    *pEntries = m_palleteEntries[PaletteNumber];
+    *pEntries = m_paletteEntries[PaletteNumber];
   }
   return S_OK;
 }
@@ -2227,7 +2229,7 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetCurrentTexturePalette(UINT Palette
   LogFunctionCall();
   {
     BRIDGE_DEVICE_LOCKGUARD();
-    m_curTexPallete = PaletteNumber;
+    m_curTexPalette = PaletteNumber;
   }
   return S_OK;
 }
@@ -2243,7 +2245,7 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::GetCurrentTexturePalette(UINT* pPalet
 
   {
     BRIDGE_DEVICE_LOCKGUARD();
-    *pPaletteNumber = m_curTexPallete;
+    *pPaletteNumber = m_curTexPalette;
   }
   return S_OK;
 }
@@ -2807,13 +2809,18 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetStreamSource(UINT StreamNumber, ID
       BRIDGE_DEVICE_LOCKGUARD();
       if (m_stateRecording) {
         m_stateRecording->m_captureState.streams[StreamNumber] = MakeD3DAutoPtr(pLssStreamData);
-        m_stateRecording->m_captureState.streamOffsets[StreamNumber] = OffsetInBytes;
-        m_stateRecording->m_captureState.streamStrides[StreamNumber] = Stride;
+        if (pStreamData != nullptr) {
+          m_stateRecording->m_captureState.streamOffsets[StreamNumber] = OffsetInBytes;
+          m_stateRecording->m_captureState.streamStrides[StreamNumber] = Stride;
+          m_stateRecording->m_dirtyFlags.streamOffsetsAndStrides[StreamNumber] = true;
+        }
         m_stateRecording->m_dirtyFlags.streams[StreamNumber] = true;
       } else {
         m_state.streams[StreamNumber] = MakeD3DAutoPtr(pLssStreamData);
-        m_state.streamOffsets[StreamNumber] = OffsetInBytes;
-        m_state.streamStrides[StreamNumber] = Stride;
+        if (pStreamData != nullptr) {
+          m_state.streamOffsets[StreamNumber] = OffsetInBytes;
+          m_state.streamStrides[StreamNumber] = Stride;
+        }
       }
     }
     {
@@ -3751,6 +3758,10 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::ResetState() {
     m_state.streamFreqs[i] = 1;
   }
 
+  // Set The Current Texture Palette entry to it's default
+  // found through experimentation.
+  m_curTexPalette = 65535;
+
   return S_OK;
 }
 

src/client/d3d9_device_base.cpp

@@ -56,6 +56,9 @@ BaseDirect3DDevice9Ex_LSS::BaseDirect3DDevice9Ex_LSS(const bool bExtended,
   memset(&m_state.viewport, 0, sizeof(m_state.viewport));
   m_state.viewport.Width = m_presParams.BackBufferWidth;
   m_state.viewport.Height = m_presParams.BackBufferHeight;
+  memset(&m_state.scissorRect, 0, sizeof(m_state.scissorRect));
+  m_state.scissorRect.right = m_presParams.BackBufferWidth;
+  m_state.scissorRect.bottom = m_presParams.BackBufferHeight;
   m_state.viewport.MaxZ = 1.f;
 
   // Games may override client's exception handler when it was setup early.

src/client/d3d9_device_base.h

@@ -183,8 +183,8 @@ class BaseDirect3DDevice9Ex_LSS: public D3DBase<IDirect3DDevice9Ex>
 
   D3DGAMMARAMP m_gammaRamp;
   D3DPRESENT_PARAMETERS m_previousPresentParams;
-  std::unordered_map<UINT, PALETTEENTRY> m_palleteEntries;
-  UINT m_curTexPallete;
+  std::unordered_map<UINT, PALETTEENTRY> m_paletteEntries;
+  UINT m_curTexPalette;
   BOOL m_bSoftwareVtxProcessing;
   D3DCLIPSTATUS9 m_clipStatus;
   float m_NPatchMode;
@@ -203,6 +203,7 @@ class BaseDirect3DDevice9Ex_LSS: public D3DBase<IDirect3DDevice9Ex>
     std::array<std::array<bool, kMaxStageSamplerStateTypes>, kNumStageSamplers> samplerStates;
     // Streams
     std::array<bool, caps::MaxStreams> streams;
+    std::array<bool, caps::MaxStreams> streamOffsetsAndStrides;
     std::array<bool, caps::MaxStreams> streamFreqs;
     // Textures
     std::array<bool, kNumStageSamplers> textures;

src/client/d3d9_stateblock.cpp

@@ -91,6 +91,10 @@ void Direct3DStateBlock9_LSS::StateTransfer(const BaseDirect3DDevice9Ex_LSS::Sta
   for (int i = 0; i < flags.streams.size(); i++) {
     if (flags.streams[i]) {
       dst.streams[i] = src.streams[i];
+    }
+  }
+  for (int i = 0; i < flags.streamOffsetsAndStrides.size(); i++) {
+    if (flags.streamOffsetsAndStrides[i]) {
       dst.streamOffsets[i] = src.streamOffsets[i];
       dst.streamStrides[i] = src.streamStrides[i];
     }
@@ -103,6 +107,7 @@ void Direct3DStateBlock9_LSS::StateTransfer(const BaseDirect3DDevice9Ex_LSS::Sta
   for (int i = 0; i < flags.textures.size(); i++) {
     if (flags.textures[i]) {
       dst.textures[i] = src.textures[i];
+      dst.textureTypes[i] = src.textureTypes[i];
     }
   }
   if (flags.vertexShader) {