Skip to content

Commit

Permalink
tint->dawn: Shuffle source tree in preperation of merging repos
Browse files Browse the repository at this point in the history 
docs/    -> docs/tint/
fuzzers/ -> src/tint/fuzzers/
samples/ -> src/tint/cmd/
src/     -> src/tint/
test/    -> test/tint/

BUG=tint:1418,tint:1433

Change-Id: Id2aa79f989aef3245b80ef4aa37a27ff16cd700b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/80482
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
  • Loading branch information
@zoddicus
zoddicus authored and Tint LUCI CQ committed Feb 21, 2022
1 parent 38f1e9c commit dbc13af
Show file tree
Hide file tree
Showing 12,231 changed files with 4,904 additions and 4,878 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
group("default") {
testonly = true
deps = [
"fuzzers",
"samples:tint",
"src:libtint",
"test:tint_unittests",
"src/tint:libtint",
"src/tint/cmd:tint",
"src/tint/fuzzers",
"test/tint:tint_unittests",
]
}
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,13 @@ function(tint_default_compile_options TARGET)
endfunction()

add_subdirectory(third_party)
add_subdirectory(src)
add_subdirectory(src/tint)
if (TINT_BUILD_SAMPLES)
add_subdirectory(samples)
add_subdirectory(src/tint/cmd)
endif()

if (TINT_BUILD_FUZZERS)
add_subdirectory(fuzzers)
add_subdirectory(src/tint/fuzzers)
endif()

