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

Remove BindGroupBuilder::SetUsage 

BindGroup usage isn't something that's part of WebGPU's sketch.idl and
it might never exist. Remove it to simplify the migration of bindgroup
to descriptor.

Change-Id: I21e0a98eb60434d4009e748cd9afcbf89edd7e6a
This commit is contained in:
Corentin Wallez 2018-08-20 17:37:57 +02:00 committed by Corentin Wallez
parent df6710358b
commit f35eff3fde
13 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dawn.json
View File

@ -33,12 +33,6 @@
{"name": "layout", "type": "bind group layout"}
]
},
{
"name": "set usage",
"args": [
{"name": "usage", "type": "bind group usage"}
]
},
{
"name": "set buffer views",
"args": [
@ -68,13 +62,6 @@
"When resource are added, add methods for setting the content of the bind group"
]
},
"bind group usage": {
"category": "enum",
"values": [
{"value": 0, "name": "frozen"},
{"value": 1, "name": "dynamic"}
]
},
"bind group layout": {
"category": "object"
},

1
examples/ComputeBoids.cpp
View File

@ -250,7 +250,6 @@ void initSim() {
for (uint32_t i = 0; i < 2; ++i) {
updateBGs[i] = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &updateParamsView)
.SetBufferViews(1, 1, &views[i])
.SetBufferViews(2, 1, &views[(i + 1) % 2])

1
examples/CppHelloTriangle.cpp
View File

@ -132,7 +132,6 @@ void init() {
bindGroup = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetSamplers(0, 1, &sampler)
.SetTextureViews(1, 1, &view)
.GetResult();

2
examples/CubeReflection.cpp
View File

@ -195,14 +195,12 @@ void init() {
bindGroup[0] = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &cameraBufferView)
.SetBufferViews(1, 1, &transformBufferView[0])
.GetResult();
bindGroup[1] = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &cameraBufferView)
.SetBufferViews(1, 1, &transformBufferView[1])
.GetResult();

4
examples/glTFViewer/glTFViewer.cpp
View File

@ -299,8 +299,8 @@ namespace {
.GetResult();
auto bindGroupBuilder = device.CreateBindGroupBuilder();
bindGroupBuilder.SetLayout(bindGroupLayout)
.SetUsage(dawn::BindGroupUsage::Frozen);
bindGroupBuilder.SetLayout(bindGroupLayout);
if (hasTexture) {
const auto& textureView = textures[iTextureID];
const auto& iSamplerID = scene.textures[iTextureID].sampler;

20
src/dawn_native/BindGroup.cpp
View File

@ -27,7 +27,6 @@ namespace dawn_native {
BindGroupBase::BindGroupBase(BindGroupBuilder* builder)
: mLayout(std::move(builder->mLayout)),
mUsage(builder->mUsage),
mBindings(std::move(builder->mBindings)) {
}
@ -35,10 +34,6 @@ namespace dawn_native {
return mLayout.Get();
}
dawn::BindGroupUsage BindGroupBase::GetUsage() const {
return mUsage;
}
BufferViewBase* BindGroupBase::GetBindingAsBufferView(size_t binding) {
ASSERT(binding < kMaxBindingsPerGroup);
ASSERT(mLayout->GetBindingInfo().mask[binding]);
@ -68,15 +63,14 @@ namespace dawn_native {
// BindGroupBuilder
enum BindGroupSetProperties {
BINDGROUP_PROPERTY_USAGE = 0x1,
BINDGROUP_PROPERTY_LAYOUT = 0x2,
BINDGROUP_PROPERTY_LAYOUT = 0x1,
};
BindGroupBuilder::BindGroupBuilder(DeviceBase* device) : Builder(device) {
}
BindGroupBase* BindGroupBuilder::GetResultImpl() {
constexpr int allProperties = BINDGROUP_PROPERTY_USAGE | BINDGROUP_PROPERTY_LAYOUT;
constexpr int allProperties = BINDGROUP_PROPERTY_LAYOUT;
if ((mPropertiesSet & allProperties) != allProperties) {
HandleError("Bindgroup missing properties");
return nullptr;
@ -100,16 +94,6 @@ namespace dawn_native {
mPropertiesSet |= BINDGROUP_PROPERTY_LAYOUT;
}
void BindGroupBuilder::SetUsage(dawn::BindGroupUsage usage) {
if ((mPropertiesSet & BINDGROUP_PROPERTY_USAGE) != 0) {
HandleError("Bindgroup usage property set multiple times");
return;
}
mUsage = usage;
mPropertiesSet |= BINDGROUP_PROPERTY_USAGE;
}
void BindGroupBuilder::SetBufferViews(uint32_t start,
uint32_t count,
BufferViewBase* const* bufferViews) {

4
src/dawn_native/BindGroup.h
View File

@ -33,7 +33,6 @@ namespace dawn_native {
BindGroupBase(BindGroupBuilder* builder);
const BindGroupLayoutBase* GetLayout() const;
dawn::BindGroupUsage GetUsage() const;
BufferViewBase* GetBindingAsBufferView(size_t binding);
SamplerBase* GetBindingAsSampler(size_t binding);
TextureViewBase* GetBindingAsTextureView(size_t binding);
@ -42,7 +41,6 @@ namespace dawn_native {
private:
Ref<BindGroupLayoutBase> mLayout;
dawn::BindGroupUsage mUsage;
std::array<Ref<RefCounted>, kMaxBindingsPerGroup> mBindings;
};
@ -52,7 +50,6 @@ namespace dawn_native {
// Dawn API
void SetLayout(BindGroupLayoutBase* layout);
void SetUsage(dawn::BindGroupUsage usage);
void SetBufferViews(uint32_t start, uint32_t count, BufferViewBase* const* bufferViews);
void SetSamplers(uint32_t start, uint32_t count, SamplerBase* const* samplers);
@ -69,7 +66,6 @@ namespace dawn_native {
int mPropertiesSet = 0;
Ref<BindGroupLayoutBase> mLayout;
dawn::BindGroupUsage mUsage;
std::array<Ref<RefCounted>, kMaxBindingsPerGroup> mBindings;
};

1
src/tests/end2end/BlendStateTests.cpp
View File

@ -103,7 +103,6 @@ class BlendStateTest : public DawnTest {
return device.CreateBindGroupBuilder()
.SetLayout(bindGroupLayout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &view)
.GetResult();
}

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

@ -73,7 +73,6 @@ void ComputeCopyStorageBufferTests::BasicTest(const char* shader) {
// Set up bind group and issue dispatch
auto bindGroup = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &srcView)
.SetBufferViews(1, 1, &dstView)
.GetResult();

1
src/tests/end2end/DepthStencilStateTests.cpp
View File

@ -210,7 +210,6 @@ class DepthStencilStateTest : public DawnTest {
// Create a bind group for the data
dawn::BindGroup bindGroup = device.CreateBindGroupBuilder()
.SetLayout(bindGroupLayout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &view)
.GetResult();

1
src/tests/end2end/PushConstantTests.cpp
View File

@ -61,7 +61,6 @@ class PushConstantTest: public DawnTest {
dawn::BindGroup bg = device.CreateBindGroupBuilder()
.SetLayout(bgl)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, extraBuffer ? 2 : 1, views)
.GetResult();

1
src/tests/end2end/SamplerTests.cpp
View File

@ -120,7 +120,6 @@ protected:
auto bindGroup = device.CreateBindGroupBuilder()
.SetLayout(mBindGroupLayout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetSamplers(0, 1, &sampler)
.SetTextureViews(1, 1, &mTextureView)
.GetResult();

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

@ -37,7 +37,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeSuccess(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}
@ -50,7 +49,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeSuccess(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}
@ -63,7 +61,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeError(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}
@ -75,7 +72,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeError(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}
@ -87,7 +83,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeError(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}
@ -99,7 +94,6 @@ TEST_F(BindGroupValidationTest, BufferViewOffset) {
auto bindGroup = AssertWillBeError(device.CreateBindGroupBuilder())
.SetLayout(layout)
.SetUsage(dawn::BindGroupUsage::Frozen)
.SetBufferViews(0, 1, &bufferView)
.GetResult();
}