Skip to content

Commit 1752f06

Browse files
DrogonMarakioCL
andauthored
DX12 RHI: Fix the check for wive operation (o3de#18109)
* DX12 Fix: check wave operation. Signed-off-by: Reece Hagan <[email protected]> * Update Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp Co-authored-by: Akio Gaule <[email protected]> Signed-off-by: Reece Hagan <[email protected]> * DX12: Highest shader model to 6.0 D3D_HIGHEST_SHADER_MODEL can be undefined so use the version we check against. Signed-off-by: Reece Hagan <[email protected]> --------- Signed-off-by: Reece Hagan <[email protected]> Signed-off-by: Reece Hagan <[email protected]> Co-authored-by: Akio Gaule <[email protected]>
1 parent 7a569a8 commit 1752f06

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,16 @@ namespace AZ
244244

245245
// Check support of wive operation
246246
D3D12_FEATURE_DATA_SHADER_MODEL shaderModel;
247-
GetDevice()->CheckFeatureSupport(D3D12_FEATURE_SHADER_MODEL, &shaderModel, sizeof(shaderModel));
248-
m_features.m_waveOperation = shaderModel.HighestShaderModel >= D3D_SHADER_MODEL_6_0;
247+
shaderModel.HighestShaderModel = D3D_SHADER_MODEL_6_0;
248+
if (FAILED(GetDevice()->CheckFeatureSupport(D3D12_FEATURE_SHADER_MODEL, &shaderModel, sizeof(shaderModel))))
249+
{
250+
AZ_Warning("DX12", false, "Failed to check feature D3D12_FEATURE_SHADER_MODEL");
251+
m_features.m_waveOperation = false;
252+
}
253+
else
254+
{
255+
m_features.m_waveOperation = shaderModel.HighestShaderModel >= D3D_SHADER_MODEL_6_0;
256+
}
249257

250258
#ifdef AZ_DX12_DXR_SUPPORT
251259
D3D12_FEATURE_DATA_D3D12_OPTIONS5 options5;

0 commit comments

Comments
 (0)