mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement SPV_GOOGLE_hlsl_functionality1.

Browse Source 
Enabled via -fhlsl_functionality1
This commit is contained in:
John Kessenich
2018-03-07 18:05:55 -07:00
parent cd23a47566
commit 5d610ee1dc
16 changed files with 402 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hlsl/hlslParseHelper.cpp
View File

@@ -1608,7 +1608,7 @@ void HlslParseContext::addStructBufferHiddenCounterParam(const TSourceLoc& loc,
if (! hasStructBuffCounter(*param.type))
return;
const TString counterBlockName(getStructBuffCounterName(*param.name));
const TString counterBlockName(intermediate.addCounterBufferName(*param.name));
TType counterType;
counterBufferType(loc, counterType);
@@ -3163,7 +3163,7 @@ void HlslParseContext::counterBufferType(const TSourceLoc& loc, TType& type)
{
// Counter type
TType* counterType = new TType(EbtInt, EvqBuffer);
counterType->setFieldName("@count");
counterType->setFieldName(intermediate.implicitCounterName);
TTypeList* blockStruct = new TTypeList;
TTypeLoc member = { counterType, loc };
@@ -3176,12 +3176,6 @@ void HlslParseContext::counterBufferType(const TSourceLoc& loc, TType& type)
shareStructBufferType(type);
}
// knowledge of how to construct block name, in one place instead of N places.
TString HlslParseContext::getStructBuffCounterName(const TString& blockName) const
{
return blockName + "@count";
}
// declare counter for a structured buffer type
void HlslParseContext::declareStructBufferCounter(const TSourceLoc& loc, const TType& bufferType, const TString& name)
{
@@ -3195,9 +3189,9 @@ void HlslParseContext::declareStructBufferCounter(const TSourceLoc& loc, const T
TType blockType;
counterBufferType(loc, blockType);
TString* blockName = new TString(getStructBuffCounterName(name));
TString* blockName = new TString(intermediate.addCounterBufferName(name));
// Counter buffer does not have its own counter buffer. TODO: there should be a better way to track this.
// Counter buffer is not yet in use
structBufferCounter[*blockName] = false;
shareStructBufferType(blockType);
@@ -3211,7 +3205,7 @@ TIntermTyped* HlslParseContext::getStructBufferCounter(const TSourceLoc& loc, TI
if (buffer == nullptr || ! isStructBufferType(buffer->getType()))
return nullptr;
const TString counterBlockName(getStructBuffCounterName(buffer->getAsSymbolNode()->getName()));
const TString counterBlockName(intermediate.addCounterBufferName(buffer->getAsSymbolNode()->getName()));
// Mark the counter as being used
structBufferCounter[counterBlockName] = true;
@@ -3224,7 +3218,6 @@ TIntermTyped* HlslParseContext::getStructBufferCounter(const TSourceLoc& loc, TI
return counterMember;
}
//
// Decompose structure buffer methods into AST
//
@@ -5743,12 +5736,11 @@ void HlslParseContext::addStructBuffArguments(const TSourceLoc& loc, TIntermAggr
TType counterType;
counterBufferType(loc, counterType);
const TString counterBlockName(getStructBuffCounterName(blockSym->getName()));
const TString counterBlockName(intermediate.addCounterBufferName(blockSym->getName()));
TVariable* variable = makeInternalVariable(counterBlockName, counterType);
// Mark this buffer as requiring a counter block. TODO: there should be a better
// way to track it.
// Mark this buffer's counter block as being in use
structBufferCounter[counterBlockName] = true;
TIntermSymbol* sym = intermediate.addSymbol(*variable, loc);
@@ -9944,7 +9936,8 @@ void HlslParseContext::addPatchConstantInvocation()
}
// Finalization step: remove unused buffer blocks from linkage (we don't know until the
// shader is entirely compiled)
// shader is entirely compiled).
// Preserve order of remaining symbols.
void HlslParseContext::removeUnusedStructBufferCounters()
{
const auto endIt = std::remove_if(linkageSymbols.begin(), linkageSymbols.end(),

2
hlsl/hlslParseHelper.h
View File

@@ -405,7 +405,7 @@ protected:
// may fit in TSampler::structReturnIndex.
TVector<TTypeList*> textureReturnStruct;
TMap<TString, bool> structBufferCounter;
TMap<TString, bool> structBufferCounter; // true if counter buffer is in use
// The built-in interstage IO map considers e.g, EvqPosition on input and output separately, so that we
// can build the linkage correctly if position appears on both sides. Otherwise, multiple positions