GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-04-05 21:50:42 +02:00
parent 4c8528dcae b2f9da4113
commit 7d92779e99
67 changed files with 638 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Graphics/Materials/DeferredMaterialShader.cpp
View File

@@ -147,6 +147,7 @@ bool DeferredMaterialShader::Load()
psDesc.DepthEnable = false;
}
#if GPU_ALLOW_TESSELLATION_SHADERS
// Check if use tessellation (both material and runtime supports it)
const bool useTess = _info.TessellationMode != TessellationMethod::None && GPUDevice::Instance->Limits.HasTessellation;
if (useTess)
@@ -154,6 +155,7 @@ bool DeferredMaterialShader::Load()
psDesc.HS = _shader->GetHS("HS");
psDesc.DS = _shader->GetDS("DS");
}
#endif
// GBuffer Pass
psDesc.VS = _shader->GetVS("VS");

2
Source/Engine/Graphics/Materials/DeformableMaterialShader.cpp
View File

@@ -115,6 +115,7 @@ bool DeformableMaterialShader::Load()
psDesc.DepthEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthTest) == MaterialFeaturesFlags::None;
psDesc.DepthWriteEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthWrite) == MaterialFeaturesFlags::None;
#if GPU_ALLOW_TESSELLATION_SHADERS
// Check if use tessellation (both material and runtime supports it)
const bool useTess = _info.TessellationMode != TessellationMethod::None && GPUDevice::Instance->Limits.HasTessellation;
if (useTess)
@@ -122,6 +123,7 @@ bool DeformableMaterialShader::Load()
psDesc.HS = _shader->GetHS("HS");
psDesc.DS = _shader->GetDS("DS");
}
#endif
#if USE_EDITOR
if (_shader->HasShader("PS_QuadOverdraw"))

2
Source/Engine/Graphics/Materials/ForwardMaterialShader.cpp
View File

@@ -134,6 +134,7 @@ bool ForwardMaterialShader::Load()
psDesc.DepthEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthTest) == MaterialFeaturesFlags::None;
psDesc.DepthWriteEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthWrite) == MaterialFeaturesFlags::None;
#if GPU_ALLOW_TESSELLATION_SHADERS
// Check if use tessellation (both material and runtime supports it)
const bool useTess = _info.TessellationMode != TessellationMethod::None && GPUDevice::Instance->Limits.HasTessellation;
if (useTess)
@@ -141,6 +142,7 @@ bool ForwardMaterialShader::Load()
psDesc.HS = _shader->GetHS("HS");
psDesc.DS = _shader->GetDS("DS");
}
#endif
#if USE_EDITOR
if (_shader->HasShader("PS_QuadOverdraw"))

2
Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
View File

@@ -137,6 +137,7 @@ bool TerrainMaterialShader::Load()
psDesc.DepthEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthTest) == MaterialFeaturesFlags::None;
psDesc.DepthWriteEnable = (_info.FeaturesFlags & MaterialFeaturesFlags::DisableDepthWrite) == MaterialFeaturesFlags::None;
#if GPU_ALLOW_TESSELLATION_SHADERS
// Check if use tessellation (both material and runtime supports it)
const bool useTess = _info.TessellationMode != TessellationMethod::None && GPUDevice::Instance->Limits.HasTessellation;
if (useTess)
@@ -144,6 +145,7 @@ bool TerrainMaterialShader::Load()
psDesc.HS = _shader->GetHS("HS");
psDesc.DS = _shader->GetDS("DS");
}
#endif
// Support blending but then use only emissive channel
switch (_info.BlendMode)