Skip to content

A
angle
Commit a905cbcd by Jamie Madill Committed by Commit Bot
Options

Compact built-in symbol table.

Should reduce the binary size bloat from the perfect hashing. Local testing on Windows shows a significant size reduction. Bug: chromium:998535 Change-Id: I411cc5a917036d2239d15353d760f44e40faa26c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1814725 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 49fd27d9
Showing with 461 additions and 426 deletions
scripts/code_generation_hashes/Static_builtins.json
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
"src/compiler/translator/ParseContext_complete_autogen.h": "src/compiler/translator/ParseContext_complete_autogen.h":
"a4209c68899e9cf3bcce81be2cb5f39f", "a4209c68899e9cf3bcce81be2cb5f39f",
"src/compiler/translator/SymbolTable_ESSL_autogen.cpp": "src/compiler/translator/SymbolTable_ESSL_autogen.cpp":
"de7c9ea8f4f76a1d6597eb8a8314c419", "7714226af3c98c0ebce9e71ef181c3ea",
"src/compiler/translator/SymbolTable_autogen.cpp": "src/compiler/translator/SymbolTable_autogen.cpp":
"c52199fd8dc27c7eb0da78c6d0054c0f", "b0454c7771bda83e0ff0b39338bd3f66",
"src/compiler/translator/SymbolTable_autogen.h": "src/compiler/translator/SymbolTable_autogen.h":
"3ce7740b6ad93a86d198c3937b70c17e", "3ce7740b6ad93a86d198c3937b70c17e",
"src/compiler/translator/builtin_function_declarations.txt": "src/compiler/translator/builtin_function_declarations.txt":
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"src/compiler/translator/builtin_variables.json": "src/compiler/translator/builtin_variables.json":
"e0155915c71991dee1c46358fdb7dd8b", "e0155915c71991dee1c46358fdb7dd8b",
"src/compiler/translator/gen_builtin_symbols.py": "src/compiler/translator/gen_builtin_symbols.py":
"f52b542220a3240cb92633ea2aa4b563", "1034aa779dc2f10458779b28863ec6e2",
"src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h": "src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h":
"3c7cdcb39ac0bd262a7d2c8edf8650c0", "3c7cdcb39ac0bd262a7d2c8edf8650c0",
"src/compiler/translator/tree_util/BuiltIn_complete_autogen.h": "src/compiler/translator/tree_util/BuiltIn_complete_autogen.h":
......
src/compiler/translator/ParseContext.cpp
...@@ -3364,10 +3364,9 @@ TFunction *TParseContext::parseFunctionDeclarator(const TSourceLoc &location, TF ...@@ -3364,10 +3364,9 @@ TFunction *TParseContext::parseFunctionDeclarator(const TSourceLoc &location, TF
if (getShaderVersion() >= 300) if (getShaderVersion() >= 300)
{ {
const UnmangledBuiltIn *builtIn =
symbolTable.getUnmangledBuiltInForShaderVersion(function->name(), getShaderVersion()); if (symbolTable.isUnmangledBuiltInName(function->name(), getShaderVersion(),
if (builtIn && extensionBehavior()))
(builtIn->extension == TExtension::UNDEFINED || isExtensionEnabled(builtIn->extension)))
{ {
// With ESSL 3.00 and above, names of built-in functions cannot be redeclared as // With ESSL 3.00 and above, names of built-in functions cannot be redeclared as
// functions. Therefore overloading or redefining builtin functions is an error. // functions. Therefore overloading or redefining builtin functions is an error.
......
src/compiler/translator/SymbolTable.cpp
...@@ -21,6 +21,38 @@ ...@@ -21,6 +21,38 @@
namespace sh namespace sh
{ {
namespace
{
bool CheckShaderType(Shader expected, GLenum actual)
{
switch (expected)
{
case Shader::ALL:
return true;
case Shader::FRAGMENT:
return actual == GL_FRAGMENT_SHADER;
case Shader::VERTEX:
return actual == GL_VERTEX_SHADER;
case Shader::COMPUTE:
return actual == GL_COMPUTE_SHADER;
case Shader::GEOMETRY:
return actual == GL_GEOMETRY_SHADER;
case Shader::GEOMETRY_EXT:
return actual == GL_GEOMETRY_SHADER_EXT;
case Shader::NOT_COMPUTE:
return actual != GL_COMPUTE_SHADER;
default:
UNREACHABLE();
return false;
}
}
bool CheckExtension(uint32_t extensionIndex, const ShBuiltInResources &resources)
{
const int *resourcePtr = reinterpret_cast<const int *>(&resources);
return resourcePtr[extensionIndex] > 0;
}
} // namespace
class TSymbolTable::TSymbolTableLevel class TSymbolTable::TSymbolTableLevel
{ {
...@@ -416,4 +448,87 @@ void TSymbolTable::initSamplerDefaultPrecision(TBasicType samplerType) ...@@ -416,4 +448,87 @@ void TSymbolTable::initSamplerDefaultPrecision(TBasicType samplerType)
TSymbolTable::VariableMetadata::VariableMetadata() TSymbolTable::VariableMetadata::VariableMetadata()
: staticRead(false), staticWrite(false), invariant(false) : staticRead(false), staticWrite(false), invariant(false)
{} {}
const TSymbol *SymbolRule::get(ShShaderSpec shaderSpec,
int shaderVersion,
sh::GLenum shaderType,
const ShBuiltInResources &resources,
const TSymbolTableBase &symbolTable) const
{
if (IsDesktopGLSpec(shaderSpec) != (mIsDesktop == 1))
return nullptr;
if (mVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
return nullptr;
if (mVersion > shaderVersion)
return nullptr;
if (!CheckShaderType(static_cast<Shader>(mShaders), shaderType))
return nullptr;
if (mExtensionIndex != 0 && !CheckExtension(mExtensionIndex, resources))
return nullptr;
return mIsVar > 0 ? symbolTable.*(mSymbolOrVar.var) : mSymbolOrVar.symbol;
}
const TSymbol *FindMangledBuiltIn(ShShaderSpec shaderSpec,
int shaderVersion,
sh::GLenum shaderType,
const ShBuiltInResources &resources,
const TSymbolTableBase &symbolTable,
const SymbolRule *rules,
uint16_t startIndex,
uint16_t endIndex)
{
for (uint32_t ruleIndex = startIndex; ruleIndex < endIndex; ++ruleIndex)
{
const TSymbol *symbol =
rules[ruleIndex].get(shaderSpec, shaderVersion, shaderType, resources, symbolTable);
if (symbol)
{
return symbol;
}
}
return nullptr;
}
bool UnmangledEntry::matches(const ImmutableString &name,
ShShaderSpec shaderSpec,
int shaderVersion,
sh::GLenum shaderType,
const TExtensionBehavior &extensions) const
{
if (name != mName)
return false;
if (!CheckShaderType(static_cast<Shader>(mShaderType), shaderType))
return false;
if (IsDesktopGLSpec(shaderSpec))
{
if (mGLSLVersion > shaderVersion)
return false;
if (static_cast<TExtension>(mGLSLExtension) == TExtension::UNDEFINED)
return true;
return IsExtensionEnabled(extensions, static_cast<TExtension>(mGLSLExtension));
}
else
{
if (mESSLVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
return false;
if (mESSLVersion > shaderVersion)
return false;
if (static_cast<TExtension>(mESSLExtension) == TExtension::UNDEFINED)
return true;
return IsExtensionEnabled(extensions, static_cast<TExtension>(mESSLExtension));
}
}
} // namespace sh } // namespace sh
src/compiler/translator/SymbolTable.h
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
// are tracked in the intermediate representation, not the symbol table. // are tracked in the intermediate representation, not the symbol table.
// //
#include <limits>
#include <memory> #include <memory>
#include <set> #include <set>
...@@ -62,107 +63,150 @@ struct UnmangledBuiltIn ...@@ -62,107 +63,150 @@ struct UnmangledBuiltIn
TExtension extension; TExtension extension;
}; };
using VarPointer = TSymbol *(TSymbolTableBase::*); using VarPointer = TSymbol *(TSymbolTableBase::*);
using ValidateExtension = int(ShBuiltInResources::*); using ValidateExtension = int(ShBuiltInResources::*);
struct SymbolEntry enum class Spec
{ {
constexpr SymbolEntry(const char *name, GLSL,
const TSymbol *symbol, ESSL
VarPointer var,
int esslVersion,
int glslVersion,
Shader shaderType,
const TSymbol *esslExtSymbol,
VarPointer esslExtVar,
int esslExtVersion,
Shader esslExtShaderType,
ValidateExtension esslExtension,
const TSymbol *glslExtSymbol,
VarPointer glslExtVar,
int glslExtVersion,
Shader glslExtShaderType,
ValidateExtension glslExtension,
const TSymbol *esslExtSymbol2 = nullptr,
VarPointer esslExtVar2 = nullptr,
int esslExtVersion2 = -1,
Shader esslExtShaderType2 = Shader::ALL,
ValidateExtension esslExtension2 = nullptr)
: name(name),
symbol(symbol),
var(var),
esslVersion(esslVersion),
glslVersion(glslVersion),
shaderType(shaderType),
esslExtSymbol(esslExtSymbol),
esslExtVar(esslExtVar),
esslExtVersion(esslExtVersion),
esslExtShaderType(esslExtShaderType),
esslExtension(esslExtension),
glslExtSymbol(glslExtSymbol),
glslExtVar(glslExtVar),
glslExtVersion(glslExtVersion),
glslExtShaderType(glslExtShaderType),
glslExtension(glslExtension),
esslExtSymbol2(esslExtSymbol2),
esslExtVar2(esslExtVar2),
esslExtVersion2(esslExtVersion2),
esslExtShaderType2(esslExtShaderType2),
esslExtension2(esslExtension2)
{}
ImmutableString name;
const TSymbol *symbol;
VarPointer var;
int esslVersion;
int glslVersion;
Shader shaderType;
const TSymbol *esslExtSymbol;
VarPointer esslExtVar;
int esslExtVersion;
Shader esslExtShaderType;
ValidateExtension esslExtension;
const TSymbol *glslExtSymbol;
VarPointer glslExtVar;
int glslExtVersion;
Shader glslExtShaderType;
ValidateExtension glslExtension;
const TSymbol *esslExtSymbol2;
VarPointer esslExtVar2;
int esslExtVersion2;
Shader esslExtShaderType2;
ValidateExtension esslExtension2;
}; };
struct UnmangledEntry constexpr uint16_t kESSL1Only = 100;
static_assert(offsetof(ShBuiltInResources, OES_standard_derivatives) != 0,
"Update SymbolTable extension logic");
#define EXT_INDEX(Ext) (offsetof(ShBuiltInResources, Ext) / sizeof(int))
class SymbolRule
{ {
constexpr UnmangledEntry(ImmutableString &&name, public:
const UnmangledBuiltIn *esslUnmangled, const TSymbol *get(ShShaderSpec shaderSpec,
const UnmangledBuiltIn *glslUnmangled, int shaderVersion,
sh::GLenum shaderType,
const ShBuiltInResources &resources,
const TSymbolTableBase &symbolTable) const;
template <Spec spec, int version, Shader shaders, size_t extensionIndex, typename T>
constexpr static SymbolRule Get(T value);
private:
constexpr SymbolRule(Spec spec,
int version,
Shader shaders,
size_t extensionIndex,
const TSymbol *symbol);
constexpr SymbolRule(Spec spec,
int version,
Shader shaders,
size_t extensionIndex,
VarPointer resourceVar);
union SymbolOrVar
{
constexpr SymbolOrVar(const TSymbol *symbolIn) : symbol(symbolIn) {}
constexpr SymbolOrVar(VarPointer varIn) : var(varIn) {}
const TSymbol *symbol;
VarPointer var;
};
uint16_t mIsDesktop : 1;
uint16_t mIsVar : 1;
uint16_t mVersion : 14;
uint8_t mShaders;
uint8_t mExtensionIndex;
SymbolOrVar mSymbolOrVar;
};
constexpr SymbolRule::SymbolRule(Spec spec,
int version,
Shader shaders,
size_t extensionIndex,
const TSymbol *symbol)
: mIsDesktop(spec == Spec::GLSL ? 1u : 0u),
mIsVar(0u),
mVersion(static_cast<uint16_t>(version)),
mShaders(static_cast<uint8_t>(shaders)),
mExtensionIndex(extensionIndex),
mSymbolOrVar(symbol)
{}
constexpr SymbolRule::SymbolRule(Spec spec,
int version,
Shader shaders,
size_t extensionIndex,
VarPointer resourceVar)
: mIsDesktop(spec == Spec::GLSL ? 1u : 0u),
mIsVar(1u),
mVersion(static_cast<uint16_t>(version)),
mShaders(static_cast<uint8_t>(shaders)),
mExtensionIndex(extensionIndex),
mSymbolOrVar(resourceVar)
{}
template <Spec spec, int version, Shader shaders, size_t extensionIndex, typename T>
// static
constexpr SymbolRule SymbolRule::Get(T value)
{
static_assert(version < 0x4000u, "version OOR");
static_assert(static_cast<uint8_t>(shaders) < 0xFFu, "shaders OOR");
static_assert(static_cast<uint8_t>(extensionIndex) < 0xFF, "extensionIndex OOR");
return SymbolRule(spec, version, shaders, extensionIndex, value);
}
const TSymbol *FindMangledBuiltIn(ShShaderSpec shaderSpec,
int shaderVersion,
sh::GLenum shaderType,
const ShBuiltInResources &resources,
const TSymbolTableBase &symbolTable,
const SymbolRule *rules,
uint16_t startIndex,
uint16_t endIndex);
class UnmangledEntry
{
public:
constexpr UnmangledEntry(const char *name,
TExtension esslExtension,
TExtension glslExtension,
int esslVersion, int esslVersion,
int glslVersion, int glslVersion,
Shader shaderType) Shader shaderType);
: name(std::move(name)),
esslUnmangled(esslUnmangled), bool matches(const ImmutableString &name,
glslUnmangled(glslUnmangled), ShShaderSpec shaderSpec,
esslVersion(esslVersion), int shaderVersion,
glslVersion(glslVersion), sh::GLenum shaderType,
shaderType(shaderType) const TExtensionBehavior &extensions) const;
{}
private:
ImmutableString name; const char *mName;
const UnmangledBuiltIn *esslUnmangled; uint8_t mESSLExtension;
const UnmangledBuiltIn *glslUnmangled; uint8_t mGLSLExtension;
int esslVersion; uint8_t mShaderType;
int glslVersion; uint16_t mESSLVersion;
Shader shaderType; uint16_t mGLSLVersion;
}; };
constexpr UnmangledEntry::UnmangledEntry(const char *name,
TExtension esslExtension,
TExtension glslExtension,
int esslVersion,
int glslVersion,
Shader shaderType)
: mName(name),
mESSLExtension(static_cast<uint8_t>(esslExtension)),
mGLSLExtension(static_cast<uint8_t>(glslExtension)),
mShaderType(static_cast<uint8_t>(shaderType)),
mESSLVersion(esslVersion < 0 ? std::numeric_limits<uint16_t>::max()
: static_cast<uint16_t>(esslVersion)),
mGLSLVersion(glslVersion < 0 ? std::numeric_limits<uint16_t>::max()
: static_cast<uint16_t>(glslVersion))
{}
class TSymbolTable : angle::NonCopyable, TSymbolTableBase class TSymbolTable : angle::NonCopyable, TSymbolTableBase
{ {
public: public:
...@@ -242,8 +286,9 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase ...@@ -242,8 +286,9 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase
const TSymbolUniqueId nextUniqueId() { return TSymbolUniqueId(this); } const TSymbolUniqueId nextUniqueId() { return TSymbolUniqueId(this); }
// Gets the built-in accessible by a shader with the specified version, if any. // Gets the built-in accessible by a shader with the specified version, if any.
const UnmangledBuiltIn *getUnmangledBuiltInForShaderVersion(const ImmutableString &name, bool isUnmangledBuiltInName(const ImmutableString &name,
int shaderVersion); int shaderVersion,
const TExtensionBehavior &extensions) const;
void initializeBuiltIns(sh::GLenum type, void initializeBuiltIns(sh::GLenum type,
ShShaderSpec spec, ShShaderSpec spec,
...@@ -273,12 +318,6 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase ...@@ -273,12 +318,6 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase
VariableMetadata *getOrCreateVariableMetadata(const TVariable &variable); VariableMetadata *getOrCreateVariableMetadata(const TVariable &variable);
const TSymbol *getSymbol(SymbolEntry entry, const ImmutableString &name, int version) const;
const UnmangledBuiltIn *getUnmangled(UnmangledEntry entry,
const ImmutableString &name,
int version) const;
std::vector<std::unique_ptr<TSymbolTableLevel>> mTable; std::vector<std::unique_ptr<TSymbolTableLevel>> mTable;
// There's one precision stack level for predefined precisions and then one level for each scope // There's one precision stack level for predefined precisions and then one level for each scope
......
src/compiler/translator/SymbolTable_ESSL_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/translator/SymbolTable_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/translator/gen_builtin_symbols.py
...@@ -252,6 +252,8 @@ template_symboltable_cpp = """// GENERATED FILE - DO NOT EDIT. ...@@ -252,6 +252,8 @@ template_symboltable_cpp = """// GENERATED FILE - DO NOT EDIT.
namespace sh namespace sh
{{ {{
using Resources = ShBuiltInResources;
using TableBase = TSymbolTableBase;
// Since some of the BuiltInId declarations are used outside of constexpr expressions, we need to // Since some of the BuiltInId declarations are used outside of constexpr expressions, we need to
// have these definitions without an initializer. C++17 should eventually remove the need for this. // have these definitions without an initializer. C++17 should eventually remove the need for this.
...@@ -286,29 +288,42 @@ namespace BuiltInParameters ...@@ -286,29 +288,42 @@ namespace BuiltInParameters
}} // namespace BuiltInParameters }} // namespace BuiltInParameters
namespace UnmangledBuiltIns
{{
{unmangled_builtin_declarations}
}} // namespace UnmangledBuiltIns
// TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend // TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend
// this from TFunction. Now symbol constructors taking an id have to be public even though they're // this from TFunction. Now symbol constructors taking an id have to be public even though they're
// not supposed to be accessible from outside of here. http://anglebug.com/2390 // not supposed to be accessible from outside of here. http://anglebug.com/2390
namespace BuiltInFunction namespace Func
{{ {{
{function_declarations} {function_declarations}
}} // namespace BuiltInFunction }} // namespace Func
namespace BuiltInArray namespace BuiltInArray
{{ {{
using namespace Func;
using Rule = SymbolRule;
constexpr SymbolEntry mangled[] = {{ {mangled_array} }}; // Rules used to initialize the mangled name array.
constexpr SymbolRule kRules[] = {{
{mangled_rules}
}};
constexpr UnmangledEntry unmangled[] = {{ {unmangled_array} }}; // Flat array of all mangled names.
constexpr const char *kMangledNames[] = {{
{mangled_names_array}
}};
// Flat array of offsets from a symbol into the rules table.
constexpr uint16_t kMangledOffsets[] = {{
{mangled_offsets_array}
}};
using Ext = TExtension;
// Flat array of all unmangled name identifiers.
constexpr UnmangledEntry unmangled[] = {{
{unmangled_array}
}};
}} }}
...@@ -320,94 +335,15 @@ void TSymbolTable::initializeBuiltInVariables(sh::GLenum shaderType, ...@@ -320,94 +335,15 @@ void TSymbolTable::initializeBuiltInVariables(sh::GLenum shaderType,
{init_member_variables} {init_member_variables}
}} }}
namespace {{ namespace
bool CheckESSLVersion(int expected, int actual)
{{
// Not supported
if (expected == -1)
return false;
// Only ESSL100
if (expected == 100)
return actual == 100;
return actual >= expected;
}}
bool CheckGLSLVersion(int expected, int actual)
{{ {{
// Not supported uint16_t GetNextRuleIndex(uint32_t nameHash)
if (expected == -1)
return false;
return actual >= expected;
}}
bool CheckShaderType(Shader expected, GLenum actual)
{{ {{
switch(expected) if (nameHash == {num_mangled_names} - 1)
{{ return ArraySize(BuiltInArray::kRules);
case Shader::ALL: return BuiltInArray::kMangledOffsets[nameHash + 1];
return true;
case Shader::FRAGMENT:
return actual == GL_FRAGMENT_SHADER;
case Shader::VERTEX:
return actual == GL_VERTEX_SHADER;
case Shader::COMPUTE:
return actual == GL_COMPUTE_SHADER;
case Shader::GEOMETRY:
return actual == GL_GEOMETRY_SHADER;
case Shader::GEOMETRY_EXT:
return actual == GL_GEOMETRY_SHADER_EXT;
case Shader::NOT_COMPUTE:
return actual != GL_COMPUTE_SHADER;
default:
UNREACHABLE();
return false;
}}
}}
}}
const TSymbol *TSymbolTable::getSymbol(SymbolEntry entry, const ImmutableString &name, int version) const
{{
if (entry.name != name)
{{
return nullptr;
}}
if ((entry.symbol || entry.var) && CheckShaderType(entry.shaderType, mShaderType))
{{
// Non-extension symbol or variable
if (!IsDesktopGLSpec(mShaderSpec) && CheckESSLVersion(entry.esslVersion, version))
{{
return entry.symbol ? entry.symbol : this->*(entry.var);
}}
if (IsDesktopGLSpec(mShaderSpec) && CheckGLSLVersion(entry.glslVersion, version))
{{
return entry.symbol ? entry.symbol : this->*(entry.var);
}}
}}
if (entry.esslExtension && mResources.*(entry.esslExtension) && !IsDesktopGLSpec(mShaderSpec) &&
CheckESSLVersion(entry.esslExtVersion, version) &&
CheckShaderType(entry.esslExtShaderType, mShaderType))
{{
return entry.esslExtSymbol ? entry.esslExtSymbol : this->*(entry.esslExtVar);
}}
if (entry.glslExtension && mResources.*(entry.glslExtension) && IsDesktopGLSpec(mShaderSpec) &&
CheckGLSLVersion(entry.glslExtVersion, version) &&
CheckShaderType(entry.glslExtShaderType, mShaderType))
{{
return entry.glslExtSymbol ? entry.glslExtSymbol : this->*(entry.glslExtVar);
}}
if (entry.esslExtension2 && mResources.*(entry.esslExtension2) && !IsDesktopGLSpec(mShaderSpec) &&
CheckESSLVersion(entry.esslExtVersion2, version) &&
CheckShaderType(entry.esslExtShaderType2, mShaderType))
{{
return entry.esslExtSymbol2 ? entry.esslExtSymbol2 : this->*(entry.esslExtVar2);
}}
return nullptr;
}} }}
}} // namespace
const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name, const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name,
int shaderVersion) const int shaderVersion) const
...@@ -418,38 +354,29 @@ const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name, ...@@ -418,38 +354,29 @@ const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name,
uint32_t nameHash = name.mangledNameHash(); uint32_t nameHash = name.mangledNameHash();
if (nameHash >= {num_mangled_names}) if (nameHash >= {num_mangled_names})
return nullptr; return nullptr;
return getSymbol(BuiltInArray::mangled[nameHash], name, shaderVersion);
}}
const UnmangledBuiltIn *TSymbolTable::getUnmangled(UnmangledEntry entry, const ImmutableString &name, int version) const const char *actualName = BuiltInArray::kMangledNames[nameHash];
{{ if (name != actualName)
if (!CheckShaderType(entry.shaderType, mShaderType))
{{
return nullptr; return nullptr;
}}
if (entry.name == name) uint16_t startIndex = BuiltInArray::kMangledOffsets[nameHash];
{{ uint16_t nextIndex = GetNextRuleIndex(nameHash);
if (!IsDesktopGLSpec(mShaderSpec) && CheckESSLVersion(entry.esslVersion, version))
{{ return FindMangledBuiltIn(mShaderSpec, shaderVersion, mShaderType, mResources, *this, BuiltInArray::kRules, startIndex, nextIndex);
return entry.esslUnmangled;
}}
if (IsDesktopGLSpec(mShaderSpec) && CheckGLSLVersion(entry.glslVersion, version))
{{
return entry.glslUnmangled;
}}
}}
return nullptr;
}} }}
const UnmangledBuiltIn *TSymbolTable::getUnmangledBuiltInForShaderVersion(const ImmutableString &name, int shaderVersion) bool TSymbolTable::isUnmangledBuiltInName(const ImmutableString &name,
int shaderVersion,
const TExtensionBehavior &extensions) const
{{ {{
if (name.length() > {max_unmangled_name_length}) if (name.length() > {max_unmangled_name_length})
return nullptr; return false;
uint32_t nameHash = name.unmangledNameHash(); uint32_t nameHash = name.unmangledNameHash();
if (nameHash >= {num_unmangled_names}) if (nameHash >= {num_unmangled_names})
return nullptr; return false;
return getUnmangled(BuiltInArray::unmangled[nameHash], name, shaderVersion);
return BuiltInArray::unmangled[nameHash].matches(name, mShaderSpec, shaderVersion, mShaderType, extensions);
}} }}
}} // namespace sh }} // namespace sh
...@@ -485,6 +412,8 @@ namespace BuiltInGroup ...@@ -485,6 +412,8 @@ namespace BuiltInGroup
""" """
template_rule = """Rule::Get<{spec}, {version}, {shaders}, {extension}>({symbol_or_var})"""
basic_types_enumeration = [ basic_types_enumeration = [
'Void', 'Void',
'Float', 'Float',
...@@ -657,6 +586,13 @@ def get_glsl_shader_version_for_level(level): ...@@ -657,6 +586,13 @@ def get_glsl_shader_version_for_level(level):
raise Exception('Unsupported symbol table level') raise Exception('Unsupported symbol table level')
def get_shader_version_for_level(spec, level):
if spec == "ESSL":
return get_essl_shader_version_for_level(level)
else:
return get_glsl_shader_version_for_level(level)
class GroupedList: class GroupedList:
""""Class for storing a list of objects grouped by symbol table level and condition.""" """"Class for storing a list of objects grouped by symbol table level and condition."""
...@@ -665,17 +601,10 @@ class GroupedList: ...@@ -665,17 +601,10 @@ class GroupedList:
self.max_name_length = 0 self.max_name_length = 0
self.hashfn = hashfn self.hashfn = hashfn
self.num_names = num_names self.num_names = num_names
self.rule_offset = 0
def add_obj(self, def add_entry(self, essl_level, glsl_level, shader_type, name, symbol, essl_extension,
essl_level, glsl_extension, script_generated_hash_tests):
glsl_level,
shader_type,
name,
obj,
essl_extension,
glsl_extension,
script_generated_hash_tests,
var_obj=False):
if essl_level and essl_level not in essl_levels: if essl_level and essl_level not in essl_levels:
raise Exception('Unexpected essl level: ' + str(essl_level)) raise Exception('Unexpected essl level: ' + str(essl_level))
if glsl_level and glsl_level not in glsl_levels: if glsl_level and glsl_level not in glsl_levels:
...@@ -694,133 +623,102 @@ class GroupedList: ...@@ -694,133 +623,102 @@ class GroupedList:
self.objs[name_hash]['essl_level'] = essl_level self.objs[name_hash]['essl_level'] = essl_level
if glsl_level: if glsl_level:
self.objs[name_hash]['glsl_level'] = glsl_level self.objs[name_hash]['glsl_level'] = glsl_level
if var_obj: self.objs[name_hash]['symbol'] = symbol
self.objs[name_hash]['var'] = obj
else:
self.objs[name_hash]['obj'] = obj
self.objs[name_hash]['shader_type'] = shader_type self.objs[name_hash]['shader_type'] = shader_type
if essl_extension != 'UNDEFINED': if essl_extension != 'UNDEFINED':
if (var_obj and 'essl_ext_var' in self.objs[name_hash] and if ('essl_ext_symbol' in self.objs[name_hash] and
self.objs[name_hash]['essl_ext_var'] != obj) or ( self.objs[name_hash]['essl_ext_symbol'] != symbol):
not var_obj and 'essl_ext_obj' in self.objs[name_hash] and
self.objs[name_hash]['essl_ext_obj'] != obj):
# Adding a variable that is part of two ESSL extensions # Adding a variable that is part of two ESSL extensions
if essl_extension != 'UNDEFINED': if essl_extension != 'UNDEFINED':
self.objs[name_hash]['essl_extension2'] = essl_extension self.objs[name_hash]['essl_extension2'] = essl_extension
self.objs[name_hash]['essl_ext_level2'] = essl_level self.objs[name_hash]['essl_ext_level2'] = essl_level
if var_obj: self.objs[name_hash]['essl_ext_symbol2'] = symbol
self.objs[name_hash]['essl_ext_var2'] = obj self.objs[name_hash]['essl_ext_shader_type2'] = shader_type
else:
self.objs[name_hash]['essl_ext_obj2'] = obj
self.objs[name_hash]['essl_ext_shader_type2'] = shader_type
else: else:
self.objs[name_hash]['essl_extension'] = essl_extension self.objs[name_hash]['essl_extension'] = essl_extension
self.objs[name_hash]['essl_ext_level'] = essl_level self.objs[name_hash]['essl_ext_level'] = essl_level
if var_obj: self.objs[name_hash]['essl_ext_symbol'] = symbol
self.objs[name_hash]['essl_ext_var'] = obj self.objs[name_hash]['essl_ext_shader_type'] = shader_type
else:
self.objs[name_hash]['essl_ext_obj'] = obj
self.objs[name_hash]['essl_ext_shader_type'] = shader_type
if glsl_extension != 'UNDEFINED': if glsl_extension != 'UNDEFINED':
self.objs[name_hash]['glsl_extension'] = glsl_extension self.objs[name_hash]['glsl_extension'] = glsl_extension
self.objs[name_hash]['glsl_ext_level'] = glsl_level self.objs[name_hash]['glsl_ext_level'] = glsl_level
if var_obj: self.objs[name_hash]['glsl_ext_symbol'] = symbol
self.objs[name_hash]['glsl_ext_var'] = obj
else:
self.objs[name_hash]['glsl_ext_obj'] = obj
self.objs[name_hash]['glsl_ext_shader_type'] = shader_type self.objs[name_hash]['glsl_ext_shader_type'] = shader_type
def get_max_name_length(self): def get_max_name_length(self):
return self.max_name_length return self.max_name_length
def get_array(self): def format_rule(self, rule):
code = [] return template_rule.format(**rule)
def format_rules(self, rules):
return ", ".join([self.format_rule(rule) for rule in rules])
def get_rules(self):
return self.rules
def get_names(self):
return self.names
def get_offsets(self):
return self.offsets
def update_arrays(self):
def add_rule(rules, spec, level, shaders, extension, symbol):
var = ("&TableBase::%s" % symbol) if symbol.startswith("m_gl") else None
rules.append({
"spec": "Spec::%s" % ("ESSL" if spec == "ESSL" else "GLSL"),
"version": get_shader_version_for_level(spec, level),
"shaders": "Shader::%s" % ("ALL" if shaders == "NONE" else shaders),
"extension": "0" if extension == None else "EXT_INDEX(%s)" % extension,
"symbol_or_var": symbol.replace("Func::", "") if var is None else var
})
self.names = []
self.offsets = []
self.rules = []
for hash_val in range(0, self.num_names): for hash_val in range(0, self.num_names):
if hash_val in self.objs: if hash_val in self.objs:
obj_data = self.objs[hash_val] data = self.objs[hash_val]
data = [] rules = []
data.append('"{name}"'.format(name=obj_data['name']))
if "symbol" in data and "essl_level" in data:
symbol = obj_data['obj'] if 'obj' in obj_data else 'nullptr' add_rule(rules, "ESSL", data['essl_level'], data['shader_type'], None,
var = '&TSymbolTableBase::{}'.format( data["symbol"])
obj_data['var']) if 'var' in obj_data else 'nullptr'
essl_level = obj_data['essl_level'] if 'essl_level' in obj_data else None if "symbol" in data and "glsl_level" in data:
glsl_level = obj_data['glsl_level'] if 'glsl_level' in obj_data else None add_rule(rules, "GLSL", data['glsl_level'], data['shader_type'], None,
essl_version = get_essl_shader_version_for_level(essl_level) data["symbol"])
glsl_version = get_glsl_shader_version_for_level(glsl_level)
shader_type = 'Shader::' + obj_data[ if "essl_ext_symbol" in data:
'shader_type'] if 'shader_type' in obj_data and obj_data[ add_rule(rules, "ESSL", data["essl_ext_level"], data["essl_ext_shader_type"],
'shader_type'] != 'NONE' else 'Shader::ALL' data["essl_extension"], data["essl_ext_symbol"])
data.append(symbol) if "glsl_ext_symbol" in data:
data.append(var) add_rule(rules, "GLSL", data["glsl_ext_level"], data["glsl_ext_shader_type"],
data.append(essl_version) data["glsl_extension"], data["glsl_ext_symbol"])
data.append(glsl_version)
data.append(shader_type) if "essl_ext_symbol2" in data:
add_rule(rules, "ESSL", data["essl_ext_level2"], data["essl_ext_shader_type2"],
essl_ext_symbol = obj_data[ data["essl_extension2"], data["essl_ext_symbol2"])
'essl_ext_obj'] if 'essl_ext_obj' in obj_data else 'nullptr'
essl_ext_var = '&TSymbolTableBase::{}'.format( name = data['name']
obj_data['essl_ext_var']) if 'essl_ext_var' in obj_data else 'nullptr' name_underscore = name.replace("(", "_")
essl_ext_version = get_essl_shader_version_for_level(
obj_data['essl_ext_level']) if 'essl_extension' in obj_data else '-1' self.names.append('"%s"' % name)
essl_ext_shader_type = 'Shader::' + obj_data[ self.offsets.append("%d, // %s" % (self.rule_offset, name_underscore))
'essl_ext_shader_type'] if 'essl_ext_shader_type' in obj_data and obj_data[ self.rules.append("%s" % self.format_rules(rules))
'essl_ext_shader_type'] != 'NONE' else 'Shader::ALL'
essl_extension = '&ShBuiltInResources::{}'.format( self.rule_offset += len(rules)
obj_data['essl_extension']) if 'essl_extension' in obj_data else 'nullptr'
data.append(essl_ext_symbol)
data.append(essl_ext_var)
data.append(essl_ext_version)
data.append(essl_ext_shader_type)
data.append(essl_extension)
glsl_ext_symbol = obj_data[
'glsl_ext_obj'] if 'glsl_ext_obj' in obj_data else 'nullptr'
glsl_ext_var = '&TSymbolTableBase::{}'.format(
obj_data['glsl_ext_var']) if 'glsl_ext_var' in obj_data else 'nullptr'
glsl_ext_version = get_glsl_shader_version_for_level(
obj_data['glsl_ext_level']) if 'glsl_extension' in obj_data else '-1'
glsl_ext_shader_type = 'Shader::' + obj_data[
'glsl_ext_shader_type'] if 'glsl_ext_shader_type' in obj_data and obj_data[
'glsl_ext_shader_type'] != 'NONE' else 'Shader::ALL'
glsl_extension = '&ShBuiltInResources::{}'.format(
obj_data['glsl_extension']) if 'glsl_extension' in obj_data else 'nullptr'
data.append(glsl_ext_symbol)
data.append(glsl_ext_var)
data.append(glsl_ext_version)
data.append(glsl_ext_shader_type)
data.append(glsl_extension)
if 'essl_extension2' in obj_data:
essl_ext_symbol2 = obj_data[
'essl_ext_obj2'] if 'essl_ext_obj2' in obj_data else 'nullptr'
essl_ext_var2 = '&TSymbolTableBase::{}'.format(
obj_data['essl_ext_var2']) if 'essl_ext_var2' in obj_data else 'nullptr'
essl_ext_version2 = get_essl_shader_version_for_level(
obj_data['essl_ext_level2'])
essl_ext_shader_type2 = 'Shader::' + obj_data[
'essl_ext_shader_type2'] if 'essl_ext_shader_type2' in obj_data and obj_data[
'essl_ext_shader_type2'] != 'NONE' else 'Shader::ALL'
essl_extension2 = '&ShBuiltInResources::{}'.format(obj_data['essl_extension2'])
data.append(essl_ext_symbol2)
data.append(essl_ext_var2)
data.append(essl_ext_version2)
data.append(essl_ext_shader_type2)
data.append(essl_extension2)
code.append('SymbolEntry(' + ', '.join(data) + ')')
else: else:
code.append("""SymbolEntry("", self.names.append('""')
nullptr, nullptr, -1, -1, Shader::ALL, self.offsets.append('%d, // Empty' % self.rule_offset)
nullptr, nullptr, -1, Shader::ALL, nullptr,
nullptr, nullptr, -1, Shader::ALL, nullptr)""")
return ', '.join(code)
class UnmangledGroupedList: class UnmangledGroupedList:
...@@ -832,9 +730,8 @@ class UnmangledGroupedList: ...@@ -832,9 +730,8 @@ class UnmangledGroupedList:
self.hashfn = hashfn self.hashfn = hashfn
self.num_names = num_names self.num_names = num_names
def add_obj(self, essl_level, glsl_level, shader_type, name, essl_obj, glsl_obj, def add_entry(self, essl_level, glsl_level, shader_type, name, essl_ext, glsl_ext,
essl_extension, glsl_extension, essl_unmangled_builtin_declaration, essl_extension, glsl_extension, unmangled_script_generated_hash_tests):
glsl_unmangled_builtin_declaration, unmangled_script_generated_hash_tests):
if essl_level and essl_level not in essl_levels: if essl_level and essl_level not in essl_levels:
raise Exception('Unexpected essl level: ' + str(essl_level)) raise Exception('Unexpected essl level: ' + str(essl_level))
if glsl_level and glsl_level not in glsl_levels: if glsl_level and glsl_level not in glsl_levels:
...@@ -848,12 +745,10 @@ class UnmangledGroupedList: ...@@ -848,12 +745,10 @@ class UnmangledGroupedList:
self.objs[name_hash]['essl_level'] = essl_level self.objs[name_hash]['essl_level'] = essl_level
self.objs[name_hash]['glsl_level'] = glsl_level self.objs[name_hash]['glsl_level'] = glsl_level
self.objs[name_hash]['shader_type'] = shader_type self.objs[name_hash]['shader_type'] = shader_type
self.objs[name_hash]['essl_obj'] = essl_obj self.objs[name_hash]['essl_ext'] = essl_ext
self.objs[name_hash]['glsl_obj'] = glsl_obj self.objs[name_hash]['glsl_ext'] = glsl_ext
self.objs[name_hash]['essl_extension'] = essl_extension self.objs[name_hash]['essl_extension'] = essl_extension
self.objs[name_hash]['glsl_extension'] = glsl_extension self.objs[name_hash]['glsl_extension'] = glsl_extension
self.objs[name_hash]['essl_declaration'] = essl_unmangled_builtin_declaration
self.objs[name_hash]['glsl_declaration'] = glsl_unmangled_builtin_declaration
def has_key(self, essl_level, glsl_level, shader_type, name): def has_key(self, essl_level, glsl_level, shader_type, name):
name_hash = mangledNameHash(name, self.hashfn, None, True, False) name_hash = mangledNameHash(name, self.hashfn, None, True, False)
...@@ -877,27 +772,24 @@ class UnmangledGroupedList: ...@@ -877,27 +772,24 @@ class UnmangledGroupedList:
def get_max_name_length(self): def get_max_name_length(self):
return self.max_name_length return self.max_name_length
def get_array(self, unmangled_builtin_declarations): def get_array(self):
code = [] code = []
for hash_val in range(0, self.num_names): for hash_val in range(0, self.num_names):
obj_data = self.objs[hash_val] obj = self.objs[hash_val]
essl_level = obj_data['essl_level'] essl_level = obj['essl_level']
glsl_level = obj_data['glsl_level'] glsl_level = obj['glsl_level']
shader_type = 'Shader::' + obj_data['shader_type'] if obj_data[ shader_type = 'Shader::' + obj['shader_type'] if obj[
'shader_type'] != 'NONE' else 'Shader::ALL' 'shader_type'] != 'NONE' else 'Shader::ALL'
data = [] data = []
data.append('ImmutableString("{name}")'.format(name=obj_data['name'])) data.append('"{name}"'.format(name=obj['name']))
data.append(obj_data['essl_obj']) data.append("Ext::" + obj['essl_extension'])
data.append(obj_data['glsl_obj']) data.append("Ext::" + obj['glsl_extension'])
data.append(get_essl_shader_version_for_level(essl_level)) data.append(get_essl_shader_version_for_level(essl_level))
data.append(get_glsl_shader_version_for_level(glsl_level)) data.append(get_glsl_shader_version_for_level(glsl_level))
data.append(shader_type) data.append(shader_type)
code.append('UnmangledEntry(' + ', '.join(data) + ')') code.append('{%s}' % ', '.join(data))
return code
unmangled_builtin_declarations.add(obj_data['essl_declaration'])
unmangled_builtin_declarations.add(obj_data['glsl_declaration'])
return ', '.join(code)
class TType: class TType:
...@@ -1391,11 +1283,10 @@ def gen_function_variants(function_props): ...@@ -1391,11 +1283,10 @@ def gen_function_variants(function_props):
def process_single_function_group( def process_single_function_group(
shader_type, group_name, group, parameter_declarations, name_declarations, shader_type, group_name, group, parameter_declarations, name_declarations,
unmangled_function_if_statements, unmangled_builtin_declarations, unmangled_function_if_statements, defined_function_variants, builtin_id_declarations,
defined_function_variants, builtin_id_declarations, builtin_id_definitions, builtin_id_definitions, defined_parameter_names, variable_declarations,
defined_parameter_names, variable_declarations, function_declarations, function_declarations, script_generated_hash_tests, unmangled_script_generated_hash_tests,
script_generated_hash_tests, unmangled_script_generated_hash_tests, mangled_builtins):
get_builtin_if_statements):
global id_counter global id_counter
if 'functions' not in group: if 'functions' not in group:
...@@ -1429,8 +1320,8 @@ def process_single_function_group( ...@@ -1429,8 +1320,8 @@ def process_single_function_group(
if not name_declaration in name_declarations: if not name_declaration in name_declarations:
name_declarations.add(name_declaration) name_declarations.add(name_declaration)
essl_obj = '&UnmangledBuiltIns::{essl_extension}'.format(**template_args) essl_ext = '{essl_extension}'.format(**template_args)
glsl_obj = '&UnmangledBuiltIns::{glsl_extension}'.format(**template_args) glsl_ext = '{glsl_extension}'.format(**template_args)
unmangled_builtin_no_shader_type = unmangled_function_if_statements.get( unmangled_builtin_no_shader_type = unmangled_function_if_statements.get(
essl_level, glsl_level, 'NONE', function_name) essl_level, glsl_level, 'NONE', function_name)
if unmangled_builtin_no_shader_type != None and unmangled_builtin_no_shader_type[ if unmangled_builtin_no_shader_type != None and unmangled_builtin_no_shader_type[
...@@ -1446,15 +1337,9 @@ def process_single_function_group( ...@@ -1446,15 +1337,9 @@ def process_single_function_group(
unmangled_builtin_no_shader_type['essl_extension'] != 'UNDEFINED') or unmangled_builtin_no_shader_type['essl_extension'] != 'UNDEFINED') or
(glsl_extension == 'UNDEFINED' and (glsl_extension == 'UNDEFINED' and
unmangled_builtin_no_shader_type['glsl_extension'] != 'UNDEFINED'))): unmangled_builtin_no_shader_type['glsl_extension'] != 'UNDEFINED'))):
# We don't have this unmangled builtin recorded yet or we replace an unmangled builtin from an extension with one from core. unmangled_function_if_statements.add_entry(
essl_unmangled_builtin_declaration = 'constexpr const UnmangledBuiltIn {essl_extension}(TExtension::{essl_extension});'.format( essl_level, glsl_level, shader_type, function_name, essl_ext, glsl_ext,
**template_args) essl_extension, glsl_extension, unmangled_script_generated_hash_tests)
glsl_unmangled_builtin_declaration = 'constexpr const UnmangledBuiltIn {glsl_extension}(TExtension::{glsl_extension});'.format(
**template_args)
unmangled_function_if_statements.add_obj(
essl_level, glsl_level, shader_type, function_name, essl_obj, glsl_obj,
essl_extension, glsl_extension, essl_unmangled_builtin_declaration,
glsl_unmangled_builtin_declaration, unmangled_script_generated_hash_tests)
for function_props in function_variants: for function_props in function_variants:
template_args['id'] = id_counter template_args['id'] = id_counter
...@@ -1470,9 +1355,9 @@ def process_single_function_group( ...@@ -1470,9 +1355,9 @@ def process_single_function_group(
template_args['name_with_suffix'], parameters) template_args['name_with_suffix'], parameters)
template_args['mangled_name_length'] = len(template_args['mangled_name']) template_args['mangled_name_length'] = len(template_args['mangled_name'])
obj = '&BuiltInFunction::{unique_name}'.format(**template_args) symbol = '&Func::{unique_name}'.format(**template_args)
get_builtin_if_statements.add_obj( mangled_builtins.add_entry(
essl_level, glsl_level, shader_type, template_args['mangled_name'], obj, essl_level, glsl_level, shader_type, template_args['mangled_name'], symbol,
template_args['essl_extension'], template_args['glsl_extension'], template_args['essl_extension'], template_args['glsl_extension'],
script_generated_hash_tests) script_generated_hash_tests)
...@@ -1526,12 +1411,11 @@ def process_single_function_group( ...@@ -1526,12 +1411,11 @@ def process_single_function_group(
def process_function_group(group_name, group, parameter_declarations, name_declarations, def process_function_group(group_name, group, parameter_declarations, name_declarations,
unmangled_function_if_statements, unmangled_builtin_declarations, unmangled_function_if_statements, defined_function_variants,
defined_function_variants, builtin_id_declarations, builtin_id_declarations, builtin_id_definitions,
builtin_id_definitions, defined_parameter_names, variable_declarations, defined_parameter_names, variable_declarations, function_declarations,
function_declarations, script_generated_hash_tests, script_generated_hash_tests, unmangled_script_generated_hash_tests,
unmangled_script_generated_hash_tests, get_builtin_if_statements, mangled_builtins, is_in_group_definitions):
is_in_group_definitions):
global id_counter global id_counter
first_id = id_counter first_id = id_counter
...@@ -1539,23 +1423,21 @@ def process_function_group(group_name, group, parameter_declarations, name_decla ...@@ -1539,23 +1423,21 @@ def process_function_group(group_name, group, parameter_declarations, name_decla
if 'shader_type' in group: if 'shader_type' in group:
shader_type = group['shader_type'] shader_type = group['shader_type']
process_single_function_group(shader_type, group_name, group, parameter_declarations, process_single_function_group(
name_declarations, unmangled_function_if_statements, shader_type, group_name, group, parameter_declarations, name_declarations,
unmangled_builtin_declarations, defined_function_variants, unmangled_function_if_statements, defined_function_variants, builtin_id_declarations,
builtin_id_declarations, builtin_id_definitions, builtin_id_definitions, defined_parameter_names, variable_declarations,
defined_parameter_names, variable_declarations, function_declarations, script_generated_hash_tests, unmangled_script_generated_hash_tests,
function_declarations, script_generated_hash_tests, mangled_builtins)
unmangled_script_generated_hash_tests, get_builtin_if_statements)
if 'subgroups' in group: if 'subgroups' in group:
for subgroup_name, subgroup in group['subgroups'].iteritems(): for subgroup_name, subgroup in group['subgroups'].iteritems():
process_function_group( process_function_group(
group_name + subgroup_name, subgroup, parameter_declarations, name_declarations, group_name + subgroup_name, subgroup, parameter_declarations, name_declarations,
unmangled_function_if_statements, unmangled_builtin_declarations, unmangled_function_if_statements, defined_function_variants,
defined_function_variants, builtin_id_declarations, builtin_id_definitions, builtin_id_declarations, builtin_id_definitions, defined_parameter_names,
defined_parameter_names, variable_declarations, function_declarations, variable_declarations, function_declarations, script_generated_hash_tests,
script_generated_hash_tests, unmangled_script_generated_hash_tests, unmangled_script_generated_hash_tests, mangled_builtins, is_in_group_definitions)
get_builtin_if_statements, is_in_group_definitions)
if 'queryFunction' in group: if 'queryFunction' in group:
template_args = {'first_id': first_id, 'last_id': id_counter - 1, 'group_name': group_name} template_args = {'first_id': first_id, 'last_id': id_counter - 1, 'group_name': group_name}
...@@ -1595,7 +1477,7 @@ def prune_parameters_arrays(parameter_declarations, function_declarations): ...@@ -1595,7 +1477,7 @@ def prune_parameters_arrays(parameter_declarations, function_declarations):
def process_single_variable_group(shader_type, group_name, group, builtin_id_declarations, def process_single_variable_group(shader_type, group_name, group, builtin_id_declarations,
builtin_id_definitions, name_declarations, init_member_variables, builtin_id_definitions, name_declarations, init_member_variables,
get_variable_declarations, get_builtin_if_statements, get_variable_declarations, mangled_builtins,
declare_member_variables, variable_declarations, declare_member_variables, variable_declarations,
get_variable_definitions, script_generated_hash_tests): get_variable_definitions, script_generated_hash_tests):
global id_counter global id_counter
...@@ -1722,7 +1604,7 @@ def process_single_variable_group(shader_type, group_name, group, builtin_id_dec ...@@ -1722,7 +1604,7 @@ def process_single_variable_group(shader_type, group_name, group, builtin_id_dec
if essl_level != 'GLSL_BUILTINS': if essl_level != 'GLSL_BUILTINS':
obj = '&BuiltInVariable::k{name_with_suffix}'.format(**template_args) obj = '&BuiltInVariable::k{name_with_suffix}'.format(**template_args)
# TODO(http://anglebug.com/3835): Add GLSL level once GLSL built-in vars are added # TODO(http://anglebug.com/3835): Add GLSL level once GLSL built-in vars are added
get_builtin_if_statements.add_obj( mangled_builtins.add_entry(
essl_level, 'COMMON_BUILTINS', shader_type, template_args['name'], obj, essl_level, 'COMMON_BUILTINS', shader_type, template_args['name'], obj,
template_args['essl_extension'], template_args['glsl_extension'], template_args['essl_extension'], template_args['glsl_extension'],
script_generated_hash_tests) script_generated_hash_tests)
...@@ -1737,19 +1619,19 @@ def process_single_variable_group(shader_type, group_name, group, builtin_id_dec ...@@ -1737,19 +1619,19 @@ def process_single_variable_group(shader_type, group_name, group, builtin_id_dec
obj = 'm_{name_with_suffix}'.format(**template_args) obj = 'm_{name_with_suffix}'.format(**template_args)
# TODO(http://anglebug.com/3835): Add GLSL level once GLSL built-in vars are added # TODO(http://anglebug.com/3835): Add GLSL level once GLSL built-in vars are added
get_builtin_if_statements.add_obj( mangled_builtins.add_entry(essl_level, 'COMMON_BUILTINS', shader_type,
essl_level, 'COMMON_BUILTINS', shader_type, template_args['name'], obj, template_args['name'], obj, template_args['essl_extension'],
template_args['essl_extension'], template_args['glsl_extension'], template_args['glsl_extension'],
script_generated_hash_tests, True) script_generated_hash_tests)
id_counter += 1 id_counter += 1
def process_variable_group(shader_type, group_name, group, builtin_id_declarations, def process_variable_group(shader_type, group_name, group, builtin_id_declarations,
builtin_id_definitions, name_declarations, init_member_variables, builtin_id_definitions, name_declarations, init_member_variables,
get_variable_declarations, get_builtin_if_statements, get_variable_declarations, mangled_builtins, declare_member_variables,
declare_member_variables, variable_declarations, variable_declarations, get_variable_definitions,
get_variable_definitions, script_generated_hash_tests): script_generated_hash_tests):
global id_counter global id_counter
if 'shader_type' in group: if 'shader_type' in group:
...@@ -1757,7 +1639,7 @@ def process_variable_group(shader_type, group_name, group, builtin_id_declaratio ...@@ -1757,7 +1639,7 @@ def process_variable_group(shader_type, group_name, group, builtin_id_declaratio
process_single_variable_group(shader_type, group_name, group, builtin_id_declarations, process_single_variable_group(shader_type, group_name, group, builtin_id_declarations,
builtin_id_definitions, name_declarations, init_member_variables, builtin_id_definitions, name_declarations, init_member_variables,
get_variable_declarations, get_builtin_if_statements, get_variable_declarations, mangled_builtins,
declare_member_variables, variable_declarations, declare_member_variables, variable_declarations,
get_variable_definitions, script_generated_hash_tests) get_variable_definitions, script_generated_hash_tests)
...@@ -1766,7 +1648,7 @@ def process_variable_group(shader_type, group_name, group, builtin_id_declaratio ...@@ -1766,7 +1648,7 @@ def process_variable_group(shader_type, group_name, group, builtin_id_declaratio
process_variable_group( process_variable_group(
shader_type, subgroup_name, subgroup, builtin_id_declarations, shader_type, subgroup_name, subgroup, builtin_id_declarations,
builtin_id_definitions, name_declarations, init_member_variables, builtin_id_definitions, name_declarations, init_member_variables,
get_variable_declarations, get_builtin_if_statements, declare_member_variables, get_variable_declarations, mangled_builtins, declare_member_variables,
variable_declarations, get_variable_definitions, script_generated_hash_tests) variable_declarations, get_variable_definitions, script_generated_hash_tests)
...@@ -1797,9 +1679,6 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen ...@@ -1797,9 +1679,6 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen
declare_member_variables = [] declare_member_variables = []
init_member_variables = [] init_member_variables = []
# Declarations of UnmangledBuiltIn objects
unmangled_builtin_declarations = set()
# Code for testing that script-generated hashes match with runtime computed hashes. # Code for testing that script-generated hashes match with runtime computed hashes.
script_generated_hash_tests = OrderedDict() script_generated_hash_tests = OrderedDict()
unmangled_script_generated_hash_tests = OrderedDict() unmangled_script_generated_hash_tests = OrderedDict()
...@@ -1852,7 +1731,7 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen ...@@ -1852,7 +1731,7 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen
mangled_S1 = f1.salt mangled_S1 = f1.salt
mangled_S2 = f2.salt mangled_S2 = f2.salt
# Array for querying mangled builtins # Array for querying mangled builtins
get_builtin_if_statements = GroupedList(mangled_hashfn, num_mangled_names) mangled_builtins = GroupedList(mangled_hashfn, num_mangled_names)
# Hashing unmangled names # Hashing unmangled names
unmangled_names = list(dict.fromkeys(unmangled_names)) unmangled_names = list(dict.fromkeys(unmangled_names))
...@@ -1867,23 +1746,24 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen ...@@ -1867,23 +1746,24 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen
unmangled_function_if_statements = UnmangledGroupedList(unmangled_hashfn, num_unmangled_names) unmangled_function_if_statements = UnmangledGroupedList(unmangled_hashfn, num_unmangled_names)
for group_name, group in parsed_functions.iteritems(): for group_name, group in parsed_functions.iteritems():
process_function_group(group_name, group, parameter_declarations, name_declarations, process_function_group(
unmangled_function_if_statements, unmangled_builtin_declarations, group_name, group, parameter_declarations, name_declarations,
defined_function_variants, builtin_id_declarations, unmangled_function_if_statements, defined_function_variants, builtin_id_declarations,
builtin_id_definitions, defined_parameter_names, builtin_id_definitions, defined_parameter_names, variable_declarations,
variable_declarations, function_declarations, function_declarations, script_generated_hash_tests,
script_generated_hash_tests, unmangled_script_generated_hash_tests, unmangled_script_generated_hash_tests, mangled_builtins, is_in_group_definitions)
get_builtin_if_statements, is_in_group_definitions)
parameter_declarations = prune_parameters_arrays(parameter_declarations, function_declarations) parameter_declarations = prune_parameters_arrays(parameter_declarations, function_declarations)
for group_name, group in parsed_variables.iteritems(): for group_name, group in parsed_variables.iteritems():
process_variable_group('NONE', group_name, group, builtin_id_declarations, process_variable_group('NONE', group_name, group, builtin_id_declarations,
builtin_id_definitions, name_declarations, init_member_variables, builtin_id_definitions, name_declarations, init_member_variables,
get_variable_declarations, get_builtin_if_statements, get_variable_declarations, mangled_builtins,
declare_member_variables, variable_declarations, declare_member_variables, variable_declarations,
get_variable_definitions, script_generated_hash_tests) get_variable_definitions, script_generated_hash_tests)
mangled_builtins.update_arrays()
output_strings = { output_strings = {
'script_name': 'script_name':
os.path.basename(__file__), os.path.basename(__file__),
...@@ -1917,20 +1797,22 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen ...@@ -1917,20 +1797,22 @@ def generate_files(essl_only, args, functions_txt_filename, variables_json_filen
'\n'.join(declare_member_variables), '\n'.join(declare_member_variables),
'init_member_variables': 'init_member_variables':
'\n'.join(init_member_variables), '\n'.join(init_member_variables),
'mangled_array': 'mangled_names_array':
get_builtin_if_statements.get_array(), ',\n'.join(mangled_builtins.get_names()),
'mangled_offsets_array':
'\n'.join(mangled_builtins.get_offsets()),
'mangled_rules':
',\n'.join(mangled_builtins.get_rules()),
'unmangled_array': 'unmangled_array':
unmangled_function_if_statements.get_array(unmangled_builtin_declarations), ', '.join(unmangled_function_if_statements.get_array()),
'max_unmangled_name_length': 'max_unmangled_name_length':
unmangled_function_if_statements.get_max_name_length(), unmangled_function_if_statements.get_max_name_length(),
'max_mangled_name_length': 'max_mangled_name_length':
get_builtin_if_statements.get_max_name_length(), mangled_builtins.get_max_name_length(),
'num_unmangled_names': 'num_unmangled_names':
num_unmangled_names, num_unmangled_names,
'num_mangled_names': 'num_mangled_names':
num_mangled_names, num_mangled_names,
'unmangled_builtin_declarations':
'\n'.join(sorted(unmangled_builtin_declarations)),
'script_generated_hash_tests': 'script_generated_hash_tests':
'\n'.join(script_generated_hash_tests.iterkeys()), '\n'.join(script_generated_hash_tests.iterkeys()),
'unmangled_script_generated_hash_tests': 'unmangled_script_generated_hash_tests':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment