Skip to content

G
glslang
Commit 4a145dbf by LoopDawg
Options

HLSL: handle split InputPatch templat type in patch constant functions

InputPatch parameters to patch constant functions were not using the internal (temporary) variable type. That could cause validation errors if the input patch had a mixture of builtins and user qualified members. This uses the entry point's internal form. There is currently a limitation: if an InputPatch is used in a PCF, it must also have appeared in the main entry point's parameter list. That is not a limitation of HLSL. Currently that situation is detected and an "implemented" error results. The limitation can be addressed, but isn't yet in the current form of the PR.
parent a5d86164
Showing with 314 additions and 32 deletions
Test/baseResults/hlsl.hull.5.tesc.out 0 → 100644
hlsl.hull.5.tesc
ERROR: 0:0: '' : unimplemented: PCF input patch without entry point input patch parameter
ERROR: 1 compilation errors. No code generated.
Shader version: 500
vertices = 3
vertex spacing = fractional_odd_spacing
triangle order = cw
ERROR: node is still EOpNull!
0:25 Function Definition: HS_ConstFunc(struct-HS_Input-vf4-vf41[3]; ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:25 Function Parameters:
0:25 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:? Sequence
0:26 Sequence
0:26 move second child to first child ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:26 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:26 Constant:
0:26 0.000000
0:26 0.000000
0:26 0.000000
0:26 0.000000
0:28 move second child to first child ( temp float)
0:28 fInsideTessFactor: direct index for structure ( temp float)
0:28 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:28 Constant:
0:28 1 (const int)
0:28 add ( temp float)
0:28 direct index ( temp float)
0:28 m_Position: direct index for structure ( temp 4-component vector of float)
0:28 direct index ( temp structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 3 (const int)
0:28 direct index ( temp float)
0:28 m_Normal: direct index for structure ( temp 4-component vector of float)
0:28 direct index ( temp structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 1 (const int)
0:28 Constant:
0:28 3 (const int)
0:30 Branch: Return with expression
0:30 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:39 Function Definition: @main(u1; ( temp structure{ temp 4-component vector of float m_Position})
0:39 Function Parameters:
0:39 'cpid' ( in uint)
0:? Sequence
0:40 Sequence
0:40 move second child to first child ( temp structure{ temp 4-component vector of float m_Position})
0:40 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:40 Constant:
0:40 0.000000
0:40 0.000000
0:40 0.000000
0:40 0.000000
0:41 move second child to first child ( temp 4-component vector of float)
0:41 m_Position: direct index for structure ( temp 4-component vector of float)
0:41 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:41 Constant:
0:41 0 (const int)
0:41 Constant:
0:41 0.000000
0:41 0.000000
0:41 0.000000
0:41 0.000000
0:42 Branch: Return with expression
0:42 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:39 Function Definition: main( ( temp void)
0:39 Function Parameters:
0:? Sequence
0:39 move second child to first child ( temp uint)
0:? 'cpid' ( temp uint)
0:? 'cpid' ( in uint InvocationID)
0:39 Sequence
0:39 move second child to first child ( temp 4-component vector of float)
0:39 direct index ( out 4-component vector of float Position)
0:? '@entryPointOutput.m_Position' ( out 3-element array of 4-component vector of float Position)
0:39 Constant:
0:39 0 (const int)
0:39 m_Position: direct index for structure ( temp 4-component vector of float)
0:39 Function Call: @main(u1; ( temp structure{ temp 4-component vector of float m_Position})
0:? 'cpid' ( temp uint)
0:39 Constant:
0:39 0 (const int)
0:? Linker Objects
0:? '@entryPointOutput.m_Position' ( out 3-element array of 4-component vector of float Position)
0:? 'cpid' ( in uint InvocationID)
Linked tessellation control stage:
Shader version: 500
vertices = 3
vertex spacing = fractional_odd_spacing
triangle order = cw
ERROR: node is still EOpNull!
0:25 Function Definition: HS_ConstFunc(struct-HS_Input-vf4-vf41[3]; ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:25 Function Parameters:
0:25 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:? Sequence
0:26 Sequence
0:26 move second child to first child ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:26 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:26 Constant:
0:26 0.000000
0:26 0.000000
0:26 0.000000
0:26 0.000000
0:28 move second child to first child ( temp float)
0:28 fInsideTessFactor: direct index for structure ( temp float)
0:28 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:28 Constant:
0:28 1 (const int)
0:28 add ( temp float)
0:28 direct index ( temp float)
0:28 m_Position: direct index for structure ( temp 4-component vector of float)
0:28 direct index ( temp structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 3 (const int)
0:28 direct index ( temp float)
0:28 m_Normal: direct index for structure ( temp 4-component vector of float)
0:28 direct index ( temp structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 'I' ( in 3-element array of structure{ temp 4-component vector of float m_Position, temp 4-component vector of float m_Normal})
0:28 Constant:
0:28 0 (const int)
0:28 Constant:
0:28 1 (const int)
0:28 Constant:
0:28 3 (const int)
0:30 Branch: Return with expression
0:30 'O' ( temp structure{ temp 3-element array of float fTessFactor, temp float fInsideTessFactor})
0:39 Function Definition: @main(u1; ( temp structure{ temp 4-component vector of float m_Position})
0:39 Function Parameters:
0:39 'cpid' ( in uint)
0:? Sequence
0:40 Sequence
0:40 move second child to first child ( temp structure{ temp 4-component vector of float m_Position})
0:40 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:40 Constant:
0:40 0.000000
0:40 0.000000
0:40 0.000000
0:40 0.000000
0:41 move second child to first child ( temp 4-component vector of float)
0:41 m_Position: direct index for structure ( temp 4-component vector of float)
0:41 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:41 Constant:
0:41 0 (const int)
0:41 Constant:
0:41 0.000000
0:41 0.000000
0:41 0.000000
0:41 0.000000
0:42 Branch: Return with expression
0:42 'output' ( temp structure{ temp 4-component vector of float m_Position})
0:39 Function Definition: main( ( temp void)
0:39 Function Parameters:
0:? Sequence
0:39 move second child to first child ( temp uint)
0:? 'cpid' ( temp uint)
0:? 'cpid' ( in uint InvocationID)
0:39 Sequence
0:39 move second child to first child ( temp 4-component vector of float)
0:39 direct index ( out 4-component vector of float Position)
0:? '@entryPointOutput.m_Position' ( out 3-element array of 4-component vector of float Position)
0:39 Constant:
0:39 0 (const int)
0:39 m_Position: direct index for structure ( temp 4-component vector of float)
0:39 Function Call: @main(u1; ( temp structure{ temp 4-component vector of float m_Position})
0:? 'cpid' ( temp uint)
0:39 Constant:
0:39 0 (const int)
0:? Linker Objects
0:? '@entryPointOutput.m_Position' ( out 3-element array of 4-component vector of float Position)
0:? 'cpid' ( in uint InvocationID)
SPIR-V is not generated for failed compile or link
Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
...@@ -82,7 +82,7 @@ triangle order = cw ...@@ -82,7 +82,7 @@ triangle order = cw
0:? '@patchConstantResult' ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor}) 0:? '@patchConstantResult' ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor})
0:? Function Call: PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3]; ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor}) 0:? Function Call: PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3]; ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor})
0:? 'pcf_out' ( temp 3-element array of structure{ temp 3-component vector of float val}) 0:? 'pcf_out' ( temp 3-element array of structure{ temp 3-component vector of float val})
0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' ( temp 3-element array of structure{ temp 3-component vector of float val})
0:? Sequence 0:? Sequence
0:? move second child to first child ( temp float) 0:? move second child to first child ( temp float)
0:? direct index ( patch out float TessLevelOuter) 0:? direct index ( patch out float TessLevelOuter)
...@@ -291,7 +291,7 @@ triangle order = cw ...@@ -291,7 +291,7 @@ triangle order = cw
0:? '@patchConstantResult' ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor}) 0:? '@patchConstantResult' ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor})
0:? Function Call: PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3]; ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor}) 0:? Function Call: PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3]; ( temp structure{ temp 3-element array of float tfactor, temp float flInFactor})
0:? 'pcf_out' ( temp 3-element array of structure{ temp 3-component vector of float val}) 0:? 'pcf_out' ( temp 3-element array of structure{ temp 3-component vector of float val})
0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' ( temp 3-element array of structure{ temp 3-component vector of float val})
0:? Sequence 0:? Sequence
0:? move second child to first child ( temp float) 0:? move second child to first child ( temp float)
0:? direct index ( patch out float TessLevelOuter) 0:? direct index ( patch out float TessLevelOuter)
...@@ -568,7 +568,7 @@ triangle order = cw ...@@ -568,7 +568,7 @@ triangle order = cw
87: 30(ptr) AccessChain 67(pcf_out) 81 87: 30(ptr) AccessChain 67(pcf_out) 81
Store 87 86 Store 87 86
90: 20 Load 67(pcf_out) 90: 20 Load 67(pcf_out)
91: 11 Load 42(i) 91: 11 Load 40(i)
92:22(hs_pcf_t) FunctionCall 26(PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3];) 90 91 92:22(hs_pcf_t) FunctionCall 26(PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3];) 90 91
Store 89(@patchConstantResult) 92 Store 89(@patchConstantResult) 92
98: 97(ptr) AccessChain 89(@patchConstantResult) 29 29 98: 97(ptr) AccessChain 89(@patchConstantResult) 29 29
......
Test/hlsl.hull.4.tesc
// Test mixed output structure: user and builtin members. Hull shaders involve extra // Test mixed InputPatch structure: user and builtin members. Hull shaders involve extra
// logic in this case, over and above e.g. pixel or vertex stages, which is related to // logic in this case due to patch constant function call synthesis.
// the implicit array dimension.
// This example tests the main EP and the PCF EP both having an input patch.
struct HS_Main_Output
{
float4 m_Position : SV_POSITION ;
};
struct HS_Output struct HS_Output
{ {
float tessFactor[3] : SV_TessFactor; float fTessFactor [ 3 ] : SV_TessFactor ;
float coord : TEXCOORD0; float fInsideTessFactor : SV_InsideTessFactor ;
}; };
[domain("tri")] struct HS_Input
[outputcontrolpoints(3)] {
HS_Output main ( ) float4 m_Position : SV_POSITION;
float4 m_Normal : TEXCOORD2;
};
HS_Output HS_ConstFunc ( InputPatch < HS_Input , 3 > I )
{
HS_Output O = (HS_Output)0;
O.fInsideTessFactor = I [ 0 ].m_Position.w + I [ 0 ].m_Normal.w;
return O;
}
[ domain ( "tri" ) ]
[ partitioning ( "fractional_odd" ) ]
[ outputtopology ( "triangle_cw" ) ]
[ patchconstantfunc ( "HS_ConstFunc" ) ]
[ outputcontrolpoints ( 3 ) ]
HS_Main_Output main( InputPatch < HS_Input , 3 > I , uint cpid : SV_OutputControlPointID )
{ {
HS_Output output = (HS_Output)0; HS_Main_Output output = ( HS_Main_Output ) 0 ;
return output; output.m_Position = 0;
return output ;
} }
Test/hlsl.hull.5.tesc 0 → 100644
// Test mixed InputPatch structure: user and builtin members. Hull shaders involve extra
// logic in this case due to patch constant function call synthesis.
// This example tests the PCF EP having an InputPatch, but the main EP does not.
struct HS_Main_Output
{
float4 m_Position : SV_POSITION ;
};
struct HS_Output
{
float fTessFactor [ 3 ] : SV_TessFactor ;
float fInsideTessFactor : SV_InsideTessFactor ;
};
struct HS_Input
{
float4 m_Position : SV_POSITION;
float4 m_Normal : TEXCOORD2;
};
HS_Output HS_ConstFunc ( InputPatch < HS_Input , 3 > I )
{
HS_Output O = (HS_Output)0;
O.fInsideTessFactor = I [ 0 ].m_Position.w + I [ 0 ].m_Normal.w;
return O;
}
[ domain ( "tri" ) ]
[ partitioning ( "fractional_odd" ) ]
[ outputtopology ( "triangle_cw" ) ]
[ patchconstantfunc ( "HS_ConstFunc" ) ]
[ outputcontrolpoints ( 3 ) ]
HS_Main_Output main( uint cpid : SV_OutputControlPointID )
{
HS_Main_Output output = ( HS_Main_Output ) 0 ;
output.m_Position = 0;
return output ;
}
gtests/Hlsl.FromFile.cpp
...@@ -165,6 +165,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -165,6 +165,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.hull.2.tesc", "main"}, {"hlsl.hull.2.tesc", "main"},
{"hlsl.hull.3.tesc", "main"}, {"hlsl.hull.3.tesc", "main"},
{"hlsl.hull.4.tesc", "main"}, {"hlsl.hull.4.tesc", "main"},
{"hlsl.hull.5.tesc", "main"},
{"hlsl.hull.void.tesc", "main"}, {"hlsl.hull.void.tesc", "main"},
{"hlsl.hull.ctrlpt-1.tesc", "main"}, {"hlsl.hull.ctrlpt-1.tesc", "main"},
{"hlsl.hull.ctrlpt-2.tesc", "main"}, {"hlsl.hull.ctrlpt-2.tesc", "main"},
......
hlsl/hlslParseHelper.cpp
...@@ -1999,6 +1999,11 @@ TIntermNode* HlslParseContext::transformEntryPoint(const TSourceLoc& loc, TFunct ...@@ -1999,6 +1999,11 @@ TIntermNode* HlslParseContext::transformEntryPoint(const TSourceLoc& loc, TFunct
TParameter& param = userFunction[i]; TParameter& param = userFunction[i];
argVars.push_back(makeInternalVariable(*param.name, *param.type)); argVars.push_back(makeInternalVariable(*param.name, *param.type));
argVars.back()->getWritableType().getQualifier().makeTemporary(); argVars.back()->getWritableType().getQualifier().makeTemporary();
// Track the input patch, which is the only non-builtin supported by hull shader PCF.
if (param.getDeclaredBuiltIn() == EbvInputPatch)
inputPatch = argVars.back();
TIntermSymbol* arg = intermediate.addSymbol(*argVars.back()); TIntermSymbol* arg = intermediate.addSymbol(*argVars.back());
handleFunctionArgument(&callee, callingArgs, arg); handleFunctionArgument(&callee, callingArgs, arg);
if (param.type->getQualifier().isParamInput()) { if (param.type->getQualifier().isParamInput()) {
...@@ -2218,9 +2223,6 @@ void HlslParseContext::remapEntryPointIO(TFunction& function, TVariable*& return ...@@ -2218,9 +2223,6 @@ void HlslParseContext::remapEntryPointIO(TFunction& function, TVariable*& return
synthesizeEditedInput(paramType); synthesizeEditedInput(paramType);
TVariable* argAsGlobal = makeIoVariable(function[i].name->c_str(), paramType, EvqVaryingIn); TVariable* argAsGlobal = makeIoVariable(function[i].name->c_str(), paramType, EvqVaryingIn);
inputs.push_back(argAsGlobal); inputs.push_back(argAsGlobal);
if (function[i].getDeclaredBuiltIn() == EbvInputPatch)
inputPatch = argAsGlobal;
} }
if (paramType.getQualifier().isParamOutput()) { if (paramType.getQualifier().isParamOutput()) {
TVariable* argAsGlobal = makeIoVariable(function[i].name->c_str(), paramType, EvqVaryingOut); TVariable* argAsGlobal = makeIoVariable(function[i].name->c_str(), paramType, EvqVaryingOut);
...@@ -9066,19 +9068,12 @@ TIntermSymbol* HlslParseContext::findTessLinkageSymbol(TBuiltInVariable biType) ...@@ -9066,19 +9068,12 @@ TIntermSymbol* HlslParseContext::findTessLinkageSymbol(TBuiltInVariable biType)
return intermediate.addSymbol(*it->second->getAsVariable()); return intermediate.addSymbol(*it->second->getAsVariable());
} }
// Finalization step: Add patch constant function invocation // Find the patch constant function (issues error, returns nullptr if not found)
void HlslParseContext::addPatchConstantInvocation() const TFunction* HlslParseContext::findPatchConstantFunction(const TSourceLoc& loc)
{ {
TSourceLoc loc;
loc.init();
// If there's no patch constant function, or we're not a HS, do nothing.
if (patchConstantFunctionName.empty() || language != EShLangTessControl)
return;
if (symbolTable.isFunctionNameVariable(patchConstantFunctionName)) { if (symbolTable.isFunctionNameVariable(patchConstantFunctionName)) {
error(loc, "can't use variable in patch constant function", patchConstantFunctionName.c_str(), ""); error(loc, "can't use variable in patch constant function", patchConstantFunctionName.c_str(), "");
return; return nullptr;
} }
const TString mangledName = patchConstantFunctionName + "("; const TString mangledName = patchConstantFunctionName + "(";
...@@ -9092,7 +9087,7 @@ void HlslParseContext::addPatchConstantInvocation() ...@@ -9092,7 +9087,7 @@ void HlslParseContext::addPatchConstantInvocation()
// allow any disambiguation of overloads. // allow any disambiguation of overloads.
if (candidateList.empty()) { if (candidateList.empty()) {
error(loc, "patch constant function not found", patchConstantFunctionName.c_str(), ""); error(loc, "patch constant function not found", patchConstantFunctionName.c_str(), "");
return; return nullptr;
} }
// Based on directed experiments, it appears that if there are overloaded patchconstantfunctions, // Based on directed experiments, it appears that if there are overloaded patchconstantfunctions,
...@@ -9100,9 +9095,22 @@ void HlslParseContext::addPatchConstantInvocation() ...@@ -9100,9 +9095,22 @@ void HlslParseContext::addPatchConstantInvocation()
// out if there is more than one candidate. // out if there is more than one candidate.
if (candidateList.size() > 1) { if (candidateList.size() > 1) {
error(loc, "ambiguous patch constant function", patchConstantFunctionName.c_str(), ""); error(loc, "ambiguous patch constant function", patchConstantFunctionName.c_str(), "");
return; return nullptr;
} }
return candidateList[0];
}
// Finalization step: Add patch constant function invocation
void HlslParseContext::addPatchConstantInvocation()
{
TSourceLoc loc;
loc.init();
// If there's no patch constant function, or we're not a HS, do nothing.
if (patchConstantFunctionName.empty() || language != EShLangTessControl)
return;
// Look for built-in variables in a function's parameter list. // Look for built-in variables in a function's parameter list.
const auto findBuiltIns = [&](const TFunction& function, std::set<tInterstageIoData>& builtIns) { const auto findBuiltIns = [&](const TFunction& function, std::set<tInterstageIoData>& builtIns) {
for (int p=0; p<function.getParamCount(); ++p) { for (int p=0; p<function.getParamCount(); ++p) {
...@@ -9167,7 +9175,13 @@ void HlslParseContext::addPatchConstantInvocation() ...@@ -9167,7 +9175,13 @@ void HlslParseContext::addPatchConstantInvocation()
// //
// 5/5B. Call the PCF inside an if test for (invocation id == 0). // 5/5B. Call the PCF inside an if test for (invocation id == 0).
TFunction& patchConstantFunction = const_cast<TFunction&>(*candidateList[0]); TFunction* patchConstantFunctionPtr = const_cast<TFunction*>(findPatchConstantFunction(loc));
if (patchConstantFunctionPtr == nullptr)
return;
TFunction& patchConstantFunction = *patchConstantFunctionPtr;
const int pcfParamCount = patchConstantFunction.getParamCount(); const int pcfParamCount = patchConstantFunction.getParamCount();
TIntermSymbol* invocationIdSym = findTessLinkageSymbol(EbvInvocationId); TIntermSymbol* invocationIdSym = findTessLinkageSymbol(EbvInvocationId);
TIntermSequence& epBodySeq = entryPointFunctionBody->getAsAggregate()->getSequence(); TIntermSequence& epBodySeq = entryPointFunctionBody->getAsAggregate()->getSequence();
...@@ -9248,10 +9262,9 @@ void HlslParseContext::addPatchConstantInvocation() ...@@ -9248,10 +9262,9 @@ void HlslParseContext::addPatchConstantInvocation()
// ================ Step 1B: Argument synthesis ================ // ================ Step 1B: Argument synthesis ================
// Create pcfArguments for synthesis of patchconstantfunction invocation // Create pcfArguments for synthesis of patchconstantfunction invocation
// TODO: handle struct or array inputs
{ {
for (int p=0; p<pcfParamCount; ++p) { for (int p=0; p<pcfParamCount; ++p) {
TIntermSymbol* inputArg = nullptr; TIntermTyped* inputArg = nullptr;
if (p == outPatchParam) { if (p == outPatchParam) {
if (perCtrlPtVar == nullptr) { if (perCtrlPtVar == nullptr) {
...@@ -9265,6 +9278,11 @@ void HlslParseContext::addPatchConstantInvocation() ...@@ -9265,6 +9278,11 @@ void HlslParseContext::addPatchConstantInvocation()
// find which built-in it is // find which built-in it is
const TBuiltInVariable biType = patchConstantFunction[p].getDeclaredBuiltIn(); const TBuiltInVariable biType = patchConstantFunction[p].getDeclaredBuiltIn();
if (biType == EbvInputPatch && inputPatch == nullptr) {
error(loc, "unimplemented: PCF input patch without entry point input patch parameter", "", "");
return;
}
inputArg = findTessLinkageSymbol(biType); inputArg = findTessLinkageSymbol(biType);
if (inputArg == nullptr) { if (inputArg == nullptr) {
......
hlsl/hlslParseHelper.h
...@@ -316,6 +316,9 @@ protected: ...@@ -316,6 +316,9 @@ protected:
static bool isClipOrCullDistance(const TQualifier& qual) { return isClipOrCullDistance(qual.builtIn); } static bool isClipOrCullDistance(const TQualifier& qual) { return isClipOrCullDistance(qual.builtIn); }
static bool isClipOrCullDistance(const TType& type) { return isClipOrCullDistance(type.getQualifier()); } static bool isClipOrCullDistance(const TType& type) { return isClipOrCullDistance(type.getQualifier()); }
// Find the patch constant function (issues error, returns nullptr if not found)
const TFunction* findPatchConstantFunction(const TSourceLoc& loc);
// Pass through to base class after remembering built-in mappings. // Pass through to base class after remembering built-in mappings.
using TParseContextBase::trackLinkage; using TParseContextBase::trackLinkage;
void trackLinkage(TSymbol& variable) override; void trackLinkage(TSymbol& variable) override;
...@@ -415,7 +418,8 @@ protected: ...@@ -415,7 +418,8 @@ protected:
}; };
TMap<tInterstageIoData, TVariable*> splitBuiltIns; // split built-ins, indexed by built-in type. TMap<tInterstageIoData, TVariable*> splitBuiltIns; // split built-ins, indexed by built-in type.
TVariable* inputPatch; TVariable* inputPatch; // input patch is special for PCF: it's the only non-builtin PCF input,
// and is handled as a pseudo-builtin.
unsigned int nextInLocation; unsigned int nextInLocation;
unsigned int nextOutLocation; unsigned int nextOutLocation;
......
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