encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-08-09 05:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of EmitVertexPointSize transform

Browse Source 
This is now handled inside the SPIR-V sanitizing transform and can be
enabled via a transform config option.

Fixed: tint:753
Change-Id: I897c60dd304dd4643cc905a8ca3001dd963c5fb0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/50060
Auto-Submit: James Price <jrprice@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
James Price 2021-05-07 07:18:05 +00:00 committed by Commit Bot service account
parent 09a97ad446
commit b8c7724079
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dawn_native/ShaderModule.cpp
View File

@ -1106,11 +1106,14 @@ namespace dawn_native {
parseResult->tintSource = std::move(tintSource); parseResult->tintSource = std::move(tintSource);
} else { } else {
tint::transform::Manager transformManager; tint::transform::Manager transformManager;
transformManager.Add<tint::transform::EmitVertexPointSize>();
transformManager.Add<tint::transform::Spirv>(); transformManager.Add<tint::transform::Spirv>();
tint::transform::DataMap transformInputs; tint::transform::DataMap transformInputs;
tint::transform::Spirv::Config spirv_cfg;
spirv_cfg.emit_vertex_point_size = true;
transformInputs.Add<tint::transform::Spirv::Config>(spirv_cfg);
DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, &program, DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, &program,
transformInputs, nullptr, outMessages)); transformInputs, nullptr, outMessages));
@ -1309,13 +1312,17 @@ namespace dawn_native {
tint::transform::Manager transformManager; tint::transform::Manager transformManager;
transformManager.Add<tint::transform::VertexPulling>(); transformManager.Add<tint::transform::VertexPulling>();
transformManager.Add<tint::transform::EmitVertexPointSize>();
transformManager.Add<tint::transform::Spirv>(); transformManager.Add<tint::transform::Spirv>();
if (GetDevice()->IsRobustnessEnabled()) { if (GetDevice()->IsRobustnessEnabled()) {
transformManager.Add<tint::transform::BoundArrayAccessors>(); transformManager.Add<tint::transform::BoundArrayAccessors>();
} }
tint::transform::DataMap transformInputs; tint::transform::DataMap transformInputs;
tint::transform::Spirv::Config spirv_cfg;
spirv_cfg.emit_vertex_point_size = true;
transformInputs.Add<tint::transform::Spirv::Config>(spirv_cfg);
AddVertexPullingTransformConfig(vertexState, entryPoint, pullingBufferBindingSet, AddVertexPullingTransformConfig(vertexState, entryPoint, pullingBufferBindingSet,
&transformInputs); &transformInputs);

5
src/dawn_native/vulkan/ShaderModuleVk.cpp
View File

@ -58,11 +58,14 @@ namespace dawn_native { namespace vulkan {
if (GetDevice()->IsRobustnessEnabled()) { if (GetDevice()->IsRobustnessEnabled()) {
transformManager.Add<tint::transform::BoundArrayAccessors>(); transformManager.Add<tint::transform::BoundArrayAccessors>();
} }
transformManager.Add<tint::transform::EmitVertexPointSize>();
transformManager.Add<tint::transform::Spirv>(); transformManager.Add<tint::transform::Spirv>();
tint::transform::DataMap transformInputs; tint::transform::DataMap transformInputs;
tint::transform::Spirv::Config spirv_cfg;
spirv_cfg.emit_vertex_point_size = true;
transformInputs.Add<tint::transform::Spirv::Config>(spirv_cfg);
tint::Program program; tint::Program program;
DAWN_TRY_ASSIGN(program, DAWN_TRY_ASSIGN(program,
RunTransforms(&transformManager, parseResult->tintProgram.get(), RunTransforms(&transformManager, parseResult->tintProgram.get(),