diff options
| author | dan sinclair <dsinclair@google.com> | 2020-07-29 11:37:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 11:37:49 -0400 |
| commit | c626b912dc4568867b29c5b221df6aac75390ab5 (patch) | |
| tree | 393c3f0abf43a33b131075017c3216b9a5db1e7c | |
| parent | cfacaaffd1fea5b413443a3b7c2f827c858de6bf (diff) | |
| download | shaderc-c626b912dc4568867b29c5b221df6aac75390ab5.tar.gz | |
Update some language usage. (#1124)
This CL updates some language usage to be in line with the Android
respectful code guidelines [1].
1- https://source.android.com/setup/contribute/respectful-code
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | libshaderc/src/shaderc_cpp_test.cc | 2 | ||||
| -rw-r--r-- | libshaderc/src/shaderc_test.cc | 2 | ||||
| -rw-r--r-- | libshaderc_util/include/libshaderc_util/file_finder.h | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,6 @@ build/ build-*/ +out/ *.pyc *.swp compile_commands.json diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc index 744d2ee..af9ae30 100644 --- a/libshaderc/src/shaderc_cpp_test.cc +++ b/libshaderc/src/shaderc_cpp_test.cc @@ -363,7 +363,7 @@ TEST_F(CppInterface, D_DisassemblyOption) { const AssemblyCompilationResult result = compiler_.CompileGlslToSpvAssembly( kMinimalShader, shaderc_glsl_vertex_shader, "shader", options_); EXPECT_TRUE(CompilationResultIsSuccess(result)); - // This should work with both the glslang native disassembly format and the + // This should work with both the glslang disassembly format and the // SPIR-V Tools assembly format. EXPECT_THAT(CompilerOutputAsString(result), HasSubstr("Capability Shader")); EXPECT_THAT(CompilerOutputAsString(result), HasSubstr("MemoryModel")); diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc index 14f28ab..3162468 100644 --- a/libshaderc/src/shaderc_test.cc +++ b/libshaderc/src/shaderc_test.cc @@ -498,7 +498,7 @@ TEST_F(CompileStringWithOptionsTest, ValuelessMacroCompileOptionsNullPointer) { TEST_F(CompileStringWithOptionsTest, DisassemblyOption) { ASSERT_NE(nullptr, compiler_.get_compiler_handle()); - // This should work with both the glslang native assembly format and the + // This should work with both the glslang assembly format and the // SPIR-V tools assembly format. const std::string disassembly_text = CompilationOutput(kMinimalShader, shaderc_glsl_vertex_shader, diff --git a/libshaderc_util/include/libshaderc_util/file_finder.h b/libshaderc_util/include/libshaderc_util/file_finder.h index 2c1c9d1..a5f91cf 100644 --- a/libshaderc_util/include/libshaderc_util/file_finder.h +++ b/libshaderc_util/include/libshaderc_util/file_finder.h @@ -27,7 +27,7 @@ class FileFinder { // non-empty. The search is attempted on filename prefixed by each element of // search_path() in turn. The first hit is returned, or an empty string if // there are no hits. Search attempts treat their argument the way - // std::fopen() treats its filename argument, blind to whether the path is + // std::fopen() treats its filename argument, ignoring whether the path is // absolute or relative. // // If a search_path() element is non-empty and not ending in a slash, then a |