mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-21 02:39:11 +00:00
Rename namespace dawn_native to dawn::native.
But keep a namespace alias to avoid breaking project that depend on the previous namespace name while they get updated. Done with through the following steps: - git grep -l dawn_native:: | xargs sed -i "" "s/dawn_native::/dawn::native::/g" - git grep -l "namespace dawn_native" | xargs sed -i "" "s/namespace dawn_native/namespace dawn::native/g" - git cl format - Manual fixups in generator/templates (and the addition of namespace_case in dawn_json_generator.py). - The addition of the namespace alias in DawnNative.h Bug: dawn:824 Change-Id: I676cc4e3ced2e0e4bab32a0d66d7eaf9537e3f09 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/75982 Reviewed-by: Loko Kung <lokokung@google.com> Commit-Queue: Corentin Wallez <cwallez@chromium.org> Auto-Submit: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
committed by
Dawn LUCI CQ
parent
8b3eaa60d8
commit
ec9cf2a85c
@@ -22,24 +22,24 @@ class FeatureTests : public testing::Test {
|
||||
public:
|
||||
FeatureTests()
|
||||
: testing::Test(),
|
||||
mInstanceBase(dawn_native::InstanceBase::Create()),
|
||||
mInstanceBase(dawn::native::InstanceBase::Create()),
|
||||
mAdapterBase(mInstanceBase.Get()) {
|
||||
}
|
||||
|
||||
std::vector<wgpu::FeatureName> GetAllFeatureNames() {
|
||||
std::vector<wgpu::FeatureName> allFeatureNames(kTotalFeaturesCount);
|
||||
for (size_t i = 0; i < kTotalFeaturesCount; ++i) {
|
||||
allFeatureNames[i] = FeatureEnumToAPIFeature(static_cast<dawn_native::Feature>(i));
|
||||
allFeatureNames[i] = FeatureEnumToAPIFeature(static_cast<dawn::native::Feature>(i));
|
||||
}
|
||||
return allFeatureNames;
|
||||
}
|
||||
|
||||
static constexpr size_t kTotalFeaturesCount =
|
||||
static_cast<size_t>(dawn_native::Feature::EnumCount);
|
||||
static_cast<size_t>(dawn::native::Feature::EnumCount);
|
||||
|
||||
protected:
|
||||
Ref<dawn_native::InstanceBase> mInstanceBase;
|
||||
dawn_native::null::Adapter mAdapterBase;
|
||||
Ref<dawn::native::InstanceBase> mInstanceBase;
|
||||
dawn::native::null::Adapter mAdapterBase;
|
||||
};
|
||||
|
||||
// Test the creation of a device will fail if the requested feature is not supported on the
|
||||
@@ -47,13 +47,13 @@ class FeatureTests : public testing::Test {
|
||||
TEST_F(FeatureTests, AdapterWithRequiredFeatureDisabled) {
|
||||
const std::vector<wgpu::FeatureName> kAllFeatureNames = GetAllFeatureNames();
|
||||
for (size_t i = 0; i < kTotalFeaturesCount; ++i) {
|
||||
dawn_native::Feature notSupportedFeature = static_cast<dawn_native::Feature>(i);
|
||||
dawn::native::Feature notSupportedFeature = static_cast<dawn::native::Feature>(i);
|
||||
|
||||
std::vector<wgpu::FeatureName> featureNamesWithoutOne = kAllFeatureNames;
|
||||
featureNamesWithoutOne.erase(featureNamesWithoutOne.begin() + i);
|
||||
|
||||
mAdapterBase.SetSupportedFeatures(featureNamesWithoutOne);
|
||||
dawn_native::Adapter adapterWithoutFeature(&mAdapterBase);
|
||||
dawn::native::Adapter adapterWithoutFeature(&mAdapterBase);
|
||||
|
||||
wgpu::DeviceDescriptor deviceDescriptor;
|
||||
wgpu::FeatureName featureName = FeatureEnumToAPIFeature(notSupportedFeature);
|
||||
@@ -68,16 +68,16 @@ TEST_F(FeatureTests, AdapterWithRequiredFeatureDisabled) {
|
||||
|
||||
// Test Device.GetEnabledFeatures() can return the names of the enabled features correctly.
|
||||
TEST_F(FeatureTests, GetEnabledFeatures) {
|
||||
dawn_native::Adapter adapter(&mAdapterBase);
|
||||
dawn::native::Adapter adapter(&mAdapterBase);
|
||||
for (size_t i = 0; i < kTotalFeaturesCount; ++i) {
|
||||
dawn_native::Feature feature = static_cast<dawn_native::Feature>(i);
|
||||
dawn::native::Feature feature = static_cast<dawn::native::Feature>(i);
|
||||
wgpu::FeatureName featureName = FeatureEnumToAPIFeature(feature);
|
||||
|
||||
wgpu::DeviceDescriptor deviceDescriptor;
|
||||
deviceDescriptor.requiredFeatures = &featureName;
|
||||
deviceDescriptor.requiredFeaturesCount = 1;
|
||||
|
||||
dawn_native::DeviceBase* deviceBase = dawn_native::FromAPI(
|
||||
dawn::native::DeviceBase* deviceBase = dawn::native::FromAPI(
|
||||
adapter.CreateDevice(reinterpret_cast<const WGPUDeviceDescriptor*>(&deviceDescriptor)));
|
||||
|
||||
ASSERT_EQ(1u, deviceBase->APIEnumerateFeatures(nullptr));
|
||||
|
||||
Reference in New Issue
Block a user