Skip to content

A
angle
Commit 85707f7f by Shahbaz Youssefi Committed by Commit Bot
Options

Vulkan: Pass in SPIR-V transform options in a struct

Clean up change in preparation for changes that add more options. Bug: angleproject:5478 Change-Id: Id35825b337dba153a5c28dfcc311b344ce257f78 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2599941 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 41d78ae1
Showing with 56 additions and 61 deletions
src/libANGLE/renderer/glslang_wrapper_utils.cpp
......@@ -1069,12 +1069,8 @@ class SpirvTransformerBase : angle::NonCopyable
public:
SpirvTransformerBase(const std::vector<uint32_t> &spirvBlobIn,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
gl::ShaderType shaderType,
SpirvBlob *spirvBlobOut)
: mSpirvBlobIn(spirvBlobIn),
mShaderType(shaderType),
mVariableInfoMap(variableInfoMap),
mSpirvBlobOut(spirvBlobOut)
: mSpirvBlobIn(spirvBlobIn), mVariableInfoMap(variableInfoMap), mSpirvBlobOut(spirvBlobOut)
{
gl::ShaderBitSet allStages;
allStages.set();
......@@ -1122,7 +1118,6 @@ class SpirvTransformerBase : angle::NonCopyable
// SPIR-V to transform:
const std::vector<uint32_t> &mSpirvBlobIn;
const gl::ShaderType mShaderType;
// Input shader variable info map:
const ShaderInterfaceVariableInfoMap &mVariableInfoMap;
......@@ -1385,15 +1380,12 @@ class SpirvTransformer final : public SpirvTransformerBase
{
public:
SpirvTransformer(const std::vector<uint32_t> &spirvBlobIn,
bool removeEarlyFragmentTestsOptimization,
bool removeDebugInfo,
GlslangSpirvOptions options,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
gl::ShaderType shaderType,
SpirvBlob *spirvBlobOut)
: SpirvTransformerBase(spirvBlobIn, variableInfoMap, shaderType, spirvBlobOut),
: SpirvTransformerBase(spirvBlobIn, variableInfoMap, spirvBlobOut),
mOptions(options),
mHasTransformFeedbackOutput(false),
mRemoveEarlyFragmentTestsOptimization(removeEarlyFragmentTestsOptimization),
mRemoveDebugInfo(removeDebugInfo),
mOutputPerVertex{},
mInputPerVertex{}
{}
......@@ -1436,9 +1428,8 @@ class SpirvTransformer final : public SpirvTransformerBase
void writeOutputPrologue();
// Special flags:
GlslangSpirvOptions mOptions;
bool mHasTransformFeedbackOutput;
bool mRemoveEarlyFragmentTestsOptimization;
bool mRemoveDebugInfo;
// Traversal state:
bool mInsertFunctionVariables = false;
......@@ -1587,7 +1578,7 @@ void SpirvTransformer::transformInstruction()
// Only write function variables for the EntryPoint function for non-compute shaders
mInsertFunctionVariables =
mOpFunctionId == mEntryPointId && mShaderType != gl::ShaderType::Compute;
mOpFunctionId == mEntryPointId && mOptions.shaderType != gl::ShaderType::Compute;
}
// Only look at interesting instructions.
......@@ -1688,7 +1679,7 @@ void SpirvTransformer::writeInputPreamble()
for (uint32_t id = 0; id < mVariableInfoById.size(); id++)
{
const ShaderInterfaceVariableInfo *info = mVariableInfoById[id];
if (info && info->useRelaxedPrecision && info->activeStages[mShaderType] &&
if (info && info->useRelaxedPrecision && info->activeStages[mOptions.shaderType] &&
info->varyingIsInput)
{
// This is an input varying, need to cast the mediump value that came from
......@@ -1715,7 +1706,7 @@ void SpirvTransformer::writeOutputPrologue()
for (uint32_t id = 0; id < mVariableInfoById.size(); id++)
{
const ShaderInterfaceVariableInfo *info = mVariableInfoById[id];
if (info && info->useRelaxedPrecision && info->activeStages[mShaderType] &&
if (info && info->useRelaxedPrecision && info->activeStages[mOptions.shaderType] &&
info->varyingIsOutput)
{
ASSERT(mFixedVaryingTypeId[id] != 0);
......@@ -1949,7 +1940,7 @@ void SpirvTransformer::visitVariable(const uint32_t *instruction)
// Associate the id of this name with its info.
mVariableInfoById[id] = info;
if (info && info->useRelaxedPrecision && info->activeStages[mShaderType] &&
if (info && info->useRelaxedPrecision && info->activeStages[mOptions.shaderType] &&
mFixedVaryingId[id] == 0)
{
mFixedVaryingId[id] = getNewId();
......@@ -1958,8 +1949,9 @@ void SpirvTransformer::visitVariable(const uint32_t *instruction)
// Note if the variable is captured by transform feedback. In that case, the TransformFeedback
// capability needs to be added.
if (mShaderType != gl::ShaderType::Fragment &&
info->xfbBuffer != ShaderInterfaceVariableInfo::kInvalid && info->activeStages[mShaderType])
if (mOptions.shaderType != gl::ShaderType::Fragment &&
info->xfbBuffer != ShaderInterfaceVariableInfo::kInvalid &&
info->activeStages[mOptions.shaderType])
{
mHasTransformFeedbackOutput = true;
}
......@@ -1986,7 +1978,7 @@ bool SpirvTransformer::transformDecorate(const uint32_t *instruction, size_t wor
}
// If it's an inactive varying, remove the decoration altogether.
if (!info->activeStages[mShaderType])
if (!info->activeStages[mOptions.shaderType])
{
return true;
}
......@@ -2063,7 +2055,7 @@ bool SpirvTransformer::transformDecorate(const uint32_t *instruction, size_t wor
}
// Add Xfb decorations, if any.
if (mShaderType != gl::ShaderType::Fragment &&
if (mOptions.shaderType != gl::ShaderType::Fragment &&
info->xfbBuffer != ShaderInterfaceVariableInfo::kInvalid)
{
ASSERT(info->xfbStride != ShaderInterfaceVariableInfo::kInvalid);
......@@ -2166,7 +2158,7 @@ bool SpirvTransformer::transformCapability(const uint32_t *instruction, size_t w
bool SpirvTransformer::transformDebugInfo(const uint32_t *instruction, size_t wordCount)
{
if (mRemoveDebugInfo)
if (mOptions.removeDebugInfo)
{
// Strip debug info to reduce binary size.
return true;
......@@ -2193,7 +2185,7 @@ bool SpirvTransformer::transformDebugInfo(const uint32_t *instruction, size_t wo
bool SpirvTransformer::transformEmitVertex(const uint32_t *instruction, size_t wordCount)
{
// This is only possible in geometry shaders.
ASSERT(mShaderType == gl::ShaderType::Geometry);
ASSERT(mOptions.shaderType == gl::ShaderType::Geometry);
// Write the temporary variables that hold varyings data before EmitVertex().
writeOutputPrologue();
......@@ -2234,7 +2226,7 @@ bool SpirvTransformer::transformEntryPoint(const uint32_t *instruction, size_t w
ASSERT(info);
if (!info->activeStages[mShaderType])
if (!info->activeStages[mOptions.shaderType])
{
continue;
}
......@@ -2367,7 +2359,8 @@ bool SpirvTransformer::transformReturn(const uint32_t *instruction, size_t wordC
// For geometry shaders, this operations is done before every EmitVertex() instead.
// Additionally, this transformation (which affects output varyings) doesn't apply to fragment
// shaders.
if (mShaderType == gl::ShaderType::Geometry || mShaderType == gl::ShaderType::Fragment)
if (mOptions.shaderType == gl::ShaderType::Geometry ||
mOptions.shaderType == gl::ShaderType::Fragment)
{
return false;
}
......@@ -2401,7 +2394,7 @@ bool SpirvTransformer::transformVariable(const uint32_t *instruction, size_t wor
// inactive varying inputs are already pruned by the translator.
// However, input or output storage class for interface block will not be pruned when a shader
// is compiled separately.
if (info->activeStages[mShaderType])
if (info->activeStages[mOptions.shaderType])
{
if (info->useRelaxedPrecision &&
(storageClass == spv::StorageClassOutput || storageClass == spv::StorageClassInput))
......@@ -2456,7 +2449,7 @@ bool SpirvTransformer::transformAccessChain(const uint32_t *instruction, size_t
return false;
}
if (info->activeStages[mShaderType] && !info->useRelaxedPrecision)
if (info->activeStages[mOptions.shaderType] && !info->useRelaxedPrecision)
{
return false;
}
......@@ -2479,7 +2472,7 @@ bool SpirvTransformer::transformExecutionMode(const uint32_t *instruction, size_
const uint32_t executionMode = instruction[kModeIndex];
if (executionMode == spv::ExecutionModeEarlyFragmentTests &&
mRemoveEarlyFragmentTestsOptimization)
mOptions.removeEarlyFragmentTestsOptimization)
{
// skip the copy
return true;
......@@ -2525,7 +2518,7 @@ class SpirvVertexAttributeAliasingTransformer final : public SpirvTransformerBas
const ShaderInterfaceVariableInfoMap &variableInfoMap,
std::vector<const ShaderInterfaceVariableInfo *> &&variableInfoById,
SpirvBlob *spirvBlobOut)
: SpirvTransformerBase(spirvBlobIn, variableInfoMap, gl::ShaderType::Vertex, spirvBlobOut)
: SpirvTransformerBase(spirvBlobIn, variableInfoMap, spirvBlobOut)
{
mVariableInfoById = std::move(variableInfoById);
}
......@@ -3750,9 +3743,7 @@ void GlslangGetShaderSource(const GlslangSourceOptions &options,
}
angle::Result GlslangTransformSpirvCode(const GlslangErrorCallback &callback,
const gl::ShaderType shaderType,
bool removeEarlyFragmentTestsOptimization,
bool removeDebugInfo,
const GlslangSpirvOptions &options,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
const SpirvBlob &initialSpirvBlob,
SpirvBlob *spirvBlobOut)
......@@ -3771,12 +3762,11 @@ angle::Result GlslangTransformSpirvCode(const GlslangErrorCallback &callback,
#endif // defined(ANGLE_DEBUG_SPIRV_TRANSFORMER) && ANGLE_DEBUG_SPIRV_TRANSFORMER
// Transform the SPIR-V code by assigning location/set/binding values.
SpirvTransformer transformer(initialSpirvBlob, removeEarlyFragmentTestsOptimization,
removeDebugInfo, variableInfoMap, shaderType, spirvBlobOut);
SpirvTransformer transformer(initialSpirvBlob, options, variableInfoMap, spirvBlobOut);
ANGLE_GLSLANG_CHECK(callback, transformer.transform(), GlslangError::InvalidSpirv);
// If there are aliasing vertex attributes, transform the SPIR-V again to remove them.
if (shaderType == gl::ShaderType::Vertex && HasAliasingAttributes(variableInfoMap))
if (options.shaderType == gl::ShaderType::Vertex && HasAliasingAttributes(variableInfoMap))
{
SpirvBlob preTransformBlob = std::move(*spirvBlobOut);
SpirvVertexAttributeAliasingTransformer aliasingTransformer(
......
src/libANGLE/renderer/glslang_wrapper_utils.h
......@@ -53,6 +53,13 @@ struct GlslangSourceOptions
bool emulateBresenhamLines = false;
};
struct GlslangSpirvOptions
{
gl::ShaderType shaderType = gl::ShaderType::InvalidEnum;
bool removeEarlyFragmentTestsOptimization = false;
bool removeDebugInfo = false;
};
using SpirvBlob = std::vector<uint32_t>;
using GlslangErrorCallback = std::function<angle::Result(GlslangError)>;
......@@ -138,9 +145,7 @@ void GlslangGetShaderSource(const GlslangSourceOptions &options,
ShaderMapInterfaceVariableInfoMap *variableInfoMapOut);
angle::Result GlslangTransformSpirvCode(const GlslangErrorCallback &callback,
const gl::ShaderType shaderType,
bool removeEarlyFragmentTestsOptimization,
bool removeDebugInfo,
const GlslangSpirvOptions &options,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
const SpirvBlob &initialSpirvBlob,
SpirvBlob *spirvBlobOut);
......
src/libANGLE/renderer/metal/mtl_glslang_utils.mm
......@@ -455,13 +455,12 @@ angle::Result GlslangGetShaderSpirvCode(ErrorHandler *context,
for (const gl::ShaderType shaderType : linkedShaderStages)
{
// we pass in false here to skip modifications related to early fragment tests
// optimizations and line rasterization. These are done in the initProgram time since they
// are related to context state. We must keep original untouched spriv blobs here because we
// do not have ability to add back in at initProgram time.
GlslangSpirvOptions options;
options.shaderType = shaderType;
angle::Result status = GlslangTransformSpirvCode(
[context](GlslangError error) { return HandleError(context, error); }, shaderType,
false, false, variableInfoMap[shaderType], initialSpirvBlobs[shaderType],
[context](GlslangError error) { return HandleError(context, error); }, options,
variableInfoMap[shaderType], initialSpirvBlobs[shaderType],
&(*shaderCodeOut)[shaderType]);
if (status != angle::Result::Continue)
{
......
src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp
......@@ -84,18 +84,14 @@ angle::Result GlslangWrapperVk::GetShaderCode(vk::Context *context,
// static
angle::Result GlslangWrapperVk::TransformSpirV(
vk::Context *context,
const gl::ShaderType shaderType,
bool removeEarlyFragmentTestsOptimization,
const GlslangSpirvOptions &options,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
const SpirvBlob &initialSpirvBlob,
SpirvBlob *shaderCodeOut)
{
const bool removeDebugInfo = !context->getRenderer()->getEnableValidationLayers();
return GlslangTransformSpirvCode(
[context](GlslangError error) { return ErrorHandler(context, error); }, shaderType,
removeEarlyFragmentTestsOptimization, removeDebugInfo, variableInfoMap, initialSpirvBlob,
shaderCodeOut);
[context](GlslangError error) { return ErrorHandler(context, error); }, options,
variableInfoMap, initialSpirvBlob, shaderCodeOut);
}
// static
......
src/libANGLE/renderer/vulkan/GlslangWrapperVk.h
......@@ -44,8 +44,7 @@ class GlslangWrapperVk
gl::ShaderMap<std::vector<uint32_t>> *shaderCodesOut);
static angle::Result TransformSpirV(vk::Context *context,
const gl::ShaderType shaderType,
bool removeEarlyFragmentTestsOptimization,
const GlslangSpirvOptions &options,
const ShaderInterfaceVariableInfoMap &variableInfoMap,
const SpirvBlob &initialSpirvBlob,
SpirvBlob *shaderCodeOut);
......
src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
......@@ -30,10 +30,13 @@ bool ValidateTransformedSpirV(ContextVk *contextVk,
{
for (gl::ShaderType shaderType : linkedShaderStages)
{
GlslangSpirvOptions options;
options.shaderType = shaderType;
options.removeDebugInfo = true;
SpirvBlob transformed;
if (GlslangWrapperVk::TransformSpirV(
contextVk, shaderType, false,
executableVk->getShaderInterfaceVariableInfoMap()[shaderType],
contextVk, options, executableVk->getShaderInterfaceVariableInfoMap()[shaderType],
spirvBlobs[shaderType], &transformed) != angle::Result::Continue)
{
return false;
......@@ -121,14 +124,17 @@ angle::Result ProgramInfo::initProgram(ContextVk *contextVk,
executableVk->getShaderInterfaceVariableInfoMap();
const gl::ShaderMap<SpirvBlob> &originalSpirvBlobs = shaderInfo.getSpirvBlobs();
const SpirvBlob &originalSpirvBlob = originalSpirvBlobs[shaderType];
bool removeEarlyFragmentTestsOptimization =
(shaderType == gl::ShaderType::Fragment && optionBits.removeEarlyFragmentTestsOptimization);
gl::ShaderMap<SpirvBlob> transformedSpirvBlobs;
SpirvBlob &transformedSpirvBlob = transformedSpirvBlobs[shaderType];
ANGLE_TRY(GlslangWrapperVk::TransformSpirV(
contextVk, shaderType, removeEarlyFragmentTestsOptimization, variableInfoMap[shaderType],
originalSpirvBlob, &transformedSpirvBlob));
GlslangSpirvOptions options;
options.shaderType = shaderType;
options.removeEarlyFragmentTestsOptimization =
shaderType == gl::ShaderType::Fragment && optionBits.removeEarlyFragmentTestsOptimization;
options.removeDebugInfo = !contextVk->getRenderer()->getEnableValidationLayers();
ANGLE_TRY(GlslangWrapperVk::TransformSpirV(contextVk, options, variableInfoMap[shaderType],
originalSpirvBlob, &transformedSpirvBlob));
ANGLE_TRY(vk::InitShaderAndSerial(contextVk, &mShaders[shaderType].get(),
transformedSpirvBlob.data(),
transformedSpirvBlob.size() * sizeof(uint32_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