encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D12Info: programmatically compute the shader profiles. 

Bug: dawn:426
Change-Id: Ic360b95e908404137e01a00439b93e5b9b1828ce
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/24380
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2020-07-29 09:34:11 +00:00 committed by Commit Bot service account
parent b88b1a15c7
commit 9d0b9d7212
2 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/dawn_native/d3d12/D3D12Info.cpp
View File

@ -50,9 +50,9 @@ namespace dawn_native { namespace d3d12 {
D3D12_FEATURE_DATA_D3D12_OPTIONS5 featureOptions5 = {}; D3D12_FEATURE_DATA_D3D12_OPTIONS5 featureOptions5 = {};
if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport( if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport(
D3D12_FEATURE_D3D12_OPTIONS5, &featureOptions5, sizeof(featureOptions5)))) { D3D12_FEATURE_D3D12_OPTIONS5, &featureOptions5, sizeof(featureOptions5)))) {
// Performance regressions been observed when using a render pass on Intel graphics with // Performance regressions been observed when using a render pass on Intel graphics
// RENDER_PASS_TIER_1 available, so fall back to a software emulated render pass on // with RENDER_PASS_TIER_1 available, so fall back to a software emulated render
// these platforms. // pass on these platforms.
if (featureOptions5.RenderPassesTier < D3D12_RENDER_PASS_TIER_1 || if (featureOptions5.RenderPassesTier < D3D12_RENDER_PASS_TIER_1 ||
!gpu_info::IsIntel(adapter.GetPCIInfo().vendorId)) { !gpu_info::IsIntel(adapter.GetPCIInfo().vendorId)) {
info.supportsRenderPass = true; info.supportsRenderPass = true;
@ -63,59 +63,46 @@ namespace dawn_native { namespace d3d12 {
{D3D_SHADER_MODEL_6_1}, {D3D_SHADER_MODEL_6_1},
{D3D_SHADER_MODEL_6_0}, {D3D_SHADER_MODEL_6_0},
{D3D_SHADER_MODEL_5_1}}; {D3D_SHADER_MODEL_5_1}};
uint32_t driverShaderModel = 0;
for (D3D12_FEATURE_DATA_SHADER_MODEL shaderModel : knownShaderModels) { for (D3D12_FEATURE_DATA_SHADER_MODEL shaderModel : knownShaderModels) {
if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport( if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport(
D3D12_FEATURE_SHADER_MODEL, &shaderModel, sizeof(shaderModel)))) { D3D12_FEATURE_SHADER_MODEL, &shaderModel, sizeof(shaderModel)))) {
if (shaderModel.HighestShaderModel < D3D_SHADER_MODEL_5_1) { driverShaderModel = shaderModel.HighestShaderModel;
return DAWN_INTERNAL_ERROR( break;
"Driver could not support Shader Model 5.1 or higher"); }
} }
switch (shaderModel.HighestShaderModel) { if (driverShaderModel < D3D_SHADER_MODEL_5_1) {
case D3D_SHADER_MODEL_6_2: { return DAWN_INTERNAL_ERROR("Driver doesn't support Shader Model 5.1 or higher");
info.shaderModel = 62; }
info.shaderProfiles[SingleShaderStage::Vertex] = L"vs_6_2";
info.shaderProfiles[SingleShaderStage::Fragment] = L"ps_6_2"; // D3D_SHADER_MODEL is encoded as 0xMm with M the major version and m the minor version
info.shaderProfiles[SingleShaderStage::Compute] = L"cs_6_2"; ASSERT(driverShaderModel <= 0xFF);
uint32_t shaderModelMajor = (driverShaderModel & 0xF0) >> 4;
uint32_t shaderModelMinor = (driverShaderModel & 0xF);
ASSERT(shaderModelMajor < 10);
ASSERT(shaderModelMinor < 10);
info.shaderModel = 10 * shaderModelMajor + shaderModelMinor;
// Profiles are always <stage>s_<minor>_<major> so we build the s_<minor>_major and add
// it to each of the stage's suffix.
std::wstring profileSuffix = L"s_M_n";
profileSuffix[2] = wchar_t('0' + shaderModelMajor);
profileSuffix[4] = wchar_t('0' + shaderModelMinor);
info.shaderProfiles[SingleShaderStage::Vertex] = L"v" + profileSuffix;
info.shaderProfiles[SingleShaderStage::Fragment] = L"p" + profileSuffix;
info.shaderProfiles[SingleShaderStage::Compute] = L"c" + profileSuffix;
D3D12_FEATURE_DATA_D3D12_OPTIONS4 featureData4 = {}; D3D12_FEATURE_DATA_D3D12_OPTIONS4 featureData4 = {};
if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport( if (SUCCEEDED(adapter.GetDevice()->CheckFeatureSupport(
D3D12_FEATURE_D3D12_OPTIONS4, &featureData4, D3D12_FEATURE_D3D12_OPTIONS4, &featureData4, sizeof(featureData4)))) {
sizeof(featureData4)))) { info.supportsShaderFloat16 = info.shaderModel >= D3D_SHADER_MODEL_6_2 &&
info.supportsShaderFloat16 =
shaderModel.HighestShaderModel >= D3D_SHADER_MODEL_6_2 &&
featureData4.Native16BitShaderOpsSupported; featureData4.Native16BitShaderOpsSupported;
} }
break;
}
case D3D_SHADER_MODEL_6_1: {
info.shaderModel = 61;
info.shaderProfiles[SingleShaderStage::Vertex] = L"vs_6_1";
info.shaderProfiles[SingleShaderStage::Fragment] = L"ps_6_1";
info.shaderProfiles[SingleShaderStage::Compute] = L"cs_6_1";
break;
}
case D3D_SHADER_MODEL_6_0: {
info.shaderModel = 60;
info.shaderProfiles[SingleShaderStage::Vertex] = L"vs_6_0";
info.shaderProfiles[SingleShaderStage::Fragment] = L"ps_6_0";
info.shaderProfiles[SingleShaderStage::Compute] = L"cs_6_0";
break;
}
default: {
info.shaderModel = 51;
info.shaderProfiles[SingleShaderStage::Vertex] = L"vs_5_1";
info.shaderProfiles[SingleShaderStage::Fragment] = L"ps_5_1";
info.shaderProfiles[SingleShaderStage::Compute] = L"cs_5_1";
break;
}
}
// Successfully find the maximum supported shader model.
break;
}
}
return std::move(info); return std::move(info);
} }
}} // namespace dawn_native::d3d12 }} // namespace dawn_native::d3d12

2
src/dawn_native/d3d12/D3D12Info.h
View File

@ -29,7 +29,7 @@ namespace dawn_native { namespace d3d12 {
bool supportsRenderPass; bool supportsRenderPass;
bool supportsShaderFloat16; bool supportsShaderFloat16;
// shaderModel indicates the maximum supported shader model, for example, the value 62 // shaderModel indicates the maximum supported shader model, for example, the value 62
// indicates that current driver supports the maximum shader model is D3D_SHADER_MODEL_6_2. // indicates that current driver supports the maximum shader model is shader model 6.2.
uint32_t shaderModel; uint32_t shaderModel;
PerStage<std::wstring> shaderProfiles; PerStage<std::wstring> shaderProfiles;
}; };