Hash :
8fcd4a50
Author :
Date :
2023-09-19T14:08:14
Cleanup POD struct usage to make them more consistent In recent months, I have made many CLs to wrap various data structures into a trivially copy-able struct. Some of them uses different terminology. This CL replaces all of these to use a consistent name "pod" in the struct, and "mPod" in a class. This CL also turns ActiveVariable methods into macros to remove the code duplication. This CL also moves ProgramInput/ProgramOutput struct implementations from Program.cpp to ProgramExecutable.cpp Bug: b/275102061 Change-Id: Ia2a4210a9ea633f3d323bebe674ee74f8b90b363 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4877335 Commit-Queue: Charlie Lao <cclao@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Roman Lavrov <romanl@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 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 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254
//
// Copyright 2021 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.
//
// ShaderInterfaceVariableInfoMap: Maps shader interface variable SPIR-V ids to their Vulkan
// mapping.
//
#include "libANGLE/renderer/vulkan/ShaderInterfaceVariableInfoMap.h"
namespace rx
{
namespace
{
uint32_t HashSPIRVId(uint32_t id)
{
ASSERT(id >= sh::vk::spirv::kIdShaderVariablesBegin);
return id - sh::vk::spirv::kIdShaderVariablesBegin;
}
void LoadShaderInterfaceVariableXfbInfo(gl::BinaryInputStream *stream,
ShaderInterfaceVariableXfbInfo *xfb)
{
stream->readStruct(&xfb->pod);
xfb->arrayElements.resize(stream->readInt<size_t>());
for (ShaderInterfaceVariableXfbInfo &arrayElement : xfb->arrayElements)
{
LoadShaderInterfaceVariableXfbInfo(stream, &arrayElement);
}
}
void SaveShaderInterfaceVariableXfbInfo(const ShaderInterfaceVariableXfbInfo &xfb,
gl::BinaryOutputStream *stream)
{
stream->writeStruct(xfb.pod);
stream->writeInt(xfb.arrayElements.size());
for (const ShaderInterfaceVariableXfbInfo &arrayElement : xfb.arrayElements)
{
SaveShaderInterfaceVariableXfbInfo(arrayElement, stream);
}
}
} // anonymous namespace
// ShaderInterfaceVariableInfoMap implementation.
ShaderInterfaceVariableInfoMap::ShaderInterfaceVariableInfoMap() = default;
ShaderInterfaceVariableInfoMap::~ShaderInterfaceVariableInfoMap() = default;
void ShaderInterfaceVariableInfoMap::clear()
{
mData.clear();
mXFBData.clear();
memset(&mPod, 0, sizeof(mPod));
for (gl::ShaderType shaderType : gl::AllShaderTypes())
{
mIdToIndexMap[shaderType].clear();
}
}
void ShaderInterfaceVariableInfoMap::save(gl::BinaryOutputStream *stream)
{
ASSERT(mXFBData.size() <= mData.size());
stream->writeStruct(mPod);
for (const IdToIndexMap &idToIndexMap : mIdToIndexMap)
{
stream->writeInt(idToIndexMap.size());
if (idToIndexMap.size() > 0)
{
stream->writeBytes(reinterpret_cast<const uint8_t *>(idToIndexMap.data()),
idToIndexMap.size() * sizeof(*idToIndexMap.data()));
}
}
stream->writeVector(mData);
if (mPod.xfbInfoCount > 0)
{
uint32_t xfbInfoCount = 0;
for (size_t xfbIndex = 0; xfbIndex < mXFBData.size(); xfbIndex++)
{
if (!mXFBData[xfbIndex])
{
continue;
}
stream->writeInt(xfbIndex);
xfbInfoCount++;
XFBInterfaceVariableInfo &info = *mXFBData[xfbIndex];
SaveShaderInterfaceVariableXfbInfo(info.xfb, stream);
stream->writeInt(info.fieldXfb.size());
for (const ShaderInterfaceVariableXfbInfo &xfb : info.fieldXfb)
{
SaveShaderInterfaceVariableXfbInfo(xfb, stream);
}
}
ASSERT(xfbInfoCount == mPod.xfbInfoCount);
}
}
void ShaderInterfaceVariableInfoMap::load(gl::BinaryInputStream *stream)
{
stream->readStruct(&mPod);
for (IdToIndexMap &idToIndexMap : mIdToIndexMap)
{
// ASSERT(idToIndexMap.empty());
size_t count = stream->readInt<size_t>();
if (count > 0)
{
idToIndexMap.resetWithRawData(count,
stream->getBytes(count * sizeof(*idToIndexMap.data())));
}
}
stream->readVector(&mData);
ASSERT(mXFBData.empty());
ASSERT(mPod.xfbInfoCount <= mData.size());
if (mPod.xfbInfoCount > 0)
{
mXFBData.resize(mData.size());
for (uint32_t i = 0; i < mPod.xfbInfoCount; ++i)
{
size_t xfbIndex = stream->readInt<size_t>();
mXFBData[xfbIndex] = std::make_unique<XFBInterfaceVariableInfo>();
XFBInterfaceVariableInfo &info = *mXFBData[xfbIndex];
LoadShaderInterfaceVariableXfbInfo(stream, &info.xfb);
info.fieldXfb.resize(stream->readInt<size_t>());
for (ShaderInterfaceVariableXfbInfo &xfb : info.fieldXfb)
{
LoadShaderInterfaceVariableXfbInfo(stream, &xfb);
}
}
}
}
void ShaderInterfaceVariableInfoMap::setInputPerVertexActiveMembers(
gl::ShaderType shaderType,
gl::PerVertexMemberBitSet activeMembers)
{
// Input gl_PerVertex is only meaningful for tessellation and geometry stages
ASSERT(shaderType == gl::ShaderType::TessControl ||
shaderType == gl::ShaderType::TessEvaluation || shaderType == gl::ShaderType::Geometry ||
activeMembers.none());
mPod.inputPerVertexActiveMembers[shaderType] = activeMembers;
}
void ShaderInterfaceVariableInfoMap::setOutputPerVertexActiveMembers(
gl::ShaderType shaderType,
gl::PerVertexMemberBitSet activeMembers)
{
// Output gl_PerVertex is only meaningful for vertex, tessellation and geometry stages
ASSERT(shaderType == gl::ShaderType::Vertex || shaderType == gl::ShaderType::TessControl ||
shaderType == gl::ShaderType::TessEvaluation || shaderType == gl::ShaderType::Geometry ||
activeMembers.none());
mPod.outputPerVertexActiveMembers[shaderType] = activeMembers;
}
void ShaderInterfaceVariableInfoMap::setVariableIndex(gl::ShaderType shaderType,
uint32_t id,
VariableIndex index)
{
mIdToIndexMap[shaderType][HashSPIRVId(id)] = index;
}
const VariableIndex &ShaderInterfaceVariableInfoMap::getVariableIndex(gl::ShaderType shaderType,
uint32_t id) const
{
return mIdToIndexMap[shaderType].at(HashSPIRVId(id));
}
ShaderInterfaceVariableInfo &ShaderInterfaceVariableInfoMap::getMutable(gl::ShaderType shaderType,
uint32_t id)
{
ASSERT(hasVariable(shaderType, id));
uint32_t index = getVariableIndex(shaderType, id).index;
return mData[index];
}
XFBInterfaceVariableInfo *ShaderInterfaceVariableInfoMap::getXFBMutable(gl::ShaderType shaderType,
uint32_t id)
{
ASSERT(hasVariable(shaderType, id));
uint32_t index = getVariableIndex(shaderType, id).index;
if (index >= mXFBData.size())
{
mXFBData.resize(index + 1);
}
if (!mXFBData[index])
{
mXFBData[index] = std::make_unique<XFBInterfaceVariableInfo>();
mData[index].hasTransformFeedback = true;
mPod.xfbInfoCount++;
}
return mXFBData[index].get();
}
ShaderInterfaceVariableInfo &ShaderInterfaceVariableInfoMap::add(gl::ShaderType shaderType,
uint32_t id)
{
ASSERT(!hasVariable(shaderType, id));
uint32_t index = static_cast<uint32_t>(mData.size());
setVariableIndex(shaderType, id, {index});
mData.resize(index + 1);
return mData[index];
}
void ShaderInterfaceVariableInfoMap::addResource(gl::ShaderBitSet shaderTypes,
const gl::ShaderMap<uint32_t> &idInShaderTypes,
uint32_t descriptorSet,
uint32_t binding)
{
uint32_t index = static_cast<uint32_t>(mData.size());
mData.resize(index + 1);
ShaderInterfaceVariableInfo *info = &mData[index];
info->descriptorSet = descriptorSet;
info->binding = binding;
info->activeStages = shaderTypes;
for (const gl::ShaderType shaderType : shaderTypes)
{
const uint32_t id = idInShaderTypes[shaderType];
ASSERT(!hasVariable(shaderType, id));
setVariableIndex(shaderType, id, {index});
}
}
ShaderInterfaceVariableInfo &ShaderInterfaceVariableInfoMap::addOrGet(gl::ShaderType shaderType,
uint32_t id)
{
if (!hasVariable(shaderType, id))
{
return add(shaderType, id);
}
else
{
uint32_t index = getVariableIndex(shaderType, id).index;
return mData[index];
}
}
bool ShaderInterfaceVariableInfoMap::hasVariable(gl::ShaderType shaderType, uint32_t id) const
{
const uint32_t hashedId = HashSPIRVId(id);
return hashedId < mIdToIndexMap[shaderType].size() &&
mIdToIndexMap[shaderType].at(hashedId).index != VariableIndex::kInvalid;
}
bool ShaderInterfaceVariableInfoMap::hasTransformFeedbackInfo(gl::ShaderType shaderType,
uint32_t bufferIndex) const
{
return hasVariable(shaderType, SpvGetXfbBufferBlockId(bufferIndex));
}
} // namespace rx