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

Add default values to dawn.json for dawncpp.h 

This adds almost all default values in descriptors that are present in
WebGPU to the C++ interface for Dawn.

This also fixes the indentation of dawncpp.h both by reindenting the
template, and making the indentation counting in generator_lib.py more
precise.

BUG=dawn:22

Change-Id: I9a852d26f78a3349f3d6eee7237407d1cf8ca426
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8680
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Corentin Wallez 2019-07-08 19:20:22 +00:00 committed by Commit Bot service account
parent 6be313225e
commit 8f93871dff
4 changed files with 150 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
dawn.json
View File

@ -31,7 +31,7 @@
"members": [ "members": [
{"name": "binding", "type": "uint32_t"}, {"name": "binding", "type": "uint32_t"},
{"name": "buffer", "type": "buffer", "optional": true}, {"name": "buffer", "type": "buffer", "optional": true},
{"name": "offset", "type": "uint64_t"}, {"name": "offset", "type": "uint64_t", "default": "0"},
{"name": "size", "type": "uint64_t"}, {"name": "size", "type": "uint64_t"},
{"name": "sampler", "type": "sampler", "optional": true}, {"name": "sampler", "type": "sampler", "optional": true},
{"name": "texture view", "type": "texture view", "optional": true} {"name": "texture view", "type": "texture view", "optional": true}
@ -81,9 +81,9 @@
"category": "structure", "category": "structure",
"extensible": false, "extensible": false,
"members": [ "members": [
{"name": "operation", "type": "blend operation"}, {"name": "operation", "type": "blend operation", "default": "add"},
{"name": "src factor", "type": "blend factor"}, {"name": "src factor", "type": "blend factor", "default": "one"},
{"name": "dst factor", "type": "blend factor"} {"name": "dst factor", "type": "blend factor", "default": "zero"}
] ]
}, },
"blend factor": { "blend factor": {
@ -121,7 +121,7 @@
{"name": "format", "type": "texture format"}, {"name": "format", "type": "texture format"},
{"name": "alpha blend", "type": "blend descriptor"}, {"name": "alpha blend", "type": "blend descriptor"},
{"name": "color blend", "type": "blend descriptor"}, {"name": "color blend", "type": "blend descriptor"},
{"name": "write mask", "type": "color write mask"} {"name": "write mask", "type": "color write mask", "default": "all"}
] ]
}, },
"bool": { "bool": {
@ -168,7 +168,7 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "buffer", "type": "buffer"}, {"name": "buffer", "type": "buffer"},
{"name": "offset", "type": "uint64_t"}, {"name": "offset", "type": "uint64_t", "default": 0},
{"name": "row pitch", "type": "uint32_t"}, {"name": "row pitch", "type": "uint32_t"},
{"name": "image height", "type": "uint32_t"} {"name": "image height", "type": "uint32_t"}
] ]
@ -353,8 +353,8 @@
"name": "dispatch", "name": "dispatch",
"args": [ "args": [
{"name": "x", "type": "uint32_t"}, {"name": "x", "type": "uint32_t"},
{"name": "y", "type": "uint32_t"}, {"name": "y", "type": "uint32_t", "default": "1"},
{"name": "z", "type": "uint32_t"} {"name": "z", "type": "uint32_t", "default": "1"}
] ]
}, },
{ {
@ -502,12 +502,12 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "format", "type": "texture format"}, {"name": "format", "type": "texture format"},
{"name": "depth write enabled", "type": "bool"}, {"name": "depth write enabled", "type": "bool", "default": "false"},
{"name": "depth compare", "type": "compare function"}, {"name": "depth compare", "type": "compare function", "default": "always"},
{"name": "stencil front", "type": "stencil state face descriptor"}, {"name": "stencil front", "type": "stencil state face descriptor"},
{"name": "stencil back", "type": "stencil state face descriptor"}, {"name": "stencil back", "type": "stencil state face descriptor"},
{"name": "stencil read mask", "type": "uint32_t"}, {"name": "stencil read mask", "type": "uint32_t", "default": "0xFFFFFFFF"},
{"name": "stencil write mask", "type": "uint32_t"} {"name": "stencil write mask", "type": "uint32_t", "default": "0xFFFFFFFF"}
] ]
}, },
"device error callback": { "device error callback": {
@ -563,7 +563,7 @@
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "initial value", "type": "uint64_t"} {"name": "initial value", "type": "uint64_t", "default": "0"}
] ]
}, },
"filter mode": { "filter mode": {
@ -595,7 +595,7 @@
"extensible": false, "extensible": false,
"members": [ "members": [
{"name": "shader location", "type": "uint32_t"}, {"name": "shader location", "type": "uint32_t"},
{"name": "offset", "type": "uint64_t"}, {"name": "offset", "type": "uint64_t", "default": "0"},
{"name": "format", "type": "vertex format"} {"name": "format", "type": "vertex format"}
] ]
}, },
@ -604,7 +604,7 @@
"extensible": false, "extensible": false,
"members": [ "members": [
{"name": "stride", "type": "uint64_t"}, {"name": "stride", "type": "uint64_t"},
{"name": "step mode", "type": "input step mode"}, {"name": "step mode", "type": "input step mode", "default": "vertex"},
{"name": "attribute count", "type": "uint32_t"}, {"name": "attribute count", "type": "uint32_t"},
{"name": "attributes", "type": "vertex attribute descriptor", "annotation": "const*", "length": "attribute count"} {"name": "attributes", "type": "vertex attribute descriptor", "annotation": "const*", "length": "attribute count"}
] ]
@ -613,7 +613,7 @@
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "index format", "type": "index format"}, {"name": "index format", "type": "index format", "default": "uint32"},
{"name": "buffer count", "type": "uint32_t"}, {"name": "buffer count", "type": "uint32_t"},
{"name": "buffers", "type": "vertex buffer descriptor", "annotation": "const*", "length": "buffer count"} {"name": "buffers", "type": "vertex buffer descriptor", "annotation": "const*", "length": "buffer count"}
] ]
@ -641,9 +641,9 @@
"origin 3D": { "origin 3D": {
"category": "structure", "category": "structure",
"members": [ "members": [
{"name": "x", "type": "uint32_t"}, {"name": "x", "type": "uint32_t", "default": "0"},
{"name": "y", "type": "uint32_t"}, {"name": "y", "type": "uint32_t", "default": "0"},
{"name": "z", "type": "uint32_t"} {"name": "z", "type": "uint32_t", "default": "0"}
] ]
}, },
"pipeline layout": { "pipeline layout": {
@ -706,11 +706,11 @@
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "front face", "type": "front face"}, {"name": "front face", "type": "front face", "default": "CCW"},
{"name": "cull mode", "type": "cull mode"}, {"name": "cull mode", "type": "cull mode", "default": "none"},
{"name": "depth bias", "type": "int32_t"}, {"name": "depth bias", "type": "int32_t", "default": "0"},
{"name": "depth bias slope scale", "type": "float"}, {"name": "depth bias slope scale", "type": "float", "default": "0.0f"},
{"name": "depth bias clamp", "type": "float"} {"name": "depth bias clamp", "type": "float", "default": "0.0f"}
] ]
}, },
@ -734,7 +734,7 @@
{"name": "clear depth", "type": "float"}, {"name": "clear depth", "type": "float"},
{"name": "stencil load op", "type": "load op"}, {"name": "stencil load op", "type": "load op"},
{"name": "stencil store op", "type": "store op"}, {"name": "stencil store op", "type": "store op"},
{"name": "clear stencil", "type": "uint32_t"} {"name": "clear stencil", "type": "uint32_t", "default": "0"}
] ]
}, },
@ -880,7 +880,7 @@
{"name": "vertex input", "type": "vertex input descriptor", "annotation": "const*"}, {"name": "vertex input", "type": "vertex input descriptor", "annotation": "const*"},
{"name": "primitive topology", "type": "primitive topology"}, {"name": "primitive topology", "type": "primitive topology"},
{"name": "rasterization state", "type": "rasterization state descriptor", "annotation": "const*"}, {"name": "rasterization state", "type": "rasterization state descriptor", "annotation": "const*"},
{"name": "sample count", "type": "uint32_t"}, {"name": "sample count", "type": "uint32_t", "default": "1"},
{"name": "depth stencil state", "type": "depth stencil state descriptor", "annotation": "const*", "optional": true}, {"name": "depth stencil state", "type": "depth stencil state descriptor", "annotation": "const*", "optional": true},
{"name": "color state count", "type": "uint32_t"}, {"name": "color state count", "type": "uint32_t"},
{"name": "color states", "type": "color state descriptor", "annotation": "const*const*", "length": "color state count"} {"name": "color states", "type": "color state descriptor", "annotation": "const*const*", "length": "color state count"}
@ -893,15 +893,15 @@
"category": "structure", "category": "structure",
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "address mode u", "type": "address mode"}, {"name": "address mode u", "type": "address mode", "default": "clamp to edge"},
{"name": "address mode v", "type": "address mode"}, {"name": "address mode v", "type": "address mode", "default": "clamp to edge"},
{"name": "address mode w", "type": "address mode"}, {"name": "address mode w", "type": "address mode", "default": "clamp to edge"},
{"name": "mag filter", "type": "filter mode"}, {"name": "mag filter", "type": "filter mode", "default": "nearest"},
{"name": "min filter", "type": "filter mode"}, {"name": "min filter", "type": "filter mode", "default": "nearest"},
{"name": "mipmap filter", "type": "filter mode"}, {"name": "mipmap filter", "type": "filter mode", "default": "nearest"},
{"name": "lod min clamp", "type": "float"}, {"name": "lod min clamp", "type": "float", "default": "0.0f"},
{"name": "lod max clamp", "type": "float"}, {"name": "lod max clamp", "type": "float", "default": "1000.0f"},
{"name": "compare", "type": "compare function"} {"name": "compare", "type": "compare function", "default": "never"}
] ]
}, },
"shader module": { "shader module": {
@ -949,10 +949,10 @@
"category": "structure", "category": "structure",
"extensible": false, "extensible": false,
"members": [ "members": [
{"name": "compare", "type": "compare function"}, {"name": "compare", "type": "compare function", "default": "always"},
{"name": "fail op", "type": "stencil operation"}, {"name": "fail op", "type": "stencil operation", "default": "keep"},
{"name": "depth fail op", "type": "stencil operation"}, {"name": "depth fail op", "type": "stencil operation", "default": "keep"},
{"name": "pass op", "type": "stencil operation"} {"name": "pass op", "type": "stencil operation", "default": "keep"}
] ]
}, },
"swap chain": { "swap chain": {
@ -1018,8 +1018,8 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "texture", "type": "texture"}, {"name": "texture", "type": "texture"},
{"name": "mip level", "type": "uint32_t"}, {"name": "mip level", "type": "uint32_t", "default": "0"},
{"name": "array layer", "type": "uint32_t"}, {"name": "array layer", "type": "uint32_t", "default": "0"},
{"name": "origin", "type": "origin 3D"} {"name": "origin", "type": "origin 3D"}
] ]
}, },
@ -1028,12 +1028,12 @@
"extensible": true, "extensible": true,
"members": [ "members": [
{"name": "usage", "type": "texture usage bit"}, {"name": "usage", "type": "texture usage bit"},
{"name": "dimension", "type": "texture dimension"}, {"name": "dimension", "type": "texture dimension", "default": "2D"},
{"name": "size", "type": "extent 3D"}, {"name": "size", "type": "extent 3D"},
{"name": "array layer count", "type": "uint32_t"}, {"name": "array layer count", "type": "uint32_t", "default": "1"},
{"name": "format", "type": "texture format"}, {"name": "format", "type": "texture format"},
{"name": "mip level count", "type": "uint32_t"}, {"name": "mip level count", "type": "uint32_t", "default": 1},
{"name": "sample count", "type": "uint32_t"} {"name": "sample count", "type": "uint32_t", "default": 1}
] ]
}, },
"texture dimension": { "texture dimension": {
@ -1132,10 +1132,10 @@
"members": [ "members": [
{"name": "format", "type": "texture format"}, {"name": "format", "type": "texture format"},
{"name": "dimension", "type": "texture view dimension"}, {"name": "dimension", "type": "texture view dimension"},
{"name": "base mip level", "type": "uint32_t"}, {"name": "base mip level", "type": "uint32_t", "default": "0"},
{"name": "mip level count", "type": "uint32_t"}, {"name": "mip level count", "type": "uint32_t", "default": "1"},
{"name": "base array layer", "type": "uint32_t"}, {"name": "base array layer", "type": "uint32_t", "default": "0"},
{"name": "array layer count", "type": "uint32_t"} {"name": "array layer count", "type": "uint32_t", "default": "1"}
], ],
"TODO": [ "TODO": [
"jiawei.shao@intel.com: Allow choosing the aspect (depth vs. stencil)" "jiawei.shao@intel.com: Allow choosing the aspect (depth vs. stencil)"

14
generator/dawn_json_generator.py
View File

@ -94,7 +94,8 @@ class NativelyDefined(Type):
# Methods and structures are both "records", so record members correspond to # Methods and structures are both "records", so record members correspond to
# method arguments or structure members. # method arguments or structure members.
class RecordMember: class RecordMember:
def __init__(self, name, typ, annotation, optional, is_return_value): def __init__(self, name, typ, annotation, optional=False,
is_return_value=False, default_value=None):
self.name = name self.name = name
self.type = typ self.type = typ
self.annotation = annotation self.annotation = annotation
@ -102,6 +103,7 @@ class RecordMember:
self.optional = optional self.optional = optional
self.is_return_value = is_return_value self.is_return_value = is_return_value
self.handle_type = None self.handle_type = None
self.default_value = default_value
def set_handle_type(self, handle_type): def set_handle_type(self, handle_type):
assert self.type.dict_name == "ObjectHandle" assert self.type.dict_name == "ObjectHandle"
@ -150,8 +152,10 @@ def linked_record_members(json_data, types):
members_by_name = {} members_by_name = {}
for m in json_data: for m in json_data:
member = RecordMember(Name(m['name']), types[m['type']], member = RecordMember(Name(m['name']), types[m['type']],
m.get('annotation', 'value'), m.get('optional', False), m.get('annotation', 'value'),
m.get('is_return_value', False)) optional=m.get('optional', False),
is_return_value=m.get('is_return_value', False),
default_value=m.get('default', None))
handle_type = m.get('handle_type') handle_type = m.get('handle_type')
if handle_type: if handle_type:
member.set_handle_type(types[handle_type]) member.set_handle_type(types[handle_type])
@ -299,12 +303,12 @@ def compute_wire_params(api_params, wire_json):
continue continue
# Create object method commands by prepending "self" # Create object method commands by prepending "self"
members = [RecordMember(Name('self'), types[api_object.dict_name], 'value', False, False)] members = [RecordMember(Name('self'), types[api_object.dict_name], 'value')]
members += method.arguments members += method.arguments
# Client->Server commands that return an object return the result object handle # Client->Server commands that return an object return the result object handle
if method.return_type.category == 'object': if method.return_type.category == 'object':
result = RecordMember(Name('result'), types['ObjectHandle'], 'value', False, True) result = RecordMember(Name('result'), types['ObjectHandle'], 'value', is_return_value=True)
result.set_handle_type(method.return_type) result.set_handle_type(method.return_type)
members.append(result) members.append(result)

4
generator/generator_lib.py
View File

@ -103,8 +103,8 @@ class _PreprocessingLoader(jinja2.BaseLoader):
source = self.preprocess(f.read()) source = self.preprocess(f.read())
return source, path, lambda: mtime == os.path.getmtime(path) return source, path, lambda: mtime == os.path.getmtime(path)
blockstart = re.compile('{%-?\s*(if|for|block)[^}]*%}') blockstart = re.compile('{%-?\s*(if|elif|else|for|block|macro)[^}]*%}')
blockend = re.compile('{%-?\s*end(if|for|block)[^}]*%}') blockend = re.compile('{%-?\s*(end(if|for|block|macro)|elif|else)[^}]*%}')
def preprocess(self, source): def preprocess(self, source):
lines = source.split('\n') lines = source.split('\n')

167
generator/templates/apicpp.h
View File

@ -61,102 +61,115 @@ namespace dawn {
template<typename Derived, typename CType> template<typename Derived, typename CType>
class ObjectBase { class ObjectBase {
public: public:
ObjectBase() = default; ObjectBase() = default;
ObjectBase(CType handle): mHandle(handle) { ObjectBase(CType handle): mHandle(handle) {
if (mHandle) Derived::DawnReference(mHandle);
}
~ObjectBase() {
if (mHandle) Derived::DawnRelease(mHandle);
}
ObjectBase(ObjectBase const& other)
: ObjectBase(other.Get()) {
}
Derived& operator=(ObjectBase const& other) {
if (&other != this) {
if (mHandle) Derived::DawnRelease(mHandle);
mHandle = other.mHandle;
if (mHandle) Derived::DawnReference(mHandle); if (mHandle) Derived::DawnReference(mHandle);
} }
~ObjectBase() {
return static_cast<Derived&>(*this);
}
ObjectBase(ObjectBase&& other) {
mHandle = other.mHandle;
other.mHandle = 0;
}
Derived& operator=(ObjectBase&& other) {
if (&other != this) {
if (mHandle) Derived::DawnRelease(mHandle); if (mHandle) Derived::DawnRelease(mHandle);
}
ObjectBase(ObjectBase const& other)
: ObjectBase(other.Get()) {
}
Derived& operator=(ObjectBase const& other) {
if (&other != this) {
if (mHandle) Derived::DawnRelease(mHandle);
mHandle = other.mHandle;
if (mHandle) Derived::DawnReference(mHandle);
}
return static_cast<Derived&>(*this);
}
ObjectBase(ObjectBase&& other) {
mHandle = other.mHandle; mHandle = other.mHandle;
other.mHandle = 0; other.mHandle = 0;
} }
Derived& operator=(ObjectBase&& other) {
if (&other != this) {
if (mHandle) Derived::DawnRelease(mHandle);
mHandle = other.mHandle;
other.mHandle = 0;
}
return static_cast<Derived&>(*this); return static_cast<Derived&>(*this);
} }
ObjectBase(std::nullptr_t) {} ObjectBase(std::nullptr_t) {}
Derived& operator=(std::nullptr_t) { Derived& operator=(std::nullptr_t) {
if (mHandle != nullptr) { if (mHandle != nullptr) {
Derived::DawnRelease(mHandle); Derived::DawnRelease(mHandle);
mHandle = nullptr; mHandle = nullptr;
}
return static_cast<Derived&>(*this);
} }
return static_cast<Derived&>(*this);
}
explicit operator bool() const { explicit operator bool() const {
return mHandle != nullptr; return mHandle != nullptr;
} }
CType Get() const { CType Get() const {
return mHandle; return mHandle;
} }
CType Release() { CType Release() {
CType result = mHandle; CType result = mHandle;
mHandle = 0; mHandle = 0;
return result; return result;
} }
static Derived Acquire(CType handle) { static Derived Acquire(CType handle) {
Derived result; Derived result;
result.mHandle = handle; result.mHandle = handle;
return result; return result;
} }
protected: protected:
CType mHandle = nullptr; CType mHandle = nullptr;
}; };
{% macro render_cpp_method_declaration(type, method) %} {% macro render_cpp_default_value(member) -%}
{% set CppType = as_cppType(type.name) %} {%- if member.annotation in ["*", "const*", "const*const*"] and member.optional -%}
DAWN_EXPORT {{as_cppType(method.return_type.name)}} {{method.name.CamelCase()}}( {{" "}}= nullptr
{%- for arg in method.arguments -%} {%- elif member.type.category in ["enum", "bitmask"] and member.default_value != None -%}
{%- if not loop.first %}, {% endif -%} {{" "}}= {{as_cppType(member.type.name)}}::{{as_cppEnum(Name(member.default_value))}}
{%- if arg.type.category == "object" and arg.annotation == "value" -%} {%- elif member.type.category == "native" and member.default_value != None -%}
{{as_cppType(arg.type.name)}} const& {{as_varName(arg.name)}} {{" "}}= {{member.default_value}}
{%- else -%} {%- else -%}
{{as_annotated_cppType(arg)}} {{assert(member.default_value == None)}}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endmacro %}
) const
{%- endmacro %} {% macro render_cpp_method_declaration(type, method) %}
{% set CppType = as_cppType(type.name) %}
DAWN_EXPORT {{as_cppType(method.return_type.name)}} {{method.name.CamelCase()}}(
{%- for arg in method.arguments -%}
{%- if not loop.first %}, {% endif -%}
{%- if arg.type.category == "object" and arg.annotation == "value" -%}
{{as_cppType(arg.type.name)}} const& {{as_varName(arg.name)}}
{%- else -%}
{{as_annotated_cppType(arg)}}
{%- endif -%}
{{render_cpp_default_value(arg)}}
{%- endfor -%}
) const
{%- endmacro %}
{% for type in by_category["object"] %} {% for type in by_category["object"] %}
{% set CppType = as_cppType(type.name) %} {% set CppType = as_cppType(type.name) %}
{% set CType = as_cType(type.name) %} {% set CType = as_cType(type.name) %}
class {{CppType}} : public ObjectBase<{{CppType}}, {{CType}}> { class {{CppType}} : public ObjectBase<{{CppType}}, {{CType}}> {
public: public:
using ObjectBase::ObjectBase; using ObjectBase::ObjectBase;
using ObjectBase::operator=; using ObjectBase::operator=;
{% for method in native_methods(type) %} {% for method in native_methods(type) %}
{{render_cpp_method_declaration(type, method)}}; {{render_cpp_method_declaration(type, method)}};
{% endfor %} {% endfor %}
private: private:
friend ObjectBase<{{CppType}}, {{CType}}>; friend ObjectBase<{{CppType}}, {{CType}}>;
static DAWN_EXPORT void DawnReference({{CType}} handle); static DAWN_EXPORT void DawnReference({{CType}} handle);
static DAWN_EXPORT void DawnRelease({{CType}} handle); static DAWN_EXPORT void DawnRelease({{CType}} handle);
}; };
{% endfor %} {% endfor %}
@ -167,7 +180,7 @@ namespace dawn {
const void* nextInChain = nullptr; const void* nextInChain = nullptr;
{% endif %} {% endif %}
{% for member in type.members %} {% for member in type.members %}
{{as_annotated_cppType(member)}}; {{as_annotated_cppType(member)}}{{render_cpp_default_value(member)}};
{% endfor %} {% endfor %}
}; };