Hash :
10380f4b
Author :
Date :
2023-06-06T11:52:08
Vulkan: Output SPIR-V ids from compiler In this change, the shader interface variables are given SPIR-V ids by the compiler before SPIR-V generation. Those ids are made available through the ShaderVariable interface. The transformer does not yet rely on this information. A follow up change will rework the backend's name->info map and the transformer to directly use ids instead of names. Bug: angleproject:7220 Change-Id: Ic0a62681d4bcf3ed171c39c3ecd83e438ea068c8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4600609 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Roman Lavrov <romanl@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
//
// 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 <cstring>
namespace gl
{
ActiveVariable::ActiveVariable() {}
ActiveVariable::~ActiveVariable() {}
ActiveVariable::ActiveVariable(const ActiveVariable &rhs) = default;
ActiveVariable &ActiveVariable::operator=(const ActiveVariable &rhs) = default;
void ActiveVariable::setActive(ShaderType shaderType, bool used)
{
ASSERT(shaderType != ShaderType::InvalidEnum);
mActiveUseBits.set(shaderType, used);
}
void ActiveVariable::unionReferencesWith(const ActiveVariable &other)
{
mActiveUseBits |= other.mActiveUseBits;
}
LinkedUniform::LinkedUniform()
: typeInfo(nullptr),
bufferIndex(-1),
blockInfo(sh::kDefaultBlockMemberInfo),
outerArrayOffset(0)
{}
LinkedUniform::LinkedUniform(GLenum typeIn,
GLenum precisionIn,
const std::string &nameIn,
const std::vector<unsigned int> &arraySizesIn,
const int bindingIn,
const int offsetIn,
const int locationIn,
const int bufferIndexIn,
const sh::BlockMemberInfo &blockInfoIn)
: typeInfo(&GetUniformTypeInfo(typeIn)),
bufferIndex(bufferIndexIn),
blockInfo(blockInfoIn),
outerArrayOffset(0)
{
type = typeIn;
precision = precisionIn;
name = nameIn;
arraySizes = arraySizesIn;
binding = bindingIn;
offset = offsetIn;
location = locationIn;
ASSERT(!isArrayOfArrays());
ASSERT(!isArray() || !isStruct());
}
LinkedUniform::LinkedUniform(const sh::ShaderVariable &uniform)
: sh::ShaderVariable(uniform),
typeInfo(&GetUniformTypeInfo(type)),
bufferIndex(-1),
blockInfo(sh::kDefaultBlockMemberInfo)
{
ASSERT(!isArrayOfArrays());
ASSERT(!isArray() || !isStruct());
}
LinkedUniform::LinkedUniform(const LinkedUniform &uniform)
: sh::ShaderVariable(uniform),
ActiveVariable(uniform),
typeInfo(uniform.typeInfo),
bufferIndex(uniform.bufferIndex),
blockInfo(uniform.blockInfo),
outerArraySizes(uniform.outerArraySizes),
outerArrayOffset(uniform.outerArrayOffset)
{}
LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
{
sh::ShaderVariable::operator=(uniform);
ActiveVariable::operator=(uniform);
typeInfo = uniform.typeInfo;
bufferIndex = uniform.bufferIndex;
blockInfo = uniform.blockInfo;
outerArraySizes = uniform.outerArraySizes;
outerArrayOffset = uniform.outerArrayOffset;
return *this;
}
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), id(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),
id(0)
{
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