Hash :
57761d85
Author :
Date :
2023-09-08T10:02:48
Attempt to fix the MSan failure on chromium bots struct BlockMemberInfo was not tightly packed. This CL makes it packed. Bug: b/296433003 Change-Id: I38da3e463cf304028236e651b6b4e334ce9220e2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4851063 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Charlie Lao <cclao@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 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365
//
// Copyright 2013 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.
//
// blocklayout.h:
// Methods and classes related to uniform layout and packing in GLSL and HLSL.
//
#ifndef COMMON_BLOCKLAYOUT_H_
#define COMMON_BLOCKLAYOUT_H_
#include <cstddef>
#include <map>
#include <vector>
#include <GLSLANG/ShaderLang.h>
#include "angle_gl.h"
namespace sh
{
struct ShaderVariable;
struct InterfaceBlock;
struct BlockMemberInfo
{
constexpr BlockMemberInfo() = default;
// This constructor is used by the HLSL backend
constexpr BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
: type(GL_INVALID_ENUM),
isRowMajorMatrix(isRowMajorMatrix),
offset(offset),
arrayStride(arrayStride),
matrixStride(matrixStride),
arraySize(-1)
{}
constexpr BlockMemberInfo(int offset,
int arrayStride,
int matrixStride,
bool isRowMajorMatrix,
int topLevelArrayStride)
: type(GL_INVALID_ENUM),
isRowMajorMatrix(isRowMajorMatrix),
offset(offset),
arrayStride(arrayStride),
matrixStride(matrixStride),
arraySize(-1),
topLevelArrayStride(topLevelArrayStride)
{}
constexpr BlockMemberInfo(GLenum type,
int offset,
int arrayStride,
int matrixStride,
int arraySize,
bool isRowMajorMatrix)
: type(static_cast<uint16_t>(type)),
isRowMajorMatrix(isRowMajorMatrix),
offset(offset),
arrayStride(arrayStride),
matrixStride(matrixStride),
arraySize(arraySize)
{}
constexpr BlockMemberInfo(GLenum type,
int offset,
int arrayStride,
int matrixStride,
int arraySize,
bool isRowMajorMatrix,
int topLevelArrayStride)
: type(static_cast<uint16_t>(type)),
isRowMajorMatrix(isRowMajorMatrix),
offset(offset),
arrayStride(arrayStride),
matrixStride(matrixStride),
arraySize(arraySize),
topLevelArrayStride(topLevelArrayStride)
{}
uint16_t type = GL_INVALID_ENUM;
// A single integer identifying whether an active variable is a row-major matrix.
uint8_t isRowMajorMatrix = false;
uint8_t pad = 0;
// A single integer identifying the offset of an active variable.
int32_t offset = -1;
// A single integer identifying the stride between array elements in an active variable.
int32_t arrayStride = -1;
// A single integer identifying the stride between columns of a column-major matrix or rows of a
// row-major matrix.
int32_t matrixStride = -1;
// A single integer, identifying the length of an array variable.
int32_t arraySize = -1;
// A single integer identifying the number of active array elements of the top-level shader
// storage block member containing the active variable.
int32_t topLevelArrayStride = -1;
};
bool operator==(const BlockMemberInfo &lhs, const BlockMemberInfo &rhs);
constexpr size_t ComponentAlignment(size_t numComponents)
{
return (numComponents == 3u ? 4u : numComponents);
}
constexpr BlockMemberInfo kDefaultBlockMemberInfo;
class BlockLayoutEncoder
{
public:
BlockLayoutEncoder();
virtual ~BlockLayoutEncoder() {}
virtual BlockMemberInfo encodeType(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix);
// Advance the offset based on struct size and array dimensions. Size can be calculated with
// getShaderVariableSize() or equivalent. |enterAggregateType|/|exitAggregateType| is necessary
// around this call.
virtual BlockMemberInfo encodeArrayOfPreEncodedStructs(
size_t size,
const std::vector<unsigned int> &arraySizes);
virtual size_t getCurrentOffset() const;
virtual size_t getShaderVariableSize(const ShaderVariable &structVar, bool isRowMajor);
// Called when entering/exiting a structure variable.
virtual void enterAggregateType(const ShaderVariable &structVar) = 0;
virtual void exitAggregateType(const ShaderVariable &structVar) = 0;
static constexpr size_t kBytesPerComponent = 4u;
static constexpr unsigned int kComponentsPerRegister = 4u;
static size_t GetBlockRegister(const BlockMemberInfo &info);
static size_t GetBlockRegisterElement(const BlockMemberInfo &info);
protected:
void align(size_t baseAlignment);
virtual void getBlockLayoutInfo(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int *arrayStrideOut,
int *matrixStrideOut) = 0;
virtual void advanceOffset(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int arrayStride,
int matrixStride) = 0;
size_t mCurrentOffset;
};
// Will return default values for everything.
class StubBlockEncoder : public BlockLayoutEncoder
{
public:
StubBlockEncoder() = default;
void enterAggregateType(const ShaderVariable &structVar) override {}
void exitAggregateType(const ShaderVariable &structVar) override {}
protected:
void getBlockLayoutInfo(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int *arrayStrideOut,
int *matrixStrideOut) override;
void advanceOffset(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int arrayStride,
int matrixStride) override
{}
};
// Block layout according to the std140 block layout
// See "Standard Uniform Block Layout" in Section 2.11.6 of the OpenGL ES 3.0 specification
class Std140BlockEncoder : public BlockLayoutEncoder
{
public:
Std140BlockEncoder();
void enterAggregateType(const ShaderVariable &structVar) override;
void exitAggregateType(const ShaderVariable &structVar) override;
protected:
void getBlockLayoutInfo(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int *arrayStrideOut,
int *matrixStrideOut) override;
void advanceOffset(GLenum type,
const std::vector<unsigned int> &arraySizes,
bool isRowMajorMatrix,
int arrayStride,
int matrixStride) override;
virtual size_t getBaseAlignment(const ShaderVariable &variable) const;
virtual size_t getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const;
};
class Std430BlockEncoder : public Std140BlockEncoder
{
public:
Std430BlockEncoder();
protected:
size_t getBaseAlignment(const ShaderVariable &variable) const override;
size_t getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const override;
};
using BlockLayoutMap = std::map<std::string, BlockMemberInfo>;
void GetInterfaceBlockInfo(const std::vector<ShaderVariable> &fields,
const std::string &prefix,
BlockLayoutEncoder *encoder,
BlockLayoutMap *blockInfoOut);
// Used for laying out the default uniform block on the Vulkan backend.
void GetActiveUniformBlockInfo(const std::vector<ShaderVariable> &uniforms,
const std::string &prefix,
BlockLayoutEncoder *encoder,
BlockLayoutMap *blockInfoOut);
class ShaderVariableVisitor
{
public:
virtual ~ShaderVariableVisitor() {}
virtual void enterStruct(const ShaderVariable &structVar) {}
virtual void exitStruct(const ShaderVariable &structVar) {}
virtual void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) {}
virtual void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) {}
virtual void enterArray(const ShaderVariable &arrayVar) {}
virtual void exitArray(const ShaderVariable &arrayVar) {}
virtual void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) {}
virtual void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) {}
virtual void visitOpaqueObject(const sh::ShaderVariable &variable) {}
virtual void visitVariable(const ShaderVariable &variable, bool isRowMajor) = 0;
protected:
ShaderVariableVisitor() {}
};
class VariableNameVisitor : public ShaderVariableVisitor
{
public:
VariableNameVisitor(const std::string &namePrefix, const std::string &mappedNamePrefix);
~VariableNameVisitor() override;
void enterStruct(const ShaderVariable &structVar) override;
void exitStruct(const ShaderVariable &structVar) override;
void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
void enterArray(const ShaderVariable &arrayVar) override;
void exitArray(const ShaderVariable &arrayVar) override;
void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
protected:
virtual void visitNamedOpaqueObject(const sh::ShaderVariable &variable,
const std::string &name,
const std::string &mappedName,
const std::vector<unsigned int> &arraySizes)
{}
virtual void visitNamedVariable(const ShaderVariable &variable,
bool isRowMajor,
const std::string &name,
const std::string &mappedName,
const std::vector<unsigned int> &arraySizes) = 0;
std::string collapseNameStack() const;
std::string collapseMappedNameStack() const;
private:
void visitOpaqueObject(const sh::ShaderVariable &variable) final;
void visitVariable(const ShaderVariable &variable, bool isRowMajor) final;
std::vector<std::string> mNameStack;
std::vector<std::string> mMappedNameStack;
std::vector<unsigned int> mArraySizeStack;
};
class BlockEncoderVisitor : public VariableNameVisitor
{
public:
BlockEncoderVisitor(const std::string &namePrefix,
const std::string &mappedNamePrefix,
BlockLayoutEncoder *encoder);
~BlockEncoderVisitor() override;
void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
void visitNamedVariable(const ShaderVariable &variable,
bool isRowMajor,
const std::string &name,
const std::string &mappedName,
const std::vector<unsigned int> &arraySizes) override;
virtual void encodeVariable(const ShaderVariable &variable,
const BlockMemberInfo &variableInfo,
const std::string &name,
const std::string &mappedName)
{}
protected:
int mTopLevelArraySize = 1;
int mTopLevelArrayStride = 0;
bool mIsTopLevelArrayStrideReady = true;
bool mSkipEnabled = false;
private:
BlockLayoutEncoder *mEncoder;
unsigned int mStructStackSize = 0;
};
void TraverseShaderVariable(const ShaderVariable &variable,
bool isRowMajorLayout,
ShaderVariableVisitor *visitor);
template <typename T>
void TraverseShaderVariables(const std::vector<T> &vars,
bool isRowMajorLayout,
ShaderVariableVisitor *visitor)
{
for (const T &var : vars)
{
TraverseShaderVariable(var, isRowMajorLayout, visitor);
}
}
template <typename T>
void TraverseActiveShaderVariables(const std::vector<T> &vars,
bool isRowMajorLayout,
ShaderVariableVisitor *visitor)
{
for (const T &var : vars)
{
if (var.active)
{
TraverseShaderVariable(var, isRowMajorLayout, visitor);
}
}
}
} // namespace sh
#endif // COMMON_BLOCKLAYOUT_H_