Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -347,7 +347,6 @@ void CWaterRipples::Render()
    }

    const uint32 nThreadID = gRenDev->m_RP.m_nProcessThreadID;
-    int32 nGpuID = 0;//gRenDev->RT_GetCurrGpuID();

    gRenDev->m_cEF.mfRefreshSystemShader("PostEffectsGame", CShaderMan::s_shPostEffectsGame);

@@ -584,7 +583,6 @@ void CWaterVolume::Render()

                Vec4* pDispGrid = WaterSimMgr()->GetDisplaceGrid();

-                uint32 pitch = 4 * sizeof(float) * nGridSize;
                uint32 width = nGridSize;
                uint32 height = nGridSize;