[tint] Rename tint_enable_local_storage_extension -> tint_enable_pixel_local_extension
No idea why I called it 'local_storage_extension'
Change-Id: Ic3b06b3c9164d27e09234413e076c0375d1fb674
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/150143
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f80721f..cb8b069 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@
option_if_not_defined(TINT_RANDOMIZE_HASHES "Randomize the hash seed value to detect non-deterministic output" OFF)
# TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
-option_if_not_defined(TINT_ENABLE_LOCAL_STORAGE_EXTENSION "Enable the WIP 'chromium_experimental_pixel_local' extension" OFF)
+option_if_not_defined(TINT_ENABLE_PIXEL_LOCAL_EXTENSION "Enable the WIP 'chromium_experimental_pixel_local' extension" OFF)
# Recommended setting for compability with future abseil releases.
set(ABSL_PROPAGATE_CXX_STD ON)
diff --git a/scripts/tint_overrides_with_defaults.gni b/scripts/tint_overrides_with_defaults.gni
index b21b3d2..606b530 100644
--- a/scripts/tint_overrides_with_defaults.gni
+++ b/scripts/tint_overrides_with_defaults.gni
@@ -88,8 +88,8 @@
}
# TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
- if (!defined(tint_enable_local_storage_extension)) {
- tint_enable_local_storage_extension = false
+ if (!defined(tint_enable_pixel_local_extension)) {
+ tint_enable_pixel_local_extension = false
}
}
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index b784213..2e9e7ae 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -90,10 +90,10 @@
}
# TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
- if (tint_enable_local_storage_extension) {
- defines += [ "TINT_ENABLE_LOCAL_STORAGE_EXTENSION=1" ]
+ if (tint_enable_pixel_local_extension) {
+ defines += [ "TINT_ENABLE_PIXEL_LOCAL_EXTENSION=1" ]
} else {
- defines += [ "TINT_ENABLE_LOCAL_STORAGE_EXTENSION=0" ]
+ defines += [ "TINT_ENABLE_PIXEL_LOCAL_EXTENSION=0" ]
}
include_dirs = [
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 5388e0b..2632230 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -44,7 +44,7 @@
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SYNTAX_TREE_WRITER=$<BOOL:${TINT_BUILD_SYNTAX_TREE_WRITER}>)
# TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
- target_compile_definitions(${TARGET} PUBLIC -DTINT_ENABLE_LOCAL_STORAGE_EXTENSION=$<BOOL:${TINT_ENABLE_LOCAL_STORAGE_EXTENSION}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_ENABLE_PIXEL_LOCAL_EXTENSION=$<BOOL:${TINT_ENABLE_PIXEL_LOCAL_EXTENSION}>)
common_compile_options(${TARGET})
endfunction()
diff --git a/src/tint/lang/wgsl/resolver/function_validation_test.cc b/src/tint/lang/wgsl/resolver/function_validation_test.cc
index dfeae7a..925bcf6 100644
--- a/src/tint/lang/wgsl/resolver/function_validation_test.cc
+++ b/src/tint/lang/wgsl/resolver/function_validation_test.cc
@@ -1053,10 +1053,10 @@
Func("f", Vector{arg}, ty.void_(), tint::Empty);
if (param.address_space == core::AddressSpace::kPixelLocal) {
-#if !TINT_ENABLE_LOCAL_STORAGE_EXTENSION
+#if !TINT_ENABLE_PIXEL_LOCAL_EXTENSION
// TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is
// production-ready
- GTEST_SKIP() << "requires TINT_ENABLE_LOCAL_STORAGE_EXTENSION";
+ GTEST_SKIP() << "requires TINT_ENABLE_PIXEL_LOCAL_EXTENSION";
#else
Enable(core::Extension::kChromiumExperimentalPixelLocal);
#endif
@@ -1088,10 +1088,10 @@
Func("f", Vector{arg}, ty.void_(), tint::Empty);
if (param.address_space == core::AddressSpace::kPixelLocal) {
-#if !TINT_ENABLE_LOCAL_STORAGE_EXTENSION
+#if !TINT_ENABLE_PIXEL_LOCAL_EXTENSION
// TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is
// production-ready
- GTEST_SKIP() << "requires TINT_ENABLE_LOCAL_STORAGE_EXTENSION";
+ GTEST_SKIP() << "requires TINT_ENABLE_PIXEL_LOCAL_EXTENSION";
#else
Enable(core::Extension::kChromiumExperimentalPixelLocal);
#endif
diff --git a/src/tint/lang/wgsl/resolver/pixel_local_extension_test.cc b/src/tint/lang/wgsl/resolver/pixel_local_extension_test.cc
index 8d34467..2d7e7f2 100644
--- a/src/tint/lang/wgsl/resolver/pixel_local_extension_test.cc
+++ b/src/tint/lang/wgsl/resolver/pixel_local_extension_test.cc
@@ -32,14 +32,14 @@
GlobalVar("v", ty.u32(), core::AddressSpace::kPixelLocal);
-#if TINT_ENABLE_LOCAL_STORAGE_EXTENSION
+#if TINT_ENABLE_PIXEL_LOCAL_EXTENSION
EXPECT_TRUE(r()->Resolve()) << r()->error();
#else
// TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(
r()->error(),
- R"(12:34 error: chromium_experimental_pixel_local requires TINT_ENABLE_LOCAL_STORAGE_EXTENSION)");
+ R"(12:34 error: chromium_experimental_pixel_local requires TINT_ENABLE_PIXEL_LOCAL_EXTENSION)");
#endif
}
@@ -59,7 +59,7 @@
R"(12:34 error: 'pixel_local' address space requires the 'chromium_experimental_pixel_local' extension enabled)");
}
-#if TINT_ENABLE_LOCAL_STORAGE_EXTENSION
+#if TINT_ENABLE_PIXEL_LOCAL_EXTENSION
TEST_F(ResolverPixelLocalExtensionTest, VertexStageDirect) {
// enable chromium_experimental_pixel_local;
diff --git a/src/tint/lang/wgsl/resolver/resolver.cc b/src/tint/lang/wgsl/resolver/resolver.cc
index 9b87d29..c505811 100644
--- a/src/tint/lang/wgsl/resolver/resolver.cc
+++ b/src/tint/lang/wgsl/resolver/resolver.cc
@@ -4000,10 +4000,10 @@
enabled_extensions_.Add(ext->name);
// TODO(crbug.com/dawn/1704): Remove when chromium_experimental_pixel_local is production-ready
-#if !TINT_ENABLE_LOCAL_STORAGE_EXTENSION
+#if !TINT_ENABLE_PIXEL_LOCAL_EXTENSION
if (ext->name == core::Extension::kChromiumExperimentalPixelLocal) {
AddError(std::string(core::ToString(core::Extension::kChromiumExperimentalPixelLocal)) +
- " requires TINT_ENABLE_LOCAL_STORAGE_EXTENSION",
+ " requires TINT_ENABLE_PIXEL_LOCAL_EXTENSION",
enable->source);
return false;
}
