Revert "[linux-port] Fix nested macro expansion issue."
This reverts commit 8ea0608ed5.
This commit is contained in:
Tex Riddell
Родитель
2bfa749226
Коммит
82337009a4
|
|
@ -50,36 +50,36 @@ const SigPoint SigPoint::ms_SigPoints[kNumSigPointRecords] = {
|
||||||
// <py::lines('INTERPRETATION-TABLE')>hctdb_instrhelp.get_interpretation_table()</py>
|
// <py::lines('INTERPRETATION-TABLE')>hctdb_instrhelp.get_interpretation_table()</py>
|
||||||
// INTERPRETATION-TABLE:BEGIN
|
// INTERPRETATION-TABLE:BEGIN
|
||||||
// Semantic, VSIn, VSOut, PCIn, HSIn, HSCPIn, HSCPOut, PCOut, DSIn, DSCPIn, DSOut, GSVIn, GSIn, GSOut, PSIn, PSOut, CSIn
|
// Semantic, VSIn, VSOut, PCIn, HSIn, HSCPIn, HSCPOut, PCOut, DSIn, DSCPIn, DSOut, GSVIn, GSIn, GSOut, PSIn, PSOut, CSIn
|
||||||
#define DO_INTERPRETATION_TABLE(D) \
|
#define DO_INTERPRETATION_TABLE(ROW) \
|
||||||
{/*Arbitrary*/ D(Arb), D(Arb), D(NA), D(NA), D(Arb), D(Arb), D(Arb), D(Arb), D(Arb), D(Arb), D(Arb), D(NA), D(Arb), D(Arb), D(NA), D(NA)}, \
|
ROW(Arbitrary, Arb, Arb, NA, NA, Arb, Arb, Arb, Arb, Arb, Arb, Arb, NA, Arb, Arb, NA, NA) \
|
||||||
{/*VertexID*/ D(SV), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(VertexID, SV, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA) \
|
||||||
{/*InstanceID*/ D(SV), D(Arb), D(NA), D(NA), D(Arb), D(Arb), D(NA), D(NA), D(Arb), D(Arb), D(Arb), D(NA), D(Arb), D(Arb), D(NA), D(NA)}, \
|
ROW(InstanceID, SV, Arb, NA, NA, Arb, Arb, NA, NA, Arb, Arb, Arb, NA, Arb, Arb, NA, NA) \
|
||||||
{/*Position*/ D(Arb), D(SV), D(NA), D(NA), D(SV), D(SV), D(Arb), D(Arb), D(SV), D(SV), D(SV), D(NA), D(SV), D(SV), D(NA), D(NA)}, \
|
ROW(Position, Arb, SV, NA, NA, SV, SV, Arb, Arb, SV, SV, SV, NA, SV, SV, NA, NA) \
|
||||||
{/*RenderTargetArrayIndex*/ D(Arb), D(SV), D(NA), D(NA), D(SV), D(SV), D(Arb), D(Arb), D(SV), D(SV), D(SV), D(NA), D(SV), D(SV), D(NA), D(NA)}, \
|
ROW(RenderTargetArrayIndex, Arb, SV, NA, NA, SV, SV, Arb, Arb, SV, SV, SV, NA, SV, SV, NA, NA) \
|
||||||
{/*ViewPortArrayIndex*/ D(Arb), D(SV), D(NA), D(NA), D(SV), D(SV), D(Arb), D(Arb), D(SV), D(SV), D(SV), D(NA), D(SV), D(SV), D(NA), D(NA)}, \
|
ROW(ViewPortArrayIndex, Arb, SV, NA, NA, SV, SV, Arb, Arb, SV, SV, SV, NA, SV, SV, NA, NA) \
|
||||||
{/*ClipDistance*/ D(Arb), D(SV), D(NA), D(NA), D(SV), D(SV), D(Arb), D(Arb), D(SV), D(SV), D(SV), D(NA), D(SV), D(SV), D(NA), D(NA)}, \
|
ROW(ClipDistance, Arb, SV, NA, NA, SV, SV, Arb, Arb, SV, SV, SV, NA, SV, SV, NA, NA) \
|
||||||
{/*CullDistance*/ D(Arb), D(SV), D(NA), D(NA), D(SV), D(SV), D(Arb), D(Arb), D(SV), D(SV), D(SV), D(NA), D(SV), D(SV), D(NA), D(NA)}, \
|
ROW(CullDistance, Arb, SV, NA, NA, SV, SV, Arb, Arb, SV, SV, SV, NA, SV, SV, NA, NA) \
|
||||||
{/*OutputControlPointID*/ D(NA), D(NA), D(NA), D(NotInSig), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(OutputControlPointID, NA, NA, NA, NotInSig, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA) \
|
||||||
{/*DomainLocation*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(DomainLocation, NA, NA, NA, NA, NA, NA, NA, NotInSig, NA, NA, NA, NA, NA, NA, NA, NA) \
|
||||||
{/*PrimitiveID*/ D(NA), D(NA), D(NotInSig), D(NotInSig), D(NA), D(NA), D(NA), D(NotInSig), D(NA), D(NA), D(NA), D(Shadow), D(SGV), D(SGV), D(NA), D(NA)}, \
|
ROW(PrimitiveID, NA, NA, NotInSig, NotInSig, NA, NA, NA, NotInSig, NA, NA, NA, Shadow, SGV, SGV, NA, NA) \
|
||||||
{/*GSInstanceID*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(GSInstanceID, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig, NA, NA, NA, NA) \
|
||||||
{/*SampleIndex*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(Shadow _41), D(NA), D(NA)}, \
|
ROW(SampleIndex, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, Shadow _41, NA, NA) \
|
||||||
{/*IsFrontFace*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(SGV), D(SGV), D(NA), D(NA)}, \
|
ROW(IsFrontFace, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, SGV, SGV, NA, NA) \
|
||||||
{/*Coverage*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig _50), D(NotPacked _41), D(NA)}, \
|
ROW(Coverage, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig _50, NotPacked _41, NA) \
|
||||||
{/*InnerCoverage*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig _50), D(NA), D(NA)}, \
|
ROW(InnerCoverage, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig _50, NA, NA) \
|
||||||
{/*Target*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(Target), D(NA)}, \
|
ROW(Target, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, Target, NA) \
|
||||||
{/*Depth*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotPacked), D(NA)}, \
|
ROW(Depth, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotPacked, NA) \
|
||||||
{/*DepthLessEqual*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotPacked _50), D(NA)}, \
|
ROW(DepthLessEqual, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotPacked _50, NA) \
|
||||||
{/*DepthGreaterEqual*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotPacked _50), D(NA)}, \
|
ROW(DepthGreaterEqual, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotPacked _50, NA) \
|
||||||
{/*StencilRef*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotPacked _50), D(NA)}, \
|
ROW(StencilRef, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotPacked _50, NA) \
|
||||||
{/*DispatchThreadID*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig)}, \
|
ROW(DispatchThreadID, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig) \
|
||||||
{/*GroupID*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig)}, \
|
ROW(GroupID, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig) \
|
||||||
{/*GroupIndex*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig)}, \
|
ROW(GroupIndex, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig) \
|
||||||
{/*GroupThreadID*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotInSig)}, \
|
ROW(GroupThreadID, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotInSig) \
|
||||||
{/*TessFactor*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(TessFactor), D(TessFactor), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(TessFactor, NA, NA, NA, NA, NA, NA, TessFactor, TessFactor, NA, NA, NA, NA, NA, NA, NA, NA) \
|
||||||
{/*InsideTessFactor*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(TessFactor), D(TessFactor), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA)}, \
|
ROW(InsideTessFactor, NA, NA, NA, NA, NA, NA, TessFactor, TessFactor, NA, NA, NA, NA, NA, NA, NA, NA) \
|
||||||
{/*ViewID*/ D(NotInSig _61), D(NA), D(NotInSig _61), D(NotInSig _61), D(NA), D(NA), D(NA), D(NotInSig _61), D(NA), D(NA), D(NA), D(NotInSig _61), D(NA), D(NotInSig _61), D(NA), D(NA)}, \
|
ROW(ViewID, NotInSig _61, NA, NotInSig _61, NotInSig _61, NA, NA, NA, NotInSig _61, NA, NA, NA, NotInSig _61, NA, NotInSig _61, NA, NA) \
|
||||||
{/*Barycentrics*/ D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NA), D(NotPacked _61), D(NA), D(NA)},
|
ROW(Barycentrics, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NotPacked _61, NA, NA)
|
||||||
// INTERPRETATION-TABLE:END
|
// INTERPRETATION-TABLE:END
|
||||||
|
|
||||||
const VersionedSemanticInterpretation SigPoint::ms_SemanticInterpretationTable[(unsigned)DXIL::SemanticKind::Invalid][(unsigned)SigPoint::Kind::Invalid] = {
|
const VersionedSemanticInterpretation SigPoint::ms_SemanticInterpretationTable[(unsigned)DXIL::SemanticKind::Invalid][(unsigned)SigPoint::Kind::Invalid] = {
|
||||||
|
|
@ -87,7 +87,9 @@ const VersionedSemanticInterpretation SigPoint::ms_SemanticInterpretationTable[(
|
||||||
#define _50 ,5,0
|
#define _50 ,5,0
|
||||||
#define _61 ,6,1
|
#define _61 ,6,1
|
||||||
#define DO(k) VersionedSemanticInterpretation(DXIL::SemanticInterpretationKind::k)
|
#define DO(k) VersionedSemanticInterpretation(DXIL::SemanticInterpretationKind::k)
|
||||||
DO_INTERPRETATION_TABLE(DO)
|
#define DO_ROW(SEM, VSIn, VSOut, PCIn, HSIn, HSCPIn, HSCPOut, PCOut, DSIn, DSCPIn, DSOut, GSVIn, GSIn, GSOut, PSIn, PSOut, CSIn) \
|
||||||
|
{ DO(VSIn), DO(VSOut), DO(PCIn), DO(HSIn), DO(HSCPIn), DO(HSCPOut), DO(PCOut), DO(DSIn), DO(DSCPIn), DO(DSOut), DO(GSVIn), DO(GSIn), DO(GSOut), DO(PSIn), DO(PSOut), DO(CSIn) },
|
||||||
|
DO_INTERPRETATION_TABLE(DO_ROW)
|
||||||
#undef DO_ROW
|
#undef DO_ROW
|
||||||
#undef DO
|
#undef DO
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче