Consistent formatting for Dawn/Tint. This CL updates the clang format files to have a single shared format between Dawn and Tint. The major changes are tabs are 4 spaces, lines are 100 columns and namespaces are not indented. Bug: dawn:1339 Change-Id: I4208742c95643998d9fd14e77a9cc558071ded39 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/87603 Commit-Queue: Dan Sinclair <dsinclair@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/sem/function.cc b/src/tint/sem/function.cc index 21eed58..790933b 100644 --- a/src/tint/sem/function.cc +++ b/src/tint/sem/function.cc
@@ -32,164 +32,155 @@ std::vector<Parameter*> parameters) : Base(return_type, utils::ToConstPtrVec(parameters)), declaration_(declaration), - workgroup_size_{WorkgroupDimension{1}, WorkgroupDimension{1}, - WorkgroupDimension{1}} { - for (auto* parameter : parameters) { - parameter->SetOwner(this); - } + workgroup_size_{WorkgroupDimension{1}, WorkgroupDimension{1}, WorkgroupDimension{1}} { + for (auto* parameter : parameters) { + parameter->SetOwner(this); + } } Function::~Function() = default; std::vector<std::pair<const Variable*, const ast::LocationAttribute*>> Function::TransitivelyReferencedLocationVariables() const { - std::vector<std::pair<const Variable*, const ast::LocationAttribute*>> ret; + std::vector<std::pair<const Variable*, const ast::LocationAttribute*>> ret; - for (auto* var : TransitivelyReferencedGlobals()) { - for (auto* attr : var->Declaration()->attributes) { - if (auto* location = attr->As<ast::LocationAttribute>()) { - ret.push_back({var, location}); - break; - } + for (auto* var : TransitivelyReferencedGlobals()) { + for (auto* attr : var->Declaration()->attributes) { + if (auto* location = attr->As<ast::LocationAttribute>()) { + ret.push_back({var, location}); + break; + } + } } - } - return ret; + return ret; } -Function::VariableBindings Function::TransitivelyReferencedUniformVariables() - const { - VariableBindings ret; +Function::VariableBindings Function::TransitivelyReferencedUniformVariables() const { + VariableBindings ret; - for (auto* var : TransitivelyReferencedGlobals()) { - if (var->StorageClass() != ast::StorageClass::kUniform) { - continue; - } + for (auto* var : TransitivelyReferencedGlobals()) { + if (var->StorageClass() != ast::StorageClass::kUniform) { + continue; + } - if (auto binding_point = var->Declaration()->BindingPoint()) { - ret.push_back({var, binding_point}); + if (auto binding_point = var->Declaration()->BindingPoint()) { + ret.push_back({var, binding_point}); + } } - } - return ret; + return ret; } -Function::VariableBindings -Function::TransitivelyReferencedStorageBufferVariables() const { - VariableBindings ret; +Function::VariableBindings Function::TransitivelyReferencedStorageBufferVariables() const { + VariableBindings ret; - for (auto* var : TransitivelyReferencedGlobals()) { - if (var->StorageClass() != ast::StorageClass::kStorage) { - continue; - } + for (auto* var : TransitivelyReferencedGlobals()) { + if (var->StorageClass() != ast::StorageClass::kStorage) { + continue; + } - if (auto binding_point = var->Declaration()->BindingPoint()) { - ret.push_back({var, binding_point}); + if (auto binding_point = var->Declaration()->BindingPoint()) { + ret.push_back({var, binding_point}); + } } - } - return ret; + return ret; } std::vector<std::pair<const Variable*, const ast::BuiltinAttribute*>> Function::TransitivelyReferencedBuiltinVariables() const { - std::vector<std::pair<const Variable*, const ast::BuiltinAttribute*>> ret; + std::vector<std::pair<const Variable*, const ast::BuiltinAttribute*>> ret; - for (auto* var : TransitivelyReferencedGlobals()) { - for (auto* attr : var->Declaration()->attributes) { - if (auto* builtin = attr->As<ast::BuiltinAttribute>()) { - ret.push_back({var, builtin}); - break; - } + for (auto* var : TransitivelyReferencedGlobals()) { + for (auto* attr : var->Declaration()->attributes) { + if (auto* builtin = attr->As<ast::BuiltinAttribute>()) { + ret.push_back({var, builtin}); + break; + } + } } - } - return ret; + return ret; } -Function::VariableBindings Function::TransitivelyReferencedSamplerVariables() - const { - return TransitivelyReferencedSamplerVariablesImpl(ast::SamplerKind::kSampler); +Function::VariableBindings Function::TransitivelyReferencedSamplerVariables() const { + return TransitivelyReferencedSamplerVariablesImpl(ast::SamplerKind::kSampler); } -Function::VariableBindings -Function::TransitivelyReferencedComparisonSamplerVariables() const { - return TransitivelyReferencedSamplerVariablesImpl( - ast::SamplerKind::kComparisonSampler); +Function::VariableBindings Function::TransitivelyReferencedComparisonSamplerVariables() const { + return TransitivelyReferencedSamplerVariablesImpl(ast::SamplerKind::kComparisonSampler); } -Function::VariableBindings -Function::TransitivelyReferencedSampledTextureVariables() const { - return TransitivelyReferencedSampledTextureVariablesImpl(false); +Function::VariableBindings Function::TransitivelyReferencedSampledTextureVariables() const { + return TransitivelyReferencedSampledTextureVariablesImpl(false); } -Function::VariableBindings -Function::TransitivelyReferencedMultisampledTextureVariables() const { - return TransitivelyReferencedSampledTextureVariablesImpl(true); +Function::VariableBindings Function::TransitivelyReferencedMultisampledTextureVariables() const { + return TransitivelyReferencedSampledTextureVariablesImpl(true); } Function::VariableBindings Function::TransitivelyReferencedVariablesOfType( const tint::TypeInfo* type) const { - VariableBindings ret; - for (auto* var : TransitivelyReferencedGlobals()) { - auto* unwrapped_type = var->Type()->UnwrapRef(); - if (unwrapped_type->TypeInfo().Is(type)) { - if (auto binding_point = var->Declaration()->BindingPoint()) { - ret.push_back({var, binding_point}); - } + VariableBindings ret; + for (auto* var : TransitivelyReferencedGlobals()) { + auto* unwrapped_type = var->Type()->UnwrapRef(); + if (unwrapped_type->TypeInfo().Is(type)) { + if (auto binding_point = var->Declaration()->BindingPoint()) { + ret.push_back({var, binding_point}); + } + } } - } - return ret; + return ret; } bool Function::HasAncestorEntryPoint(Symbol symbol) const { - for (const auto* point : ancestor_entry_points_) { - if (point->Declaration()->symbol == symbol) { - return true; + for (const auto* point : ancestor_entry_points_) { + if (point->Declaration()->symbol == symbol) { + return true; + } } - } - return false; + return false; } Function::VariableBindings Function::TransitivelyReferencedSamplerVariablesImpl( ast::SamplerKind kind) const { - VariableBindings ret; + VariableBindings ret; - for (auto* var : TransitivelyReferencedGlobals()) { - auto* unwrapped_type = var->Type()->UnwrapRef(); - auto* sampler = unwrapped_type->As<sem::Sampler>(); - if (sampler == nullptr || sampler->kind() != kind) { - continue; - } + for (auto* var : TransitivelyReferencedGlobals()) { + auto* unwrapped_type = var->Type()->UnwrapRef(); + auto* sampler = unwrapped_type->As<sem::Sampler>(); + if (sampler == nullptr || sampler->kind() != kind) { + continue; + } - if (auto binding_point = var->Declaration()->BindingPoint()) { - ret.push_back({var, binding_point}); + if (auto binding_point = var->Declaration()->BindingPoint()) { + ret.push_back({var, binding_point}); + } } - } - return ret; + return ret; } -Function::VariableBindings -Function::TransitivelyReferencedSampledTextureVariablesImpl( +Function::VariableBindings Function::TransitivelyReferencedSampledTextureVariablesImpl( bool multisampled) const { - VariableBindings ret; + VariableBindings ret; - for (auto* var : TransitivelyReferencedGlobals()) { - auto* unwrapped_type = var->Type()->UnwrapRef(); - auto* texture = unwrapped_type->As<sem::Texture>(); - if (texture == nullptr) { - continue; + for (auto* var : TransitivelyReferencedGlobals()) { + auto* unwrapped_type = var->Type()->UnwrapRef(); + auto* texture = unwrapped_type->As<sem::Texture>(); + if (texture == nullptr) { + continue; + } + + auto is_multisampled = texture->Is<sem::MultisampledTexture>(); + auto is_sampled = texture->Is<sem::SampledTexture>(); + + if ((multisampled && !is_multisampled) || (!multisampled && !is_sampled)) { + continue; + } + + if (auto binding_point = var->Declaration()->BindingPoint()) { + ret.push_back({var, binding_point}); + } } - auto is_multisampled = texture->Is<sem::MultisampledTexture>(); - auto is_sampled = texture->Is<sem::SampledTexture>(); - - if ((multisampled && !is_multisampled) || (!multisampled && !is_sampled)) { - continue; - } - - if (auto binding_point = var->Declaration()->BindingPoint()) { - ret.push_back({var, binding_point}); - } - } - - return ret; + return ret; } } // namespace tint::sem