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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225
//
// 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_SYMBOLENV_H_
#define COMPILER_TRANSLATOR_MSL_SYMBOLENV_H_
#include <unordered_set>
#include "compiler/translator/Compiler.h"
#include "compiler/translator/Name.h"
#include "compiler/translator/Types.h"
#include "compiler/translator/msl/Reference.h"
namespace sh
{
enum class AddressSpace
{
Constant,
Device,
Thread,
};
char const *toString(AddressSpace space);
class VarField
{
public:
VarField(const TVariable &var) : mVariable(&var) {}
VarField(const TField &field) : mField(&field) {}
ANGLE_INLINE const TVariable *variable() const { return mVariable; }
ANGLE_INLINE const TField *field() const { return mField; }
ANGLE_INLINE bool operator==(const VarField &other) const
{
return mVariable == other.mVariable && mField == other.mField;
}
private:
const TVariable *mVariable = nullptr;
const TField *mField = nullptr;
};
} // namespace sh
namespace std
{
template <>
struct hash<sh::VarField>
{
size_t operator()(const sh::VarField &x) const
{
const sh::TVariable *var = x.variable();
if (var)
{
return std::hash<const sh::TVariable *>()(var);
}
const sh::TField *field = x.field();
return std::hash<const sh::TField *>()(field);
}
};
} // namespace std
namespace sh
{
class TemplateArg
{
public:
enum class Kind
{
Bool,
Int,
UInt,
Type,
};
union Value
{
Value(bool value) : b(value) {}
Value(int value) : i(value) {}
Value(unsigned value) : u(value) {}
Value(const TType &value) : t(&value) {}
bool b;
int i;
unsigned u;
const TType *t;
};
TemplateArg(bool value);
TemplateArg(int value);
TemplateArg(unsigned value);
TemplateArg(const TType &value);
bool operator==(const TemplateArg &other) const;
bool operator<(const TemplateArg &other) const;
Kind kind() const { return mKind; }
Value value() const { return mValue; }
public:
Kind mKind;
Value mValue;
};
// An environment for creating and uniquely sharing TSymbol objects.
class SymbolEnv
{
class TemplateName
{
Name baseName;
std::vector<TemplateArg> templateArgs;
public:
bool operator==(const TemplateName &other) const;
bool operator<(const TemplateName &other) const;
bool empty() const;
void clear();
Name fullName(std::string &buffer) const;
void assign(const Name &name, size_t argCount, const TemplateArg *args);
};
using TypeRef = CRef<TType>;
using Sig = std::vector<TypeRef>; // Param0, Param1, ... ParamN, Return
using SigToFunc = std::map<Sig, TFunction *>;
using Overloads = std::map<TemplateName, SigToFunc>;
using AngleStructs = std::map<ImmutableString, TStructure *>;
using TextureStructs = std::map<TBasicType, TStructure *>;
public:
SymbolEnv(TCompiler &compiler, TIntermBlock &root);
TSymbolTable &symbolTable() { return mSymbolTable; }
// There exist Angle rewrites that can lead to incoherent structs
//
// Example
// struct A { ... }
// struct B { A' a; } // A' has same name as A but is not identical.
// becomes
// struct A { ... }
// struct B { A a; }
//
// This notably happens when A contains a sampler in the original GLSL code but is rewritten to
// not have a sampler, yet the A' struct field still contains the sampler field.
const TStructure &remap(const TStructure &s) const;
// Like `TStructure &remap(const TStructure &s)` but additionally maps null to null.
const TStructure *remap(const TStructure *s) const;
const TFunction &getFunctionOverload(const Name &name,
const TType &returnType,
size_t paramCount,
const TType **paramTypes,
size_t templateArgCount = 0,
const TemplateArg *templateArgs = nullptr);
TIntermAggregate &callFunctionOverload(const Name &name,
const TType &returnType,
TIntermSequence &args,
size_t templateArgCount = 0,
const TemplateArg *templateArgs = nullptr);
const TStructure &newStructure(const Name &name, TFieldList &fields);
const TStructure &getTextureEnv(TBasicType samplerType);
const TStructure &getSamplerStruct();
void markAsPointer(VarField x, AddressSpace space);
void removePointer(VarField x);
const AddressSpace *isPointer(VarField x) const;
void markAsReference(VarField x, AddressSpace space);
void removeAsReference(VarField x);
const AddressSpace *isReference(VarField x) const;
void markAsPacked(const TField &field);
bool isPacked(const TField &field) const;
void markAsUBO(VarField x);
bool isUBO(VarField x) const;
private:
const TFunction &getFunctionOverloadImpl();
void markSpace(VarField x, AddressSpace space, std::unordered_map<VarField, AddressSpace> &map);
void removeSpace(VarField x, std::unordered_map<VarField, AddressSpace> &map);
const AddressSpace *isSpace(VarField x,
const std::unordered_map<VarField, AddressSpace> &map) const;
private:
TSymbolTable &mSymbolTable;
std::map<Name, const TStructure *> mNameToStruct;
Overloads mOverloads;
Sig mReusableSigBuffer;
TemplateName mReusableTemplateNameBuffer;
std::string mReusableStringBuffer;
AngleStructs mAngleStructs;
std::unordered_map<TBasicType, const TStructure *> mTextureEnvs;
const TStructure *mSampler = nullptr;
std::unordered_map<VarField, AddressSpace> mPointers;
std::unordered_map<VarField, AddressSpace> mReferences;
std::unordered_set<const TField *> mPackedFields;
std::unordered_set<VarField> mUboFields;
};
Name GetTextureTypeName(TBasicType samplerType);
} // namespace sh
#endif // COMPILER_TRANSLATOR_MSL_SYMBOLENV_H_