Hash :
8e9dc1a6
Author :
Date :
2024-11-19T11:08:31
Validate anonymous struct names with namespace
Consider GLSL:
struct { vec4 e; } g;
struct sbbf { vec4 f; };
The struct name validation would fail if user chosen struct name would
clash with a symbol name that ANGLE internally gave to an anonymous
struct.
Fix by importing Name abstraction from MSL backend. A symbol name is
a pair (namespace, string).
Move operator<<(std::ostream &os, const ImmutableString &str)
to sh namespace because that is more natural for operator overloading
name resolution. MSVC works with this.
Bug: angleproject:379758201
Change-Id: Icc9b02aa8cb532e1d925e2fba4c45468f01b9144
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6035029
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#ifndef COMPILER_TRANSLATOR_MSL_IDGEN_H_
#define COMPILER_TRANSLATOR_MSL_IDGEN_H_
#include "common/angleutils.h"
#include "compiler/translator/Name.h"
namespace sh
{
// For creating new fresh names.
// All names created are marked as SymbolType::AngleInternal.
class IdGen : angle::NonCopyable
{
public:
IdGen();
Name createNewName(const ImmutableString &baseName);
Name createNewName(const Name &baseName);
Name createNewName(const char *baseName);
Name createNewName(std::initializer_list<ImmutableString> baseNames);
Name createNewName(std::initializer_list<Name> baseNames);
Name createNewName(std::initializer_list<const char *> baseNames);
Name createNewName();
private:
template <typename String, typename StringToImmutable>
Name createNewName(size_t count, const String *baseNames, const StringToImmutable &toImmutable);
private:
unsigned mNext = 0; // `unsigned` because of "%u" use in sprintf
std::string mNewNameBuffer; // reusable buffer to avoid tons of reallocations
};
} // namespace sh
#endif // COMPILER_TRANSLATOR_MSL_IDGEN_H_