Remove "extension"
Now that Chrome uses [1] "feature" instead of "extension", this CL removes all occurrences of "extension". [1] https://chromium-review.googlesource.com/c/chromium/src/+/3205514 Change-Id: Ibbaaf5d6e99be62453604c71d8110eea9820c803 Bug: dawn:1149 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/65900 Commit-Queue: François Beaufort <beaufort.francois@gmail.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
parent
6fd28ba4cb
commit
a4c8c8d5bf
|
@ -1021,7 +1021,6 @@
|
|||
"category": "structure",
|
||||
"extensible": false,
|
||||
"tags": ["dawn"],
|
||||
"_comment": "TODO(dawn:1149): remove 'invalid extension' once it's no longer used.",
|
||||
"members": [
|
||||
{"name": "device ID", "type": "uint32_t"},
|
||||
{"name": "vendor ID", "type": "uint32_t"},
|
||||
|
@ -1033,7 +1032,6 @@
|
|||
{"name": "timestamp query", "type": "bool", "default": "false"},
|
||||
{"name": "multi planar formats", "type": "bool", "default": "false"},
|
||||
{"name": "depth clamping", "type": "bool", "default": "false"},
|
||||
{"name": "invalid extension", "type": "bool", "default": "false"},
|
||||
{"name": "invalid feature", "type": "bool", "default": "false"},
|
||||
{"name": "dawn internal usages", "type": "bool", "default": "false"},
|
||||
{"name": "limits", "type": "supported limits"}
|
||||
|
|
|
@ -121,14 +121,6 @@ namespace dawn_native {
|
|||
MaybeError AdapterBase::CreateDeviceInternal(DeviceBase** result,
|
||||
const DeviceDescriptor* descriptor) {
|
||||
if (descriptor != nullptr) {
|
||||
// TODO(dawn:1149): remove once requiredExtensions is no longer used.
|
||||
for (const char* extensionStr : descriptor->requiredExtensions) {
|
||||
Feature extensionEnum = mInstance->FeatureNameToEnum(extensionStr);
|
||||
DAWN_INVALID_IF(extensionEnum == Feature::InvalidEnum,
|
||||
"Requested feature %s is unknown.", extensionStr);
|
||||
DAWN_INVALID_IF(!mSupportedFeatures.IsEnabled(extensionEnum),
|
||||
"Requested feature %s is disabled.", extensionStr);
|
||||
}
|
||||
for (const char* featureStr : descriptor->requiredFeatures) {
|
||||
Feature featureEnum = mInstance->FeatureNameToEnum(featureStr);
|
||||
DAWN_INVALID_IF(featureEnum == Feature::InvalidEnum,
|
||||
|
|
|
@ -100,11 +100,6 @@ namespace dawn_native {
|
|||
return mImpl->GetPCIInfo();
|
||||
}
|
||||
|
||||
// TODO(dawn:1149): remove once GetSupportedExtensions() is no longer used.
|
||||
std::vector<const char*> Adapter::GetSupportedExtensions() const {
|
||||
return GetSupportedFeatures();
|
||||
}
|
||||
|
||||
std::vector<const char*> Adapter::GetSupportedFeatures() const {
|
||||
FeaturesSet supportedFeaturesSet = mImpl->GetSupportedFeatures();
|
||||
return supportedFeaturesSet.GetEnabledFeatureNames();
|
||||
|
|
|
@ -1051,13 +1051,8 @@ namespace dawn_native {
|
|||
|
||||
void DeviceBase::ApplyFeatures(const DeviceDescriptor* deviceDescriptor) {
|
||||
ASSERT(deviceDescriptor);
|
||||
// TODO(dawn:1149): remove once requiredExtensions is no longer used.
|
||||
ASSERT(GetAdapter()->SupportsAllRequestedFeatures(deviceDescriptor->requiredExtensions));
|
||||
ASSERT(GetAdapter()->SupportsAllRequestedFeatures(deviceDescriptor->requiredFeatures));
|
||||
|
||||
// TODO(dawn:1149): remove once requiredExtensions is no longer used.
|
||||
mEnabledExtensions = GetAdapter()->GetInstance()->FeatureNamesToFeaturesSet(
|
||||
deviceDescriptor->requiredExtensions);
|
||||
mEnabledFeatures = GetAdapter()->GetInstance()->FeatureNamesToFeaturesSet(
|
||||
deviceDescriptor->requiredFeatures);
|
||||
}
|
||||
|
@ -1067,8 +1062,7 @@ namespace dawn_native {
|
|||
}
|
||||
|
||||
bool DeviceBase::IsFeatureEnabled(Feature feature) const {
|
||||
// TODO(dawn:1149): remove mEnabledExtensions once it is no longer used.
|
||||
return mEnabledFeatures.IsEnabled(feature) || mEnabledExtensions.IsEnabled(feature);
|
||||
return mEnabledFeatures.IsEnabled(feature);
|
||||
}
|
||||
|
||||
bool DeviceBase::IsValidationEnabled() const {
|
||||
|
|
|
@ -510,7 +510,6 @@ namespace dawn_native {
|
|||
std::atomic_uint64_t mNextPipelineCompatibilityToken;
|
||||
|
||||
CombinedLimits mLimits;
|
||||
FeaturesSet mEnabledExtensions;
|
||||
FeaturesSet mEnabledFeatures;
|
||||
|
||||
std::unique_ptr<InternalPipelineStore> mInternalPipelineStore;
|
||||
|
|
|
@ -63,8 +63,6 @@ namespace dawn_native {
|
|||
// An optional parameter of Adapter::CreateDevice() to send additional information when creating
|
||||
// a Device. For example, we can use it to enable a workaround, optimization or feature.
|
||||
struct DAWN_NATIVE_EXPORT DeviceDescriptor {
|
||||
// TODO(dawn:1149): remove once requiredExtensions is no longer used.
|
||||
std::vector<const char*> requiredExtensions;
|
||||
std::vector<const char*> requiredFeatures;
|
||||
std::vector<const char*> forceEnabledToggles;
|
||||
std::vector<const char*> forceDisabledToggles;
|
||||
|
|
Loading…
Reference in New Issue