Hash :
cac1e824
Author :
Date :
2025-04-29T18:27:36
WGSL: Output driver uniform and UBO structs This is the WGSL half of the change to implement driver uniforms. Driver uniforms are implemented as a UBO and reuse the default set of driver uniforms. User-provided UBOs don't yet have variables outputted for them. This requires moving MSL's ReduceInterfaceBlocks to the tree_ops dir in order to change interface block definitions into struct definitions. Bug: angleproject:389145696 Change-Id: I27f3837b3d115f2ffac66cc545f3b60ca9f01cb6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6477564 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Matthew Denton <mpdenton@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
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
//
// Copyright 2020 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 <algorithm>
#include <unordered_map>
#include <iostream>
#include "compiler/translator/IntermRebuild.h"
#include "compiler/translator/Name.h"
#include "compiler/translator/SymbolTable.h"
#include "compiler/translator/tree_ops/ReduceInterfaceBlocks.h"
#include "compiler/translator/tree_ops/SeparateDeclarations.h"
#include "compiler/translator/tree_util/IntermNode_util.h"
using namespace sh;
////////////////////////////////////////////////////////////////////////////////
namespace
{
class Reducer : public TIntermRebuild
{
std::unordered_map<const TInterfaceBlock *, const TVariable *> mLiftedMap;
std::unordered_map<const TVariable *, const TVariable *> mInstanceMap;
InterfaceBlockInstanceVarNameGen &mInstanceVarNameGen;
public:
Reducer(TCompiler &compiler, InterfaceBlockInstanceVarNameGen &instanceVarNameGen)
: TIntermRebuild(compiler, true, false), mInstanceVarNameGen(instanceVarNameGen)
{}
PreResult visitDeclarationPre(TIntermDeclaration &declNode) override
{
ASSERT(declNode.getChildCount() == 1);
TIntermNode &node = *declNode.getChildNode(0);
if (TIntermSymbol *symbolNode = node.getAsSymbolNode())
{
const TVariable &var = symbolNode->variable();
const TType &type = var.getType();
const SymbolType symbolType = var.symbolType();
if (const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock())
{
const bool isEmptySymbol = symbolType == SymbolType::Empty;
Name newInstanceVarName =
isEmptySymbol ? Name(mInstanceVarNameGen(), SymbolType::AngleInternal)
: Name(var);
auto &structure =
*new TStructure(&mSymbolTable, interfaceBlock->name(),
&interfaceBlock->fields(), interfaceBlock->symbolType());
auto &structVar = CreateStructTypeVariable(mSymbolTable, structure);
auto &instanceVar =
CreateInstanceVariable(mSymbolTable, structure, newInstanceVarName,
TQualifier::EvqBuffer, &type.getArraySizes());
if (isEmptySymbol)
{
mLiftedMap[interfaceBlock] = &instanceVar;
}
else
{
ASSERT(type.getQualifier() == TQualifier::EvqUniform);
mInstanceMap[&var] = &instanceVar;
}
TIntermNode *replacements[] = {
new TIntermDeclaration{new TIntermSymbol(&structVar)},
new TIntermDeclaration{new TIntermSymbol(&instanceVar)}};
return PreResult::Multi(std::begin(replacements), std::end(replacements));
}
}
return {declNode, VisitBits::Both};
}
PreResult visitSymbolPre(TIntermSymbol &symbolNode) override
{
const TVariable &var = symbolNode.variable();
{
auto it = mInstanceMap.find(&var);
if (it != mInstanceMap.end())
{
return *new TIntermSymbol(it->second);
}
}
if (const TInterfaceBlock *ib = var.getType().getInterfaceBlock())
{
auto it = mLiftedMap.find(ib);
if (it != mLiftedMap.end())
{
return AccessField(*(it->second), Name(var));
}
}
return symbolNode;
}
};
} // anonymous namespace
////////////////////////////////////////////////////////////////////////////////
bool sh::ReduceInterfaceBlocks(TCompiler &compiler,
TIntermBlock &root,
InterfaceBlockInstanceVarNameGen nameGen)
{
Reducer reducer(compiler, nameGen);
if (!reducer.rebuildRoot(root))
{
return false;
}
if (!SeparateDeclarations(compiler, root, false))
{
return false;
}
return true;
}