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

Rename BindGroupBinding -> BindGroupLayoutBinding 

This makes the name match WebGPU's IDL

BUG=dawn:3

Change-Id: I1338fa07580ba8c0f6700b7765fb7389018a4126
Reviewed-on: https://dawn-review.googlesource.com/c/2801
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2018-12-03 09:58:09 +00:00 committed by Commit Bot service account
parent 8b07e43dad
commit 9ca9435087
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dawn.json
View File

@ -70,7 +70,7 @@
"bind group layout": { "bind group layout": {
"category": "object" "category": "object"
}, },
"bind group binding": { "bind group layout binding": {
"category": "structure", "category": "structure",
"extensible": false, "extensible": false,
"members": [ "members": [
@ -84,7 +84,7 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "num bindings", "type": "uint32_t"}, {"name": "num bindings", "type": "uint32_t"},
{"name": "bindings", "type": "bind group binding", "annotation": "const*", "length": "num bindings"} {"name": "bindings", "type": "bind group layout binding", "annotation": "const*", "length": "num bindings"}
] ]
}, },
"binding type": { "binding type": {

2
src/tests/unittests/WireTests.cpp
View File

@ -447,7 +447,7 @@ TEST_F(WireTests, StructureOfObjectArrayArgument) {
// Test that the wire is able to send structures that contain objects // Test that the wire is able to send structures that contain objects
TEST_F(WireTests, StructureOfStructureArrayArgument) { TEST_F(WireTests, StructureOfStructureArrayArgument) {
static constexpr int NUM_BINDINGS = 3; static constexpr int NUM_BINDINGS = 3;
dawnBindGroupBinding bindings[NUM_BINDINGS]{ dawnBindGroupLayoutBinding bindings[NUM_BINDINGS]{
{0, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLER}, {0, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLER},
{1, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLED_TEXTURE}, {1, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLED_TEXTURE},
{2, {2,

9
src/utils/DawnHelpers.cpp
View File

@ -209,10 +209,11 @@ namespace utils {
dawn::BindGroupLayout MakeBindGroupLayout( dawn::BindGroupLayout MakeBindGroupLayout(
const dawn::Device& device, const dawn::Device& device,
std::initializer_list<dawn::BindGroupBinding> bindingsInitializer) { std::initializer_list<dawn::BindGroupLayoutBinding> bindingsInitializer) {
std::vector<dawn::BindGroupBinding> bindings; constexpr dawn::ShaderStageBit kNoStages{};
dawn::ShaderStageBit kNoStages{};
for (const dawn::BindGroupBinding& binding : bindingsInitializer) { std::vector<dawn::BindGroupLayoutBinding> bindings;
for (const dawn::BindGroupLayoutBinding& binding : bindingsInitializer) {
if (binding.visibility != kNoStages) { if (binding.visibility != kNoStages) {
bindings.push_back(binding); bindings.push_back(binding);
} }

2
src/utils/DawnHelpers.h
View File

@ -63,6 +63,6 @@ namespace utils {
const dawn::BindGroupLayout* bindGroupLayout); const dawn::BindGroupLayout* bindGroupLayout);
dawn::BindGroupLayout MakeBindGroupLayout( dawn::BindGroupLayout MakeBindGroupLayout(
const dawn::Device& device, const dawn::Device& device,
std::initializer_list<dawn::BindGroupBinding> bindingsInitializer); std::initializer_list<dawn::BindGroupLayoutBinding> bindingsInitializer);
} // namespace utils } // namespace utils