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

Remove old src/include folder 

This CL removes the src/include folder which was used to forward old
header includes to the new include/ location. The various BUILD rules
which referred to these folders are also removed.

Bug: dawn:1275
Change-Id: Ic0bdc8cf900833af25199ee3e41708953c7c1eec
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94026
Reviewed-by: Ben Clayton <bclayton@google.com>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
dan sinclair 2022-06-18 16:16:11 +00:00 committed by Dawn LUCI CQ
parent 3f64e38ba0
commit 369b0b4618
25 changed files with 0 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -20,7 +20,6 @@ group("all") {
"src/dawn/fuzzers", "src/dawn/fuzzers",
"src/dawn/native:webgpu_dawn", "src/dawn/native:webgpu_dawn",
"src/dawn/tests", "src/dawn/tests",
"src/fuzzers/dawn:dawn_fuzzers",
"src/tint:libtint", "src/tint:libtint",
"src/tint:tint_unittests", "src/tint:tint_unittests",
"src/tint/fuzzers", "src/tint/fuzzers",

13
include/dawn/BUILD.gn
View File

@ -67,18 +67,5 @@ config("public") {
include_dirs = [ include_dirs = [
"${target_gen_dir}/../../include", "${target_gen_dir}/../../include",
"${dawn_root}/include", "${dawn_root}/include",
"${dawn_root}/src/include", # TODO(crbug.com/dawn/1275) - remove
] ]
} }
################################################################################
# Build target aliases
# TODO(crbug.com/dawn/1275) - remove these
################################################################################
group("dawncpp_headers") {
public_deps = [ ":cpp_headers" ]
}
group("dawn_headers") {
public_deps = [ ":headers" ]
}

20
src/dawn/BUILD.gn
View File

@ -77,23 +77,3 @@ dawn_json_generator("emscripten_bits_gen") {
"emscripten-bits/library_webgpu_enum_tables.js", "emscripten-bits/library_webgpu_enum_tables.js",
] ]
} }
################################################################################
# Build target aliases
# TODO(crbug.com/dawn/1275) - remove these
################################################################################
group("dawncpp") {
public_deps = [ ":cpp" ]
}
group("dawncpp_headers") {
public_deps = [ "${dawn_root}/include/dawn:cpp_headers" ]
}
group("dawn_proc") {
public_deps = [ ":proc" ]
}
group("dawn_headers") {
public_deps = [ "${dawn_root}/include/dawn:headers" ]
}
group("dawn_cpp") {
public_deps = [ ":cpp" ]
}

22
src/fuzzers/dawn/BUILD.gn
View File

@ -1,22 +0,0 @@
# Copyright 2022 The Dawn Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
# Build target aliases
# TODO(crbug.com/dawn/1275) - remove these
################################################################################
group("dawn_fuzzers") {
public_deps = [ "../../dawn/fuzzers" ]
testonly = true
}

4
src/include/README.md
View File

@ -1,4 +0,0 @@
# TODO(crbug.com/dawn/1275) - remove this directory
This directory exists as a temporary include directory while migrating Chromium source to the new Dawn include layout.
All headers in the subdirectories simply #include to the new location for the header.

20
src/include/dawn/EnumClassBitmasks.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
#define SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
#include "dawn/EnumClassBitmasks.h"
#endif // SRC_INCLUDE_DAWN_ENUMCLASSBITMASKS_H_

20
src/include/dawn/dawn_proc.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_DAWN_PROC_H_
#define SRC_INCLUDE_DAWN_DAWN_PROC_H_
#include "dawn/dawn_proc.h"
#endif // SRC_INCLUDE_DAWN_DAWN_PROC_H_

20
src/include/dawn/dawn_thread_dispatch_proc.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
#define SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
#include "dawn/dawn_thread_dispatch_proc.h"
#endif // SRC_INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_

20
src/include/dawn/dawn_wsi.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_DAWN_WSI_H_
#define SRC_INCLUDE_DAWN_DAWN_WSI_H_
#include "dawn/dawn_wsi.h"
#endif // SRC_INCLUDE_DAWN_DAWN_WSI_H_

20
src/include/dawn/webgpu.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WEBGPU_H_
#define SRC_INCLUDE_DAWN_WEBGPU_H_
#include "dawn/webgpu.h"
#endif // SRC_INCLUDE_DAWN_WEBGPU_H_

20
src/include/dawn/webgpu_cpp.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WEBGPU_CPP_H_
#define SRC_INCLUDE_DAWN_WEBGPU_CPP_H_
#include "dawn/webgpu_cpp.h"
#endif // SRC_INCLUDE_DAWN_WEBGPU_CPP_H_

20
src/include/dawn_native/D3D12Backend.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
#define SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
#include "dawn/native/D3D12Backend.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_

20
src/include/dawn_native/DawnNative.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
#define SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
#include "dawn/native/DawnNative.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_

20
src/include/dawn_native/MetalBackend.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_
#define SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_
#include "dawn/native/MetalBackend.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_METALBACKEND_H_

20
src/include/dawn_native/NullBackend.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
#define SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
#include "dawn/native/NullBackend.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_NULLBACKEND_H_

20
src/include/dawn_native/OpenGLBackend.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
#define SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
#include "dawn/native/OpenGLBackend.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_

20
src/include/dawn_native/VulkanBackend.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
#define SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
#include "dawn/native/VulkanBackend.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_

20
src/include/dawn_native/dawn_native_export.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
#define SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
#include "dawn/native/dawn_native_export.h"
#endif // SRC_INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_

20
src/include/dawn_platform/DawnPlatform.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
#define SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
#include "dawn/platform/DawnPlatform.h"
#endif // SRC_INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_

20
src/include/dawn_wire/Wire.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WIRE_WIRE_H_
#define SRC_INCLUDE_DAWN_WIRE_WIRE_H_
#include "dawn/wire/Wire.h"
#endif // SRC_INCLUDE_DAWN_WIRE_WIRE_H_

20
src/include/dawn_wire/WireClient.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_
#define SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_
#include "dawn/wire/WireClient.h"
#endif // SRC_INCLUDE_DAWN_WIRE_WIRECLIENT_H_

20
src/include/dawn_wire/WireServer.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_
#define SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_
#include "dawn/wire/WireServer.h"
#endif // SRC_INCLUDE_DAWN_WIRE_WIRESERVER_H_

20
src/include/dawn_wire/dawn_wire_export.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
#define SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
#include "dawn/wire/dawn_wire_export.h"
#endif // SRC_INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_

20
src/include/webgpu/webgpu.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_WEBGPU_WEBGPU_H_
#define SRC_INCLUDE_WEBGPU_WEBGPU_H_
#include "dawn/webgpu.h"
#endif // SRC_INCLUDE_WEBGPU_WEBGPU_H_

20
src/include/webgpu/webgpu_cpp.h
View File

@ -1,20 +0,0 @@
// Copyright 2022 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_
#define SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_
#include "dawn/webgpu_cpp.h"
#endif // SRC_INCLUDE_WEBGPU_WEBGPU_CPP_H_