add_custom_target(tint-lint
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ again.
All submissions, including submissions by project members, require review. We
use [Dawn's Gerrit](https://dawn-review.googlesource.com/) for this purpose.

Submissions should follow the [Tint style guide](docs/style_guide.md).
Submissions should follow the [Tint style guide](docs/tint/style_guide.md).

## Pushing to Gerrit

Expand Down
6 changes: 3 additions & 3 deletions Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,11 +786,11 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.

INPUT = CODE_OF_CONDUCT.md \
fuzzers/tint_spirv_tools_fuzzer \
src/tint/fuzzers/tint_spirv_tools_fuzzer \
src \
tools/src \
fuzzers/tint_spirv_tools_fuzzer \
fuzzers/tint_ast_fuzzer
src/tint/fuzzers/tint_spirv_tools_fuzzer \
src/tint/fuzzers/tint_ast_fuzzer

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ https://bugs.chromium.org/p/tint/issues/entry
Please see the CONTRIBUTING and CODE_OF_CONDUCT files on how to contribute to
Tint.

Tint has a process for supporting [experimental extensions](docs/experimental_extensions.md).
Tint has a process for supporting [experimental extensions](docs/tint/experimental_extensions.md).
0 docs/arch.md → docs/tint/arch.md
View file
File renamed without changes.
0 docs/compound_statements.md → docs/tint/compound_statements.md
View file
File renamed without changes.
0 docs/coverage-info.md → docs/tint/coverage-info.md
View file
File renamed without changes.
0 docs/diagnostics_guide.md → docs/tint/diagnostics_guide.md
View file
File renamed without changes.
0 docs/end-to-end-tests.md → docs/tint/end-to-end-tests.md
View file
File renamed without changes.
0 docs/experimental_extensions.md → docs/tint/experimental_extensions.md
View file
File renamed without changes.
0 docs/origin-trial-changes.md → docs/tint/origin-trial-changes.md
View file
File renamed without changes.
0 docs/spirv-input-output-variables.md → docs/tint/spirv-input-output-variables.md
View file
File renamed without changes.
0 docs/spirv-ptr-ref.md → docs/tint/spirv-ptr-ref.md
View file
File renamed without changes.
0 docs/style_guide.md → docs/tint/style_guide.md
View file
File renamed without changes.
0 docs/translations.md → docs/tint/translations.md
View file
File renamed without changes.
48 changes: 24 additions & 24 deletions include/tint/tint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,51 +18,51 @@
// TODO(tint:88): When implementing support for an install target, all of these
// headers will need to be moved to include/tint/.

#include "src/ast/pipeline_stage.h"
#include "src/demangler.h"
#include "src/diagnostic/printer.h"
#include "src/inspector/inspector.h"
#include "src/reader/reader.h"
#include "src/sem/type_manager.h"
#include "src/transform/binding_remapper.h"
#include "src/transform/first_index_offset.h"
#include "src/transform/fold_trivial_single_use_lets.h"
#include "src/transform/manager.h"
#include "src/transform/multiplanar_external_texture.h"
#include "src/transform/renamer.h"
#include "src/transform/robustness.h"
#include "src/transform/single_entry_point.h"
#include "src/transform/vertex_pulling.h"
#include "src/writer/writer.h"
#include "src/tint/ast/pipeline_stage.h"
#include "src/tint/demangler.h"
#include "src/tint/diagnostic/printer.h"
#include "src/tint/inspector/inspector.h"
#include "src/tint/reader/reader.h"
#include "src/tint/sem/type_manager.h"
#include "src/tint/transform/binding_remapper.h"
#include "src/tint/transform/first_index_offset.h"
#include "src/tint/transform/fold_trivial_single_use_lets.h"
#include "src/tint/transform/manager.h"
#include "src/tint/transform/multiplanar_external_texture.h"
#include "src/tint/transform/renamer.h"
#include "src/tint/transform/robustness.h"
#include "src/tint/transform/single_entry_point.h"
#include "src/tint/transform/vertex_pulling.h"
#include "src/tint/writer/writer.h"

#if TINT_BUILD_SPV_READER
#include "src/reader/spirv/parser.h"
#include "src/tint/reader/spirv/parser.h"
#endif // TINT_BUILD_SPV_READER

#if TINT_BUILD_WGSL_READER
#include "src/reader/wgsl/parser.h"
#include "src/tint/reader/wgsl/parser.h"
#endif // TINT_BUILD_WGSL_READER

#if TINT_BUILD_SPV_WRITER
#include "spirv-tools/libspirv.hpp"
#include "src/writer/spirv/generator.h"
#include "src/tint/writer/spirv/generator.h"
#endif // TINT_BUILD_SPV_WRITER

#if TINT_BUILD_WGSL_WRITER
#include "src/writer/wgsl/generator.h"
#include "src/tint/writer/wgsl/generator.h"
#endif // TINT_BUILD_WGSL_WRITER

#if TINT_BUILD_MSL_WRITER
#include "src/writer/msl/generator.h"
#include "src/tint/writer/msl/generator.h"
#endif // TINT_BUILD_MSL_WRITER

#if TINT_BUILD_HLSL_WRITER
#include "src/writer/hlsl/generator.h"
#include "src/tint/writer/hlsl/generator.h"
#endif // TINT_BUILD_HLSL_WRITER

#if TINT_BUILD_GLSL_WRITER
#include "src/transform/glsl.h"
#include "src/writer/glsl/generator.h"
#include "src/tint/transform/glsl.h"
#include "src/tint/writer/glsl/generator.h"
#endif // TINT_BUILD_GLSL_WRITER

#endif // INCLUDE_TINT_TINT_H_
4 changes: 2 additions & 2 deletions kokoro/linux/docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ if [ "$BUILD_SYSTEM" == "cmake" ]; then
hide_cmds
fi

status "Testing test/test-all.sh"
status "Testing test/tint/test-all.sh"
show_cmds
${SRC_DIR}/test/test-all.sh "${BUILD_DIR}/tint" --verbose
${SRC_DIR}/test/tint/test-all.sh "${BUILD_DIR}/tint" --verbose
hide_cmds

status "Checking _other.cc files also build"
Expand Down
6 changes: 3 additions & 3 deletions kokoro/windows/build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ call :status "Running tint_unittests"
tint_unittests.exe || goto :error
@echo off

call :status "Testing test/test-all.sh"
call :status "Testing test/tint/test-all.sh"
@echo on
cd /d %SRC_DIR% || goto :error
rem Run tests with DXC and Metal validation
Expand All @@ -148,13 +148,13 @@ set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH%
where metal.exe
set PATH=%DXC_PATH%;%OLD_PATH%
where dxc.exe dxil.dll
call git bash -- ./test/test-all.sh ../tint-build/tint.exe --verbose || goto :error
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose || goto :error
@echo on
set PATH=%OLD_PATH%
rem Run again to test with FXC validation
set PATH=%D3DCOMPILER_PATH%;%OLD_PATH%
where d3dcompiler_47.dll
call git bash -- ./test/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error
@echo on
set PATH=%OLD_PATH%
@echo off
Expand Down
2 changes: 1 addition & 1 deletion src/BUILD.gn → src/tint/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import("//build_overrides/build.gni")
import("../tint_overrides_with_defaults.gni")
import("../../tint_overrides_with_defaults.gni")

###############################################################################
# Common - Configs, etc. shared across targets
Expand Down
16 changes: 8 additions & 8 deletions src/CMakeLists.txt → src/tint/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if (TINT_ENABLE_BREAK_IN_DEBUGGER)
endif()

set(TINT_LIB_SRCS
../include/tint/tint.h
../../include/tint/tint.h
ast/access.cc
ast/access.h
ast/attribute.cc
Expand Down Expand Up @@ -1149,13 +1149,13 @@ if(TINT_BUILD_TESTS)

if (${TINT_BUILD_FUZZERS})
list(APPEND TINT_TEST_SRCS
../fuzzers/mersenne_twister_engine.cc
../fuzzers/mersenne_twister_engine.h
../fuzzers/random_generator.cc
../fuzzers/random_generator.h
../fuzzers/random_generator_engine.cc
../fuzzers/random_generator_engine.h
../fuzzers/random_generator_test.cc
fuzzers/mersenne_twister_engine.cc
fuzzers/mersenne_twister_engine.h
fuzzers/random_generator.cc
fuzzers/random_generator.h
fuzzers/random_generator_engine.cc
fuzzers/random_generator_engine.h
fuzzers/random_generator_test.cc
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/ast/access.cc → src/tint/ast/access.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/access.h"
#include "src/tint/ast/access.h"

namespace tint {
namespace ast {
Expand Down
6 changes: 3 additions & 3 deletions src/ast/access.h → src/tint/ast/access.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef SRC_AST_ACCESS_H_
#define SRC_AST_ACCESS_H_
#ifndef SRC_TINT_AST_ACCESS_H_
#define SRC_TINT_AST_ACCESS_H_

#include <ostream>
#include <string>
Expand Down Expand Up @@ -43,4 +43,4 @@ std::ostream& operator<<(std::ostream& out, Access access);
} // namespace ast
} // namespace tint

#endif // SRC_AST_ACCESS_H_
#endif // SRC_TINT_AST_ACCESS_H_
4 changes: 2 additions & 2 deletions src/ast/alias.cc → src/tint/ast/alias.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/alias.h"
#include "src/tint/ast/alias.h"

#include "src/program_builder.h"
#include "src/tint/program_builder.h"

TINT_INSTANTIATE_TYPEINFO(tint::ast::Alias);

Expand Down
8 changes: 4 additions & 4 deletions src/ast/alias.h → src/tint/ast/alias.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef SRC_AST_ALIAS_H_
#define SRC_AST_ALIAS_H_
#ifndef SRC_TINT_AST_ALIAS_H_
#define SRC_TINT_AST_ALIAS_H_

#include <string>

#include "src/ast/type_decl.h"
#include "src/tint/ast/type_decl.h"

namespace tint {
namespace ast {
Expand Down Expand Up @@ -51,4 +51,4 @@ class Alias : public Castable<Alias, TypeDecl> {
} // namespace ast
} // namespace tint

#endif // SRC_AST_ALIAS_H_
#endif // SRC_TINT_AST_ALIAS_H_
28 changes: 14 additions & 14 deletions src/ast/alias_test.cc → src/tint/ast/alias_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/alias.h"
#include "src/ast/access.h"
#include "src/ast/array.h"
#include "src/ast/bool.h"
#include "src/ast/f32.h"
#include "src/ast/i32.h"
#include "src/ast/matrix.h"
#include "src/ast/pointer.h"
#include "src/ast/sampler.h"
#include "src/ast/struct.h"
#include "src/ast/test_helper.h"
#include "src/ast/texture.h"
#include "src/ast/u32.h"
#include "src/ast/vector.h"
#include "src/tint/ast/alias.h"
#include "src/tint/ast/access.h"
#include "src/tint/ast/array.h"
#include "src/tint/ast/bool.h"
#include "src/tint/ast/f32.h"
#include "src/tint/ast/i32.h"
#include "src/tint/ast/matrix.h"
#include "src/tint/ast/pointer.h"
#include "src/tint/ast/sampler.h"
#include "src/tint/ast/struct.h"
#include "src/tint/ast/test_helper.h"
#include "src/tint/ast/texture.h"
#include "src/tint/ast/u32.h"
#include "src/tint/ast/vector.h"

namespace tint {
namespace ast {
Expand Down
4 changes: 2 additions & 2 deletions src/ast/array.cc → src/tint/ast/array.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/array.h"
#include "src/tint/ast/array.h"

#include <cmath>

#include "src/program_builder.h"
#include "src/tint/program_builder.h"

TINT_INSTANTIATE_TYPEINFO(tint::ast::Array);

Expand Down
10 changes: 5 additions & 5 deletions src/ast/array.h → src/tint/ast/array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef SRC_AST_ARRAY_H_
#define SRC_AST_ARRAY_H_
#ifndef SRC_TINT_AST_ARRAY_H_
#define SRC_TINT_AST_ARRAY_H_

#include <string>

#include "src/ast/attribute.h"
#include "src/ast/type.h"
#include "src/tint/ast/attribute.h"
#include "src/tint/ast/type.h"

namespace tint {
namespace ast {
Expand Down Expand Up @@ -72,4 +72,4 @@ class Array : public Castable<Array, Type> {
} // namespace ast
} // namespace tint

#endif // SRC_AST_ARRAY_H_
#endif // SRC_TINT_AST_ARRAY_H_
4 changes: 2 additions & 2 deletions src/ast/array_test.cc → src/tint/ast/array_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/array.h"
#include "src/tint/ast/array.h"

#include "src/ast/test_helper.h"
#include "src/tint/ast/test_helper.h"

namespace tint {
namespace ast {
Expand Down
4 changes: 2 additions & 2 deletions src/ast/assignment_statement.cc → src/tint/ast/assignment_statement.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "src/ast/assignment_statement.h"
#include "src/tint/ast/assignment_statement.h"

#include "src/program_builder.h"
#include "src/tint/program_builder.h"

TINT_INSTANTIATE_TYPEINFO(tint::ast::AssignmentStatement);

Expand Down
10 changes: 5 additions & 5 deletions src/ast/assignment_statement.h → src/tint/ast/assignment_statement.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef SRC_AST_ASSIGNMENT_STATEMENT_H_
#define SRC_AST_ASSIGNMENT_STATEMENT_H_
#ifndef SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
#define SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_

#include "src/ast/expression.h"
#include "src/ast/statement.h"
#include "src/tint/ast/expression.h"
#include "src/tint/ast/statement.h"

namespace tint {
namespace ast {
Expand Down Expand Up @@ -53,4 +53,4 @@ class AssignmentStatement : public Castable<AssignmentStatement, Statement> {
} // namespace ast
} // namespace tint

#endif // SRC_AST_ASSIGNMENT_STATEMENT_H_
#endif // SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
Loading

0 comments on commit dbc13af

Please sign in to comment.