Skip to content

A
angle
Commit 80943776 by Shahbaz Youssefi Committed by Commit Bot
Options

Refactor TType's constructors

Instead of duplicating the initialization of every field, use one of the constructors to initialize the other ones. Bug: angleproject:3569 Change-Id: Ie342111218235ecb4124deb2f0147f97cdbed51a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1972889Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent f5c3afec
Showing with 16 additions and 89 deletions
src/compiler/translator/Types.cpp
...@@ -123,55 +123,14 @@ const char *getBasicString(TBasicType t) ...@@ -123,55 +123,14 @@ const char *getBasicString(TBasicType t)
} }
// TType implementation. // TType implementation.
TType::TType() TType::TType() : TType(EbtVoid, 0, 0) {}
: type(EbtVoid),
precision(EbpUndefined),
qualifier(EvqGlobal),
invariant(false),
precise(false),
memoryQualifier(TMemoryQualifier::Create()),
layoutQualifier(TLayoutQualifier::Create()),
primarySize(0),
secondarySize(0),
mArraySizes(nullptr),
mInterfaceBlock(nullptr),
mStructure(nullptr),
mIsStructSpecifier(false),
mMangledName(nullptr)
{}
TType::TType(TBasicType t, unsigned char ps, unsigned char ss) TType::TType(TBasicType t, unsigned char ps, unsigned char ss)
: type(t), : TType(t, EbpUndefined, EvqGlobal, ps, ss)
precision(EbpUndefined),
qualifier(EvqGlobal),
invariant(false),
precise(false),
memoryQualifier(TMemoryQualifier::Create()),
layoutQualifier(TLayoutQualifier::Create()),
primarySize(ps),
secondarySize(ss),
mArraySizes(nullptr),
mInterfaceBlock(nullptr),
mStructure(nullptr),
mIsStructSpecifier(false),
mMangledName(nullptr)
{} {}
TType::TType(TBasicType t, TPrecision p, TQualifier q, unsigned char ps, unsigned char ss) TType::TType(TBasicType t, TPrecision p, TQualifier q, unsigned char ps, unsigned char ss)
: type(t), : TType(t, p, q, ps, ss, nullptr)
precision(p),
qualifier(q),
invariant(false),
precise(false),
memoryQualifier(TMemoryQualifier::Create()),
layoutQualifier(TLayoutQualifier::Create()),
primarySize(ps),
secondarySize(ss),
mArraySizes(nullptr),
mInterfaceBlock(nullptr),
mStructure(nullptr),
mIsStructSpecifier(false),
mMangledName(nullptr)
{} {}
TType::TType(const TPublicType &p) TType::TType(const TPublicType &p)
...@@ -204,57 +163,25 @@ TType::TType(const TPublicType &p) ...@@ -204,57 +163,25 @@ TType::TType(const TPublicType &p)
} }
TType::TType(const TStructure *userDef, bool isStructSpecifier) TType::TType(const TStructure *userDef, bool isStructSpecifier)
: type(EbtStruct), : TType(EbtStruct, EbpUndefined, EvqTemporary, 1, 1)
precision(EbpUndefined), {
qualifier(EvqTemporary), mStructure = userDef;
invariant(false), mIsStructSpecifier = isStructSpecifier;
precise(false), }
memoryQualifier(TMemoryQualifier::Create()),
layoutQualifier(TLayoutQualifier::Create()),
primarySize(1),
secondarySize(1),
mArraySizes(nullptr),
mInterfaceBlock(nullptr),
mStructure(userDef),
mIsStructSpecifier(isStructSpecifier),
mMangledName(nullptr)
{}
TType::TType(const TInterfaceBlock *interfaceBlockIn, TType::TType(const TInterfaceBlock *interfaceBlockIn,
TQualifier qualifierIn, TQualifier qualifierIn,
TLayoutQualifier layoutQualifierIn) TLayoutQualifier layoutQualifierIn)
: type(EbtInterfaceBlock), : TType(EbtInterfaceBlock, EbpUndefined, qualifierIn, 1, 1)
precision(EbpUndefined), {
qualifier(qualifierIn), layoutQualifier = layoutQualifierIn;
invariant(false), mInterfaceBlock = interfaceBlockIn;
precise(false), }
memoryQualifier(TMemoryQualifier::Create()),
layoutQualifier(layoutQualifierIn),
primarySize(1),
secondarySize(1),
mArraySizes(nullptr),
mInterfaceBlock(interfaceBlockIn),
mStructure(0),
mIsStructSpecifier(false),
mMangledName(nullptr)
{}
TType::TType(const TType &t) TType::TType(const TType &t)
: type(t.type), {
precision(t.precision), *this = t;
qualifier(t.qualifier), }
invariant(t.invariant),
precise(t.precise),
memoryQualifier(t.memoryQualifier),
layoutQualifier(t.layoutQualifier),
primarySize(t.primarySize),
secondarySize(t.secondarySize),
mArraySizes(t.mArraySizes ? new TVector<unsigned int>(*t.mArraySizes) : nullptr),
mInterfaceBlock(t.mInterfaceBlock),
mStructure(t.mStructure),
mIsStructSpecifier(t.mIsStructSpecifier),
mMangledName(t.mMangledName)
{}
TType &TType::operator=(const TType &t) TType &TType::operator=(const TType &t)
{ {
......
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