[WebGPU] Make sure WGSLUnitTests can call into WGSL
https://bugs.webkit.org/show_bug.cgi?id=235630
Reviewed by Dean Jackson.
* WGSL/WGSL.cpp:
(WGSL::staticCheck): Apparently /usr/local/include/AssertMacros.h #defines "check"
(WGSL::check): Deleted.
* WGSL/WGSL.h:
* WGSLUnitTests/WGSLUnitTests.mm:
(-[WGSLUnitTests testExample]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288643 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebGPU/ChangeLog b/Source/WebGPU/ChangeLog
index 357572b..8b576f6 100644
--- a/Source/WebGPU/ChangeLog
+++ b/Source/WebGPU/ChangeLog
@@ -1,3 +1,17 @@
+2022-01-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [WebGPU] Make sure WGSLUnitTests can call into WGSL
+ https://bugs.webkit.org/show_bug.cgi?id=235630
+
+ Reviewed by Dean Jackson.
+
+ * WGSL/WGSL.cpp:
+ (WGSL::staticCheck): Apparently /usr/local/include/AssertMacros.h #defines "check"
+ (WGSL::check): Deleted.
+ * WGSL/WGSL.h:
+ * WGSLUnitTests/WGSLUnitTests.mm:
+ (-[WGSLUnitTests testExample]):
+
2022-01-25 Myles C. Maxfield <mmaxfield@apple.com>
[WebGPU] Fix WGSLUnitTests build
diff --git a/Source/WebGPU/WGSL/WGSL.cpp b/Source/WebGPU/WGSL/WGSL.cpp
index 77c8a61..25a685e 100644
--- a/Source/WebGPU/WGSL/WGSL.cpp
+++ b/Source/WebGPU/WGSL/WGSL.cpp
@@ -30,9 +30,8 @@
namespace WGSL {
-std::variant<SuccessfulCheck, FailedCheck> check(const String&, const std::optional<SourceMap>&)
+std::variant<SuccessfulCheck, FailedCheck> staticCheck(const String&, const std::optional<SourceMap>&)
{
- ASSERT_NOT_REACHED();
return FailedCheck { { }, { } };
}
diff --git a/Source/WebGPU/WGSL/WGSL.h b/Source/WebGPU/WGSL/WGSL.h
index b06d11b..99c9de7 100644
--- a/Source/WebGPU/WGSL/WGSL.h
+++ b/Source/WebGPU/WGSL/WGSL.h
@@ -72,7 +72,7 @@
// https://sourcemaps.info/spec.html
};
-std::variant<SuccessfulCheck, FailedCheck> check(const String& wgsl, const std::optional<SourceMap>&);
+std::variant<SuccessfulCheck, FailedCheck> staticCheck(const String& wgsl, const std::optional<SourceMap>&);
//
// Step 2
diff --git a/Source/WebGPU/WGSLUnitTests/WGSLUnitTests.mm b/Source/WebGPU/WGSLUnitTests/WGSLUnitTests.mm
index f374bad..ff054ac 100644
--- a/Source/WebGPU/WGSLUnitTests/WGSLUnitTests.mm
+++ b/Source/WebGPU/WGSLUnitTests/WGSLUnitTests.mm
@@ -23,6 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "config.h"
+#import "WGSL.h"
+
#import <XCTest/XCTest.h>
#import <vector>
#import <wtf/DataLog.h>
@@ -41,6 +44,7 @@
y.append(2);
y.append(3);
XCTAssertEqual(x, y);
+ WGSL::staticCheck("", std::nullopt);
}
@end
