encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-08 22:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PipelineStageDescriptor to ProgrammableStageDescriptor

Browse Source 
This is to match the WebGPU's WebIDL[1].

[1] https://github.com/gpuweb/gpuweb/pull/359

Bug: dawn:22
Change-Id: Id0cf0a7a6605ea7ec474d0f0885685ed21875dce
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11883
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Jinho Bang 2019-10-07 12:23:09 +00:00 committed by Commit Bot service account
parent 90a5595bbe
commit 0b82671047
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dawn.json
View File

@ -428,7 +428,7 @@
"members": [ "members": [
{"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true}, {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
{"name": "layout", "type": "pipeline layout"}, {"name": "layout", "type": "pipeline layout"},
{"name": "compute stage", "type": "pipeline stage descriptor"} {"name": "compute stage", "type": "programmable stage descriptor"}
] ]
}, },
"cull mode": { "cull mode": {
@ -751,7 +751,7 @@
{"name": "bind group layouts", "type": "bind group layout", "annotation": "const*", "length": "bind group layout count"} {"name": "bind group layouts", "type": "bind group layout", "annotation": "const*", "length": "bind group layout count"}
] ]
}, },
"pipeline stage descriptor": { "programmable stage descriptor": {
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
@ -1094,8 +1094,8 @@
"members": [ "members": [
{"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true}, {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
{"name": "layout", "type": "pipeline layout"}, {"name": "layout", "type": "pipeline layout"},
{"name": "vertex stage", "type": "pipeline stage descriptor"}, {"name": "vertex stage", "type": "programmable stage descriptor"},
{"name": "fragment stage", "type": "pipeline stage descriptor", "annotation": "const*", "optional": true}, {"name": "fragment stage", "type": "programmable stage descriptor", "annotation": "const*", "optional": true},
{"name": "vertex input", "type": "vertex input descriptor", "annotation": "const*", "optional": true}, {"name": "vertex input", "type": "vertex input descriptor", "annotation": "const*", "optional": true},
{"name": "primitive topology", "type": "primitive topology"}, {"name": "primitive topology", "type": "primitive topology"},
{"name": "rasterization state", "type": "rasterization state descriptor", "annotation": "const*", "optional": true}, {"name": "rasterization state", "type": "rasterization state descriptor", "annotation": "const*", "optional": true},

2
examples/CHelloTriangle.cpp
View File

@ -67,7 +67,7 @@ void init() {
descriptor.vertexStage.module = vsModule; descriptor.vertexStage.module = vsModule;
descriptor.vertexStage.entryPoint = "main"; descriptor.vertexStage.entryPoint = "main";
DawnPipelineStageDescriptor fragmentStage; DawnProgrammableStageDescriptor fragmentStage;
fragmentStage.nextInChain = nullptr; fragmentStage.nextInChain = nullptr;
fragmentStage.module = fsModule; fragmentStage.module = fsModule;
fragmentStage.entryPoint = "main"; fragmentStage.entryPoint = "main";

4
src/dawn_native/ComputePipeline.cpp
View File

@ -26,8 +26,8 @@ namespace dawn_native {
} }
DAWN_TRY(device->ValidateObject(descriptor->layout)); DAWN_TRY(device->ValidateObject(descriptor->layout));
DAWN_TRY(ValidatePipelineStageDescriptor(device, &descriptor->computeStage, DAWN_TRY(ValidateProgrammableStageDescriptor(
descriptor->layout, SingleShaderStage::Compute)); device, &descriptor->computeStage, descriptor->layout, SingleShaderStage::Compute));
return {}; return {};
} }

8
src/dawn_native/Pipeline.cpp
View File

@ -20,10 +20,10 @@
namespace dawn_native { namespace dawn_native {
MaybeError ValidatePipelineStageDescriptor(const DeviceBase* device, MaybeError ValidateProgrammableStageDescriptor(const DeviceBase* device,
const PipelineStageDescriptor* descriptor, const ProgrammableStageDescriptor* descriptor,
const PipelineLayoutBase* layout, const PipelineLayoutBase* layout,
SingleShaderStage stage) { SingleShaderStage stage) {
DAWN_TRY(device->ValidateObject(descriptor->module)); DAWN_TRY(device->ValidateObject(descriptor->module));
if (descriptor->entryPoint != std::string("main")) { if (descriptor->entryPoint != std::string("main")) {

8
src/dawn_native/Pipeline.h
View File

@ -28,10 +28,10 @@
namespace dawn_native { namespace dawn_native {
MaybeError ValidatePipelineStageDescriptor(const DeviceBase* device, MaybeError ValidateProgrammableStageDescriptor(const DeviceBase* device,
const PipelineStageDescriptor* descriptor, const ProgrammableStageDescriptor* descriptor,
const PipelineLayoutBase* layout, const PipelineLayoutBase* layout,
SingleShaderStage stage); SingleShaderStage stage);
class PipelineBase : public ObjectBase { class PipelineBase : public ObjectBase {
public: public:

8
src/dawn_native/RenderPipeline.cpp
View File

@ -289,10 +289,10 @@ namespace dawn_native {
} }
DAWN_TRY(ValidatePrimitiveTopology(descriptor->primitiveTopology)); DAWN_TRY(ValidatePrimitiveTopology(descriptor->primitiveTopology));
DAWN_TRY(ValidatePipelineStageDescriptor(device, &descriptor->vertexStage, DAWN_TRY(ValidateProgrammableStageDescriptor(
descriptor->layout, SingleShaderStage::Vertex)); device, &descriptor->vertexStage, descriptor->layout, SingleShaderStage::Vertex));
DAWN_TRY(ValidatePipelineStageDescriptor(device, descriptor->fragmentStage, DAWN_TRY(ValidateProgrammableStageDescriptor(
descriptor->layout, SingleShaderStage::Fragment)); device, descriptor->fragmentStage, descriptor->layout, SingleShaderStage::Fragment));
if (descriptor->rasterizationState) { if (descriptor->rasterizationState) {
DAWN_TRY(ValidateRasterizationStateDescriptor(descriptor->rasterizationState)); DAWN_TRY(ValidateRasterizationStateDescriptor(descriptor->rasterizationState));

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

@ -517,7 +517,7 @@ TEST_P(TextureZeroInitTest, ComputePassSampledTextureClear) {
// Create compute pipeline // Create compute pipeline
dawn::ComputePipelineDescriptor computePipelineDescriptor; dawn::ComputePipelineDescriptor computePipelineDescriptor;
computePipelineDescriptor.layout = utils::MakeBasicPipelineLayout(device, &bindGroupLayout); computePipelineDescriptor.layout = utils::MakeBasicPipelineLayout(device, &bindGroupLayout);
dawn::PipelineStageDescriptor computeStage; dawn::ProgrammableStageDescriptor computeStage;
const char* cs = const char* cs =
R"(#version 450 R"(#version 450
layout(binding = 0) uniform texture2D sampleTex; layout(binding = 0) uniform texture2D sampleTex;

2
src/tests/unittests/wire/WireArgumentTests.cpp
View File

@ -166,7 +166,7 @@ TEST_F(WireArgumentTests, CStringArgument) {
pipelineDescriptor.vertexStage.module = vsModule; pipelineDescriptor.vertexStage.module = vsModule;
pipelineDescriptor.vertexStage.entryPoint = "main"; pipelineDescriptor.vertexStage.entryPoint = "main";
DawnPipelineStageDescriptor fragmentStage; DawnProgrammableStageDescriptor fragmentStage;
fragmentStage.nextInChain = nullptr; fragmentStage.nextInChain = nullptr;
fragmentStage.module = vsModule; fragmentStage.module = vsModule;
fragmentStage.entryPoint = "main"; fragmentStage.entryPoint = "main";

2
src/tests/unittests/wire/WireOptionalTests.cpp
View File

@ -141,7 +141,7 @@ TEST_F(WireOptionalTests, OptionalStructPointer) {
pipelineDescriptor.vertexStage.module = vsModule; pipelineDescriptor.vertexStage.module = vsModule;
pipelineDescriptor.vertexStage.entryPoint = "main"; pipelineDescriptor.vertexStage.entryPoint = "main";
DawnPipelineStageDescriptor fragmentStage; DawnProgrammableStageDescriptor fragmentStage;
fragmentStage.nextInChain = nullptr; fragmentStage.nextInChain = nullptr;
fragmentStage.module = vsModule; fragmentStage.module = vsModule;
fragmentStage.entryPoint = "main"; fragmentStage.entryPoint = "main";

2
src/utils/ComboRenderPipelineDescriptor.h
View File

@ -40,7 +40,7 @@ namespace utils {
ComboRenderPipelineDescriptor(ComboRenderPipelineDescriptor&&) = delete; ComboRenderPipelineDescriptor(ComboRenderPipelineDescriptor&&) = delete;
ComboRenderPipelineDescriptor& operator=(ComboRenderPipelineDescriptor&&) = delete; ComboRenderPipelineDescriptor& operator=(ComboRenderPipelineDescriptor&&) = delete;
dawn::PipelineStageDescriptor cFragmentStage; dawn::ProgrammableStageDescriptor cFragmentStage;
ComboVertexInputDescriptor cVertexInput; ComboVertexInputDescriptor cVertexInput;
dawn::RasterizationStateDescriptor cRasterizationState; dawn::RasterizationStateDescriptor cRasterizationState;