encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-09 21:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint->dawn: Move src/dawn_wire -> src/dawn/wire

Browse Source 
Bug: dawn:1275
Change-Id: I56535bf4d387c4bd423140705ea70812be073eac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79081
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Ben Clayton
2022-02-04 12:51:25 +00:00
parent 7d5badd9f4
commit 20cbe6d9e8
103 changed files with 796 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator/BUILD.gn
View File

@@ -22,7 +22,7 @@ import("dawn_generator.gni")
_stale_dirs = [
"dawn",
"dawn_native",
"dawn_wire",
"dawn/wire",
"mock",
"src",
]

6
generator/dawn_generator.gni
View File

@@ -41,9 +41,9 @@ dawn_allowed_gen_output_dirs = [
"src/dawn/",
"src/dawn_native/",
"src/dawn_native/opengl/",
"src/dawn_wire/client/",
"src/dawn_wire/server/",
"src/dawn_wire/",
"src/dawn/wire/client/",
"src/dawn/wire/server/",
"src/dawn/wire/",
"src/include/dawn/",
"emscripten-bits/",
"webgpu-headers/",

55
generator/dawn_json_generator.py
View File

@@ -71,6 +71,9 @@ class Name:
def namespace_case(self):
return '::'.join(self.chunks)
def Dirs(self):
return '/'.join(self.chunks)
def js_enum_case(self):
result = self.chunks[0].lower()
for chunk in self.chunks[1:]:
@@ -761,7 +764,7 @@ class MultiGeneratorFromDawnJSON(Generator):
def add_commandline_arguments(self, parser):
allowed_targets = [
'dawn_headers', 'dawncpp_headers', 'dawncpp', 'dawn_proc',
'mock_api', 'dawn_wire', "dawn_native_utils"
'mock_api', 'wire', "dawn_native_utils"
]
parser.add_argument('--dawn-json',
@@ -942,7 +945,7 @@ class MultiGeneratorFromDawnJSON(Generator):
'src/' + native_dir + '/ObjectType_autogen.cpp',
frontend_params))
if 'dawn_wire' in targets:
if 'wire' in targets:
params_dawn_wire = parse_json(loaded_json,
enabled_tags=['dawn', 'deprecated'],
disabled_tags=['native'])
@@ -957,51 +960,51 @@ class MultiGeneratorFromDawnJSON(Generator):
}, additional_params
]
renders.append(
FileRender('dawn_wire/ObjectType.h',
'src/dawn_wire/ObjectType_autogen.h', wire_params))
FileRender('dawn/wire/ObjectType.h',
'src/dawn/wire/ObjectType_autogen.h', wire_params))
renders.append(
FileRender('dawn_wire/WireCmd.h',
'src/dawn_wire/WireCmd_autogen.h', wire_params))
FileRender('dawn/wire/WireCmd.h',
'src/dawn/wire/WireCmd_autogen.h', wire_params))
renders.append(
FileRender('dawn_wire/WireCmd.cpp',
'src/dawn_wire/WireCmd_autogen.cpp', wire_params))
FileRender('dawn/wire/WireCmd.cpp',
'src/dawn/wire/WireCmd_autogen.cpp', wire_params))
renders.append(
FileRender('dawn_wire/client/ApiObjects.h',
'src/dawn_wire/client/ApiObjects_autogen.h',
FileRender('dawn/wire/client/ApiObjects.h',
'src/dawn/wire/client/ApiObjects_autogen.h',
wire_params))
renders.append(
FileRender('dawn_wire/client/ApiProcs.cpp',
'src/dawn_wire/client/ApiProcs_autogen.cpp',
FileRender('dawn/wire/client/ApiProcs.cpp',
'src/dawn/wire/client/ApiProcs_autogen.cpp',
wire_params))
renders.append(
FileRender('dawn_wire/client/ClientBase.h',
'src/dawn_wire/client/ClientBase_autogen.h',
FileRender('dawn/wire/client/ClientBase.h',
'src/dawn/wire/client/ClientBase_autogen.h',
wire_params))
renders.append(
FileRender('dawn_wire/client/ClientHandlers.cpp',
'src/dawn_wire/client/ClientHandlers_autogen.cpp',
FileRender('dawn/wire/client/ClientHandlers.cpp',
'src/dawn/wire/client/ClientHandlers_autogen.cpp',
wire_params))
renders.append(
FileRender(
'dawn_wire/client/ClientPrototypes.inc',
'src/dawn_wire/client/ClientPrototypes_autogen.inc',
'dawn/wire/client/ClientPrototypes.inc',
'src/dawn/wire/client/ClientPrototypes_autogen.inc',
wire_params))
renders.append(
FileRender('dawn_wire/server/ServerBase.h',
'src/dawn_wire/server/ServerBase_autogen.h',
FileRender('dawn/wire/server/ServerBase.h',
'src/dawn/wire/server/ServerBase_autogen.h',
wire_params))
renders.append(
FileRender('dawn_wire/server/ServerDoers.cpp',
'src/dawn_wire/server/ServerDoers_autogen.cpp',
FileRender('dawn/wire/server/ServerDoers.cpp',
'src/dawn/wire/server/ServerDoers_autogen.cpp',
wire_params))
renders.append(
FileRender('dawn_wire/server/ServerHandlers.cpp',
'src/dawn_wire/server/ServerHandlers_autogen.cpp',
FileRender('dawn/wire/server/ServerHandlers.cpp',
'src/dawn/wire/server/ServerHandlers_autogen.cpp',
wire_params))
renders.append(
FileRender(
'dawn_wire/server/ServerPrototypes.inc',
'src/dawn_wire/server/ServerPrototypes_autogen.inc',
'dawn/wire/server/ServerPrototypes.inc',
'src/dawn/wire/server/ServerPrototypes_autogen.inc',
wire_params))
return renders

0
generator/templates/dawn_wire/ObjectType.h → generator/templates/dawn/wire/ObjectType.h
View File

6
generator/templates/dawn_wire/WireCmd.cpp → generator/templates/dawn/wire/WireCmd.cpp
View File

@@ -12,12 +12,12 @@
//* See the License for the specific language governing permissions and
//* limitations under the License.
#include "dawn_wire/WireCmd_autogen.h"
#include "dawn/wire/WireCmd_autogen.h"
#include "dawn/common/Assert.h"
#include "dawn/common/Log.h"
#include "dawn_wire/BufferConsumer_impl.h"
#include "dawn_wire/Wire.h"
#include "dawn/wire/BufferConsumer_impl.h"
#include "dawn/wire/Wire.h"
#include <algorithm>
#include <cstring>

6
generator/templates/dawn_wire/WireCmd.h → generator/templates/dawn/wire/WireCmd.h
View File

@@ -17,9 +17,9 @@
#include <dawn/webgpu.h>
#include "dawn_wire/BufferConsumer.h"
#include "dawn_wire/ObjectType_autogen.h"
#include "dawn_wire/WireResult.h"
#include "dawn/wire/BufferConsumer.h"
#include "dawn/wire/ObjectType_autogen.h"
#include "dawn/wire/WireResult.h"
namespace dawn::wire {

4
generator/templates/dawn_wire/client/ApiObjects.h → generator/templates/dawn/wire/client/ApiObjects.h
View File

@@ -15,8 +15,8 @@
#ifndef DAWNWIRE_CLIENT_APIOBJECTS_AUTOGEN_H_
#define DAWNWIRE_CLIENT_APIOBJECTS_AUTOGEN_H_
#include "dawn_wire/ObjectType_autogen.h"
#include "dawn_wire/client/ObjectBase.h"
#include "dawn/wire/ObjectType_autogen.h"
#include "dawn/wire/client/ObjectBase.h"
namespace dawn::wire::client {

4
generator/templates/dawn_wire/client/ApiProcs.cpp → generator/templates/dawn/wire/client/ApiProcs.cpp
View File

@@ -13,8 +13,8 @@
//* limitations under the License.
#include "dawn/common/Log.h"
#include "dawn_wire/client/ApiObjects.h"
#include "dawn_wire/client/Client.h"
#include "dawn/wire/client/ApiObjects.h"
#include "dawn/wire/client/Client.h"
#include <algorithm>
#include <cstring>

8
generator/templates/dawn_wire/client/ClientBase.h → generator/templates/dawn/wire/client/ClientBase.h
View File

@@ -15,10 +15,10 @@
#ifndef DAWNWIRE_CLIENT_CLIENTBASE_AUTOGEN_H_
#define DAWNWIRE_CLIENT_CLIENTBASE_AUTOGEN_H_
#include "dawn_wire/ChunkedCommandHandler.h"
#include "dawn_wire/WireCmd_autogen.h"
#include "dawn_wire/client/ApiObjects.h"
#include "dawn_wire/client/ObjectAllocator.h"
#include "dawn/wire/ChunkedCommandHandler.h"
#include "dawn/wire/WireCmd_autogen.h"
#include "dawn/wire/client/ApiObjects.h"
#include "dawn/wire/client/ObjectAllocator.h"
namespace dawn::wire::client {

2
generator/templates/dawn_wire/client/ClientHandlers.cpp → generator/templates/dawn/wire/client/ClientHandlers.cpp
View File

@@ -13,7 +13,7 @@
//* limitations under the License.
#include "dawn/common/Assert.h"
#include "dawn_wire/client/Client.h"
#include "dawn/wire/client/Client.h"
#include <string>

0
generator/templates/dawn_wire/client/ClientPrototypes.inc → generator/templates/dawn/wire/client/ClientPrototypes.inc
View File

10
generator/templates/dawn_wire/server/ServerBase.h → generator/templates/dawn/wire/server/ServerBase.h
View File

@@ -16,11 +16,11 @@
#define DAWNWIRE_SERVER_SERVERBASE_H_
#include "dawn/dawn_proc_table.h"
#include "dawn_wire/ChunkedCommandHandler.h"
#include "dawn_wire/Wire.h"
#include "dawn_wire/WireCmd_autogen.h"
#include "dawn_wire/WireDeserializeAllocator.h"
#include "dawn_wire/server/ObjectStorage.h"
#include "dawn/wire/ChunkedCommandHandler.h"
#include "dawn/wire/Wire.h"
#include "dawn/wire/WireCmd_autogen.h"
#include "dawn/wire/WireDeserializeAllocator.h"
#include "dawn/wire/server/ObjectStorage.h"
namespace dawn::wire::server {

2
generator/templates/dawn_wire/server/ServerDoers.cpp → generator/templates/dawn/wire/server/ServerDoers.cpp
View File

@@ -13,7 +13,7 @@
//* limitations under the License.
#include "dawn/common/Assert.h"
#include "dawn_wire/server/Server.h"
#include "dawn/wire/server/Server.h"
namespace dawn::wire::server {
//* Implementation of the command doers

2
generator/templates/dawn_wire/server/ServerHandlers.cpp → generator/templates/dawn/wire/server/ServerHandlers.cpp
View File

@@ -13,7 +13,7 @@
//* limitations under the License.
#include "dawn/common/Assert.h"
#include "dawn_wire/server/Server.h"
#include "dawn/wire/server/Server.h"
namespace dawn::wire::server {
{% for command in cmd_records["command"] %}

0
generator/templates/dawn_wire/server/ServerPrototypes.inc → generator/templates/dawn/wire/server/ServerPrototypes.inc
View File