From ef4002a984c6b5ec9c5060ccdaec8bf77ca3c877 Mon Sep 17 00:00:00 2001 From: "DESKTOP-JN7AG79\\qweasdd" Date: Wed, 26 Sep 2018 13:51:39 +0300 Subject: [PATCH] Fixed crash with volumetric fog --- .../xrRenderDX10/3DFluid/dx103DFluidData.cpp | 15 +++++++++++---- .../xrRenderDX10/3DFluid/dx103DFluidManager.cpp | 2 +- src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp index fc89e46ac52..863700b7566 100644 --- a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp +++ b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp @@ -5,10 +5,17 @@ namespace { -const xr_token simulation_type_token[] = {{"Fog", dx103DFluidData::ST_FOG}, {"Fire", dx103DFluidData::ST_FIRE}, {0, 0}}; +const xr_token simulation_type_token[] = { + {"Fog", dx103DFluidData::ST_FOG}, + {"Fire", dx103DFluidData::ST_FIRE}, + {0, 0} +}; -const xr_token emitter_type_token[] = {{"SimpleGaussian", dx103DFluidEmitters::ET_SimpleGausian}, - {"SimpleDraught", dx103DFluidEmitters::ET_SimpleDraught}, {0, 0}}; +const xr_token emitter_type_token[] = { + {"SimpleGaussian", dx103DFluidEmitters::ET_SimpleGausian}, + {"SimpleDraught", dx103DFluidEmitters::ET_SimpleDraught}, + {0, 0} +}; } DXGI_FORMAT dx103DFluidData::m_VPRenderTargetFormats[VP_NUM_TARGETS] = { @@ -20,7 +27,7 @@ DXGI_FORMAT dx103DFluidData::m_VPRenderTargetFormats[VP_NUM_TARGETS] = { dx103DFluidData::dx103DFluidData() { D3D_TEXTURE3D_DESC desc; - desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET; + desc.BindFlags = D3D_BIND_SHADER_RESOURCE | D3D_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MipLevels = 1; desc.MiscFlags = 0; diff --git a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp index 53f82c10d42..b47e2f72c9b 100644 --- a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp +++ b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp @@ -104,7 +104,7 @@ void dx103DFluidManager::Initialize(int width, int height, int depth) InitShaders(); D3D_TEXTURE3D_DESC desc; - desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET; + desc.BindFlags = D3D_BIND_SHADER_RESOURCE | D3D_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MipLevels = 1; desc.MiscFlags = 0; diff --git a/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp b/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp index a83f29506fc..c0624d03cc4 100644 --- a/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp +++ b/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp @@ -197,6 +197,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _gs, LPCSTR _ps, bool bFog, BOO #ifdef USE_DX11 dest.hs = RImplementation.Resources->_CreateHS("null"); dest.ds = RImplementation.Resources->_CreateDS("null"); + dest.cs = RImplementation.Resources->_CreateCS("null"); #endif ctable.merge(&ps->constants); ctable.merge(&vs->constants);