Hash :
719165c8
Author :
Date :
2023-08-04T12:13:37
Remove "const UniformTypeInfo *typeInfo" from struct LinkedUniform This is a cached pointer to the const kInfoTable. There isn't much of performance benefit to cache here compare to directly retrieve from the table. This cached pointer is removed in this CL, which means we do not need to update the pointer in the ProgramExecutable::load(). This and a few earlier CLs that attempt to do memcpy for entire mUniforms reduced average frame time of blade_and_soul_revolution app trace 3%, from 4.3359 ms to 4.2066ms on pixel 7 pro. Bug: b/275102061 Change-Id: I6fd34d665234e3a5cc85344924049bf5b13aaa80 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4753933 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Charlie Lao <cclao@google.com> Reviewed-by: Yuxin Hu <yuxinhu@google.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
//
// Copyright 2010 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.
//
#include "libANGLE/Uniform.h"
#include "common/BinaryStream.h"
#include "libANGLE/ProgramLinkedResources.h"
#include <cstring>
namespace gl
{
ActiveVariable::ActiveVariable()
{
std::fill(mIds.begin(), mIds.end(), 0);
}
ActiveVariable::~ActiveVariable() {}
ActiveVariable::ActiveVariable(const ActiveVariable &rhs) = default;
ActiveVariable &ActiveVariable::operator=(const ActiveVariable &rhs) = default;
void ActiveVariable::setActive(ShaderType shaderType, bool used, uint32_t id)
{
ASSERT(shaderType != ShaderType::InvalidEnum);
mActiveUseBits.set(shaderType, used);
mIds[shaderType] = id;
}
void ActiveVariable::unionReferencesWith(const ActiveVariable &other)
{
mActiveUseBits |= other.mActiveUseBits;
for (const ShaderType shaderType : AllShaderTypes())
{
ASSERT(mIds[shaderType] == 0 || other.mIds[shaderType] == 0 ||
mIds[shaderType] == other.mIds[shaderType]);
if (mIds[shaderType] == 0)
{
mIds[shaderType] = other.mIds[shaderType];
}
}
}
LinkedUniform::LinkedUniform() {}
LinkedUniform::LinkedUniform(GLenum typeIn,
GLenum precisionIn,
const std::vector<unsigned int> &arraySizesIn,
const int bindingIn,
const int offsetIn,
const int locationIn,
const int bufferIndexIn,
const sh::BlockMemberInfo &blockInfoIn)
{
// Note: Ensure every data member is initialized.
type = typeIn;
precision = precisionIn;
imageUnitFormat = GL_NONE;
location = locationIn;
binding = bindingIn;
offset = offsetIn;
bufferIndex = bufferIndexIn;
blockInfo = blockInfoIn;
id = 0;
flattenedOffsetInParentArrays = -1;
outerArraySizeProduct = 1;
outerArrayOffset = 0;
arraySize = arraySizesIn.empty() ? 1 : arraySizesIn[0];
flagBitsAsUInt = 0;
flagBits.isArray = !arraySizesIn.empty();
ASSERT(arraySizesIn.size() <= 1);
}
LinkedUniform::LinkedUniform(const LinkedUniform &other)
{
memcpy(this, &other, sizeof(LinkedUniform));
}
LinkedUniform::LinkedUniform(const UsedUniform &usedUniform)
{
ASSERT(!usedUniform.isArrayOfArrays());
ASSERT(!usedUniform.isStruct());
ASSERT(usedUniform.active);
// Note: Ensure every data member is initialized.
type = usedUniform.type;
precision = usedUniform.precision;
imageUnitFormat = usedUniform.imageUnitFormat;
location = usedUniform.location;
binding = usedUniform.binding;
offset = usedUniform.offset;
bufferIndex = usedUniform.bufferIndex;
blockInfo = usedUniform.blockInfo;
id = usedUniform.id;
flattenedOffsetInParentArrays = usedUniform.getFlattenedOffsetInParentArrays();
outerArraySizeProduct = ArraySizeProduct(usedUniform.outerArraySizes);
outerArrayOffset = usedUniform.outerArrayOffset;
arraySize = usedUniform.isArray() ? usedUniform.getArraySizeProduct() : 1u;
activeVariable = usedUniform.activeVariable;
flagBitsAsUInt = 0;
flagBits.isFragmentInOut = usedUniform.isFragmentInOut;
flagBits.texelFetchStaticUse = usedUniform.texelFetchStaticUse;
flagBits.isArray = usedUniform.isArray();
}
LinkedUniform::~LinkedUniform() {}
BufferVariable::BufferVariable()
: bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo), topLevelArraySize(-1)
{}
BufferVariable::BufferVariable(GLenum typeIn,
GLenum precisionIn,
const std::string &nameIn,
const std::vector<unsigned int> &arraySizesIn,
const int bufferIndexIn,
const sh::BlockMemberInfo &blockInfoIn)
: bufferIndex(bufferIndexIn), blockInfo(blockInfoIn), topLevelArraySize(-1)
{
type = typeIn;
precision = precisionIn;
name = nameIn;
arraySizes = arraySizesIn;
}
BufferVariable::~BufferVariable() {}
ShaderVariableBuffer::ShaderVariableBuffer() : binding(0), dataSize(0) {}
ShaderVariableBuffer::ShaderVariableBuffer(const ShaderVariableBuffer &other) = default;
ShaderVariableBuffer::~ShaderVariableBuffer() {}
int ShaderVariableBuffer::numActiveVariables() const
{
return static_cast<int>(memberIndexes.size());
}
InterfaceBlock::InterfaceBlock() : isArray(false), isReadOnly(false), arrayElement(0) {}
InterfaceBlock::InterfaceBlock(const std::string &nameIn,
const std::string &mappedNameIn,
bool isArrayIn,
bool isReadOnlyIn,
unsigned int arrayElementIn,
unsigned int firstFieldArraySizeIn,
int bindingIn)
: name(nameIn),
mappedName(mappedNameIn),
isArray(isArrayIn),
isReadOnly(isReadOnlyIn),
arrayElement(arrayElementIn),
firstFieldArraySize(firstFieldArraySizeIn)
{
binding = bindingIn;
}
InterfaceBlock::InterfaceBlock(const InterfaceBlock &other) = default;
std::string InterfaceBlock::nameWithArrayIndex() const
{
std::stringstream fullNameStr;
fullNameStr << name;
if (isArray)
{
fullNameStr << "[" << arrayElement << "]";
}
return fullNameStr.str();
}
std::string InterfaceBlock::mappedNameWithArrayIndex() const
{
std::stringstream fullNameStr;
fullNameStr << mappedName;
if (isArray)
{
fullNameStr << "[" << arrayElement << "]";
}
return fullNameStr.str();
}
} // namespace gl