encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-15 11:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove indirection for computeStage

Browse Source 
This is to match the work in progress webgpu.h header.

BUG=dawn:22

Change-Id: I0904297bb4411b12f9d99e8457d32613058ef9b2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9380
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2019-09-05 09:41:17 +00:00 committed by Commit Bot service account
parent a560104617
commit a900ccebcf
17 changed files with 48 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dawn.json
View File

@ -401,7 +401,7 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "layout", "type": "pipeline layout"}, {"name": "layout", "type": "pipeline layout"},
{"name": "compute stage", "type": "pipeline stage descriptor", "annotation": "const*"} {"name": "compute stage", "type": "pipeline stage descriptor"}
] ]
}, },
"cull mode": { "cull mode": {

8
examples/ComputeBoids.cpp
View File

@ -248,12 +248,8 @@ void initSim() {
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
csDesc.layout = pl; csDesc.layout = pl;
csDesc.computeStage.module = module;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.entryPoint = "main";
computeStage.module = module;
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
updatePipeline = device.CreateComputePipeline(&csDesc); updatePipeline = device.CreateComputePipeline(&csDesc);
for (uint32_t i = 0; i < 2; ++i) { for (uint32_t i = 0; i < 2; ++i) {

6
src/dawn_native/ComputePipeline.cpp
View File

@ -26,7 +26,7 @@ namespace dawn_native {
} }
DAWN_TRY(device->ValidateObject(descriptor->layout)); DAWN_TRY(device->ValidateObject(descriptor->layout));
DAWN_TRY(ValidatePipelineStageDescriptor(device, descriptor->computeStage, DAWN_TRY(ValidatePipelineStageDescriptor(device, &descriptor->computeStage,
descriptor->layout, SingleShaderStage::Compute)); descriptor->layout, SingleShaderStage::Compute));
return {}; return {};
} }
@ -37,8 +37,8 @@ namespace dawn_native {
const ComputePipelineDescriptor* descriptor, const ComputePipelineDescriptor* descriptor,
bool blueprint) bool blueprint)
: PipelineBase(device, descriptor->layout, dawn::ShaderStage::Compute), : PipelineBase(device, descriptor->layout, dawn::ShaderStage::Compute),
mModule(descriptor->computeStage->module), mModule(descriptor->computeStage.module),
mEntryPoint(descriptor->computeStage->entryPoint), mEntryPoint(descriptor->computeStage.entryPoint),
mIsBlueprint(blueprint) { mIsBlueprint(blueprint) {
} }

4
src/dawn_native/d3d12/ComputePipelineD3D12.cpp
View File

@ -32,7 +32,7 @@ namespace dawn_native { namespace d3d12 {
// SPRIV-cross does matrix multiplication expecting row major matrices // SPRIV-cross does matrix multiplication expecting row major matrices
compileFlags |= D3DCOMPILE_PACK_MATRIX_ROW_MAJOR; compileFlags |= D3DCOMPILE_PACK_MATRIX_ROW_MAJOR;
const ShaderModule* module = ToBackend(descriptor->computeStage->module); const ShaderModule* module = ToBackend(descriptor->computeStage.module);
const std::string& hlslSource = module->GetHLSLSource(ToBackend(GetLayout())); const std::string& hlslSource = module->GetHLSLSource(ToBackend(GetLayout()));
ComPtr<ID3DBlob> compiledShader; ComPtr<ID3DBlob> compiledShader;
@ -40,7 +40,7 @@ namespace dawn_native { namespace d3d12 {
const PlatformFunctions* functions = device->GetFunctions(); const PlatformFunctions* functions = device->GetFunctions();
if (FAILED(functions->d3dCompile(hlslSource.c_str(), hlslSource.length(), nullptr, nullptr, if (FAILED(functions->d3dCompile(hlslSource.c_str(), hlslSource.length(), nullptr, nullptr,
nullptr, descriptor->computeStage->entryPoint, "cs_5_1", nullptr, descriptor->computeStage.entryPoint, "cs_5_1",
compileFlags, 0, &compiledShader, &errors))) { compileFlags, 0, &compiledShader, &errors))) {
printf("%s\n", reinterpret_cast<char*>(errors->GetBufferPointer())); printf("%s\n", reinterpret_cast<char*>(errors->GetBufferPointer()));
ASSERT(false); ASSERT(false);

4
src/dawn_native/metal/ComputePipelineMTL.mm
View File

@ -23,8 +23,8 @@ namespace dawn_native { namespace metal {
: ComputePipelineBase(device, descriptor) { : ComputePipelineBase(device, descriptor) {
auto mtlDevice = ToBackend(GetDevice())->GetMTLDevice(); auto mtlDevice = ToBackend(GetDevice())->GetMTLDevice();
const ShaderModule* computeModule = ToBackend(descriptor->computeStage->module); const ShaderModule* computeModule = ToBackend(descriptor->computeStage.module);
const char* computeEntryPoint = descriptor->computeStage->entryPoint; const char* computeEntryPoint = descriptor->computeStage.entryPoint;
ShaderModule::MetalFunctionData computeData = computeModule->GetFunction( ShaderModule::MetalFunctionData computeData = computeModule->GetFunction(
computeEntryPoint, SingleShaderStage::Compute, ToBackend(GetLayout())); computeEntryPoint, SingleShaderStage::Compute, ToBackend(GetLayout()));

2
src/dawn_native/opengl/ComputePipelineGL.cpp
View File

@ -21,7 +21,7 @@ namespace dawn_native { namespace opengl {
ComputePipeline::ComputePipeline(Device* device, const ComputePipelineDescriptor* descriptor) ComputePipeline::ComputePipeline(Device* device, const ComputePipelineDescriptor* descriptor)
: ComputePipelineBase(device, descriptor) { : ComputePipelineBase(device, descriptor) {
PerStage<const ShaderModule*> modules(nullptr); PerStage<const ShaderModule*> modules(nullptr);
modules[SingleShaderStage::Compute] = ToBackend(descriptor->computeStage->module); modules[SingleShaderStage::Compute] = ToBackend(descriptor->computeStage.module);
PipelineGL::Initialize(device->gl, ToBackend(descriptor->layout), modules); PipelineGL::Initialize(device->gl, ToBackend(descriptor->layout), modules);
} }

4
src/dawn_native/vulkan/ComputePipelineVk.cpp
View File

@ -35,8 +35,8 @@ namespace dawn_native { namespace vulkan {
createInfo.stage.pNext = nullptr; createInfo.stage.pNext = nullptr;
createInfo.stage.flags = 0; createInfo.stage.flags = 0;
createInfo.stage.stage = VK_SHADER_STAGE_COMPUTE_BIT; createInfo.stage.stage = VK_SHADER_STAGE_COMPUTE_BIT;
createInfo.stage.module = ToBackend(descriptor->computeStage->module)->GetHandle(); createInfo.stage.module = ToBackend(descriptor->computeStage.module)->GetHandle();
createInfo.stage.pName = descriptor->computeStage->entryPoint; createInfo.stage.pName = descriptor->computeStage.entryPoint;
createInfo.stage.pSpecializationInfo = nullptr; createInfo.stage.pSpecializationInfo = nullptr;
if (device->fn.CreateComputePipelines(device->GetVkDevice(), VK_NULL_HANDLE, 1, &createInfo, if (device->fn.CreateComputePipelines(device->GetVkDevice(), VK_NULL_HANDLE, 1, &createInfo,

9
src/tests/end2end/BindGroupTests.cpp
View File

@ -65,14 +65,11 @@ TEST_P(BindGroupTests, ReusedBindGroupSingleSubmit) {
dawn::ShaderModule module = dawn::ShaderModule module =
utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, shader); utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, shader);
dawn::ComputePipelineDescriptor cpDesc; dawn::ComputePipelineDescriptor cpDesc;
cpDesc.layout = pl; cpDesc.layout = pl;
cpDesc.computeStage.module = module;
dawn::PipelineStageDescriptor computeStage; cpDesc.computeStage.entryPoint = "main";
computeStage.module = module;
computeStage.entryPoint = "main";
cpDesc.computeStage = &computeStage;
dawn::ComputePipeline cp = device.CreateComputePipeline(&cpDesc); dawn::ComputePipeline cp = device.CreateComputePipeline(&cpDesc);
dawn::BufferDescriptor bufferDesc; dawn::BufferDescriptor bufferDesc;

7
src/tests/end2end/ComputeCopyStorageBufferTests.cpp
View File

@ -40,11 +40,8 @@ void ComputeCopyStorageBufferTests::BasicTest(const char* shader) {
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
csDesc.layout = pl; csDesc.layout = pl;
csDesc.computeStage.module = module;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.entryPoint = "main";
computeStage.module = module;
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc);

8
src/tests/end2end/ComputeIndirectTests.cpp
View File

@ -58,12 +58,8 @@ void ComputeIndirectTests::BasicTest(std::initializer_list<uint32_t> bufferList,
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
csDesc.layout = pl; csDesc.layout = pl;
csDesc.computeStage.module = module;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.entryPoint = "main";
computeStage.module = module;
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc);
// Set up dst storage buffer to contain dispatch x, y, z // Set up dst storage buffer to contain dispatch x, y, z

8
src/tests/end2end/ComputeSharedMemoryTests.cpp
View File

@ -37,12 +37,8 @@ void ComputeSharedMemoryTests::BasicTest(const char* shader) {
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
csDesc.layout = pl; csDesc.layout = pl;
csDesc.computeStage.module = module;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.entryPoint = "main";
computeStage.module = module;
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc);
// Set up dst storage buffer // Set up dst storage buffer

6
src/tests/end2end/DynamicBufferOffsetTests.cpp
View File

@ -194,10 +194,8 @@ class DynamicBufferOffsetTests : public DawnTest {
utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, cs.str().c_str()); utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, cs.str().c_str());
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.module = csModule;
computeStage.module = csModule; csDesc.computeStage.entryPoint = "main";
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
dawn::PipelineLayoutDescriptor pipelineLayoutDescriptor; dawn::PipelineLayoutDescriptor pipelineLayoutDescriptor;
if (isInheritedPipeline) { if (isInheritedPipeline) {

21
src/tests/end2end/ObjectCachingTests.cpp
View File

@ -140,20 +140,17 @@ TEST_P(ObjectCachingTest, ComputePipelineDeduplicationOnShaderModule) {
dawn::PipelineLayout layout = utils::MakeBasicPipelineLayout(device, nullptr); dawn::PipelineLayout layout = utils::MakeBasicPipelineLayout(device, nullptr);
dawn::PipelineStageDescriptor stageDesc;
stageDesc.entryPoint = "main";
stageDesc.module = module;
dawn::ComputePipelineDescriptor desc; dawn::ComputePipelineDescriptor desc;
desc.computeStage = &stageDesc; desc.computeStage.entryPoint = "main";
desc.layout = layout; desc.layout = layout;
desc.computeStage.module = module;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&desc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&desc);
stageDesc.module = sameModule; desc.computeStage.module = sameModule;
dawn::ComputePipeline samePipeline = device.CreateComputePipeline(&desc); dawn::ComputePipeline samePipeline = device.CreateComputePipeline(&desc);
stageDesc.module = otherModule; desc.computeStage.module = otherModule;
dawn::ComputePipeline otherPipeline = device.CreateComputePipeline(&desc); dawn::ComputePipeline otherPipeline = device.CreateComputePipeline(&desc);
EXPECT_NE(pipeline.Get(), otherPipeline.Get()); EXPECT_NE(pipeline.Get(), otherPipeline.Get());
@ -174,17 +171,15 @@ TEST_P(ObjectCachingTest, ComputePipelineDeduplicationOnLayout) {
EXPECT_NE(pl.Get(), otherPl.Get()); EXPECT_NE(pl.Get(), otherPl.Get());
EXPECT_EQ(pl.Get() == samePl.Get(), !UsesWire()); EXPECT_EQ(pl.Get() == samePl.Get(), !UsesWire());
dawn::PipelineStageDescriptor stageDesc; dawn::ComputePipelineDescriptor desc;
stageDesc.entryPoint = "main"; desc.computeStage.entryPoint = "main";
stageDesc.module = utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, R"( desc.computeStage.module =
utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, R"(
#version 450 #version 450
void main() { void main() {
int i = 0; int i = 0;
})"); })");
dawn::ComputePipelineDescriptor desc;
desc.computeStage = &stageDesc;
desc.layout = pl; desc.layout = pl;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&desc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&desc);

16
src/tests/end2end/OpArrayLengthTests.cpp
View File

@ -111,10 +111,12 @@ TEST_P(OpArrayLengthTest, Compute) {
plDesc.bindGroupLayouts = bgls; plDesc.bindGroupLayouts = bgls;
dawn::PipelineLayout pl = device.CreatePipelineLayout(&plDesc); dawn::PipelineLayout pl = device.CreatePipelineLayout(&plDesc);
dawn::PipelineStageDescriptor computeStage; dawn::ComputePipelineDescriptor pipelineDesc;
computeStage.entryPoint = "main"; pipelineDesc.layout = pl;
computeStage.module = utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, pipelineDesc.computeStage.entryPoint = "main";
(R"(#version 450 pipelineDesc.computeStage.module =
utils::CreateShaderModule(device, utils::SingleShaderStage::Compute,
(R"(#version 450
layout(std430, set = 1, binding = 0) buffer ResultBuffer { layout(std430, set = 1, binding = 0) buffer ResultBuffer {
uint result[3]; uint result[3];
}; };
@ -124,11 +126,7 @@ TEST_P(OpArrayLengthTest, Compute) {
result[1] = buffer2.data.length(); result[1] = buffer2.data.length();
result[2] = buffer3.data.length(); result[2] = buffer3.data.length();
})") })")
.c_str()); .c_str());
dawn::ComputePipelineDescriptor pipelineDesc;
pipelineDesc.layout = pl;
pipelineDesc.computeStage = &computeStage;
dawn::ComputePipeline pipeline = device.CreateComputePipeline(&pipelineDesc); dawn::ComputePipeline pipeline = device.CreateComputePipeline(&pipelineDesc);
// Run a single instance of the compute shader // Run a single instance of the compute shader

6
src/tests/end2end/TextureZeroInitTests.cpp
View File

@ -531,9 +531,9 @@ TEST_P(TextureZeroInitTest, ComputePassSampledTextureClear) {
bufferTex.result = bufferTex.result =
texelFetch(sampler2D(sampleTex, sampler0), ivec2(0,0), 0); texelFetch(sampler2D(sampleTex, sampler0), ivec2(0,0), 0);
})"; })";
computeStage.module = utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, cs); computePipelineDescriptor.computeStage.module =
computeStage.entryPoint = "main"; utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, cs);
computePipelineDescriptor.computeStage = &computeStage; computePipelineDescriptor.computeStage.entryPoint = "main";
dawn::ComputePipeline computePipeline = dawn::ComputePipeline computePipeline =
device.CreateComputePipeline(&computePipelineDescriptor); device.CreateComputePipeline(&computePipelineDescriptor);

10
src/tests/unittests/validation/BindGroupValidationTests.cpp
View File

@ -656,15 +656,13 @@ class SetBindGroupValidationTest : public ValidationTest {
void main() { void main() {
})"); })");
dawn::ComputePipelineDescriptor csDesc;
dawn::PipelineLayout pipelineLayout = dawn::PipelineLayout pipelineLayout =
utils::MakeBasicPipelineLayout(device, &mBindGroupLayout); utils::MakeBasicPipelineLayout(device, &mBindGroupLayout);
csDesc.layout = pipelineLayout;
dawn::PipelineStageDescriptor computeStage; dawn::ComputePipelineDescriptor csDesc;
computeStage.module = csModule; csDesc.layout = pipelineLayout;
computeStage.entryPoint = "main"; csDesc.computeStage.module = csModule;
csDesc.computeStage = &computeStage; csDesc.computeStage.entryPoint = "main";
return device.CreateComputePipeline(&csDesc); return device.CreateComputePipeline(&csDesc);
} }

8
src/tests/unittests/validation/ComputeIndirectValidationTests.cpp
View File

@ -34,12 +34,8 @@ class ComputeIndirectValidationTest : public ValidationTest {
dawn::ComputePipelineDescriptor csDesc; dawn::ComputePipelineDescriptor csDesc;
csDesc.layout = pl; csDesc.layout = pl;
csDesc.computeStage.module = computeModule;
dawn::PipelineStageDescriptor computeStage; csDesc.computeStage.entryPoint = "main";
computeStage.module = computeModule;
computeStage.entryPoint = "main";
csDesc.computeStage = &computeStage;
pipeline = device.CreateComputePipeline(&csDesc); pipeline = device.CreateComputePipeline(&csDesc);
} }