Skip to content
This repository was archived by the owner on Oct 4, 2022. It is now read-only.

Fix access violation crash on pDepthTex released #490

Open
alex-leleka wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix access violation crash on pDepthTex released #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15c19a4
Fix client crash while reading depth texture
alex-leleka May 19, 2020
bf8546e
Update D3D_SVO.cpp
alex-leleka May 19, 2020
49533b3
Update D3DDeferredRender.cpp
alex-leleka May 19, 2020
2ea8252
Update D3DDeferredShading.cpp
alex-leleka May 19, 2020
1897bb6
Update D3DShadows.cpp
alex-leleka May 19, 2020
a54be72
Update D3DShadows.cpp
alex-leleka May 19, 2020
f8ef889
Update D3DShadows.cpp
alex-leleka May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/Code/CryEngine/RenderDll/Common/Shadow_Renderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct ShadowMapFrustum
bool bUseShadowsPool;
struct ShadowMapFrustum* pPrevFrustum = nullptr;
struct ShadowMapFrustum* pFrustumOwner = nullptr;
class CTexture* pDepthTex;
_smart_ptr<ITexture> pDepthTex;

//3d engine parameters
float fFOV;
Expand Down
2 changes: 1 addition & 1 deletion dev/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredRender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ void CD3D9Renderer::FX_DeferredShadowMaskGen(const TArray<uint32>& shadowPoolLig
TS.m_bSRGBLookup = false;
TS.SetComparisonFilter(true);

CTexture* pShadowMap = firstFrustum.bUseShadowsPool ? CTexture::s_ptexRT_ShadowPool : firstFrustum.pDepthTex;
CTexture* pShadowMap = firstFrustum.bUseShadowsPool ? CTexture::s_ptexRT_ShadowPool : static_cast<CTexture*>(firstFrustum.pDepthTex.get());
pShadowMap->Apply(1, CTexture::GetTexState(TS), EFTT_UNKNOWN, 6);

SD3DPostEffectsUtils::SetTexture(CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap"), 7, FILTER_POINT, 0);
Expand Down
2 changes: 1 addition & 1 deletion dev/Code/CryEngine/RenderDll/XRenderD3D9/D3DDeferredShading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4577,7 +4577,7 @@ bool CDeferredShading::ShadowLightPasses(const SRenderLight& light)
}
else
{
SD3DPostEffectsUtils::SetTexture(firstFrustum.pDepthTex, 3, FILTER_POINT, 0);
SD3DPostEffectsUtils::SetTexture(static_cast<CTexture*>(firstFrustum.pDepthTex.get()), 3, FILTER_POINT, 0);
}

SD3DPostEffectsUtils::SetTexture(CTextureManager::Instance()->GetDefaultTexture("ShadowJitterMap"), 7, FILTER_POINT, 0);
Expand Down
18 changes: 9 additions & 9 deletions dev/Code/CryEngine/RenderDll/XRenderD3D9/D3DShadows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,11 +989,11 @@ bool CD3D9Renderer::PrepareDepthMap(ShadowMapFrustum* lof, int nLightFrustumID,
depthTarget.nHeight = lof->nTextureHeight;
depthTarget.nFrameAccess = -1;
depthTarget.bBusy = false;
depthTarget.pTex = lof->pDepthTex;
depthTarget.pTarget = lof->pDepthTex->GetDevTexture()->Get2DTexture();
depthTarget.pTex = static_cast<CTexture*>(lof->pDepthTex.get());
depthTarget.pTarget = depthTarget.pTex->GetDevTexture()->Get2DTexture();
depthTarget.pSurf = lof->bOmniDirectionalShadow && !(lof->bUnwrapedOmniDirectional)
? static_cast<D3DDepthSurface*>(lof->pDepthTex->GetDeviceDepthStencilSurf(sideIndex, 1))
: static_cast<D3DDepthSurface*>(lof->pDepthTex->GetDeviceDepthStencilSurf());
? static_cast<D3DDepthSurface*>(depthTarget.pTex->GetDeviceDepthStencilSurf(sideIndex, 1))
: static_cast<D3DDepthSurface*>(depthTarget.pTex->GetDeviceDepthStencilSurf());

CCamera tmpCamera;
if (!lof->bOmniDirectionalShadow)
Expand Down Expand Up @@ -1421,7 +1421,7 @@ void CD3D9Renderer::ConfigShadowTexgen(int Num, ShadowMapFrustum* pFr, int nFrus
else
if (pFr->pDepthTex != NULL)
{
nID = pFr->pDepthTex->GetID();
nID = static_cast<CTexture*>(pFr->pDepthTex.get())->GetID();
}

m_RP.m_ShadowCustomTexBind[Num * 2 + 0] = nID;
Expand Down Expand Up @@ -1920,9 +1920,9 @@ void CD3D9Renderer::FX_MergeShadowMaps(ShadowMapFrustum* pDst, const ShadowMapFr
depthSurface.nHeight = pDst->nTextureHeight;
depthSurface.nFrameAccess = -1;
depthSurface.bBusy = false;
depthSurface.pTex = pDst->pDepthTex;
depthSurface.pSurf = pDst->pDepthTex->GetDeviceDepthStencilSurf();
depthSurface.pTarget = pDst->pDepthTex->GetDevTexture()->Get2DTexture();
depthSurface.pTex = static_cast<CTexture*>(pDst->pDepthTex.get());
depthSurface.pSurf = depthSurface.pTex->GetDeviceDepthStencilSurf();
depthSurface.pTarget = depthSurface.pTex->GetDevTexture()->Get2DTexture();

if (bEmptyCachedFrustum)
{
Expand Down Expand Up @@ -1955,7 +1955,7 @@ void CD3D9Renderer::FX_MergeShadowMaps(ShadowMapFrustum* pDst, const ShadowMapFr
static CCryNameR paramReprojMatSrcToDst("g_mReprojSrcToDst");
CShaderMan::s_ShaderShadowMaskGen->FXSetPSFloat(paramReprojMatSrcToDst, (Vec4*) mReprojSrcToDst.GetData(), 4);

pSrc->pDepthTex->Apply(0, CTexture::GetTexState(STexState(FILTER_POINT, true)));
pSrc->pDepthTex->ApplyTexture(0, CTexture::GetTexState(STexState(FILTER_POINT, true)));

SPostEffectsUtils::DrawFullScreenTri(depthSurface.nWidth, depthSurface.nHeight);
SPostEffectsUtils::ShEndPass();
Expand Down
2 changes: 1 addition & 1 deletion dev/Code/CryEngine/RenderDll/XRenderD3D9/D3D_SVO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ void CSvoRenderer::SetupRsmSun(const EHWShaderClass eShClass)
}
else
{
firstFrustum.pDepthTex->Apply(12, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
static_cast<CTexture*>(firstFrustum.pDepthTex.get())->Apply(12, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
GetRsmColorMap(firstFrustum)->Apply(13, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
GetRsmNormlMap(firstFrustum)->Apply(9, m_nTexStatePoint, EFTT_UNKNOWN, -1, -1, eShClass);
}
Expand Down