From 200e236d64a02d9e85cb4a459477e073b81f5182 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 1 Dec 2020 17:29:01 -0500 Subject: Make SlangCompileRequest COM type (#1620) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP for COM CompileRequest. * Add more methods to IGlobalSession. * Fix createCompileRequest. Made slangc tool use COM style methods. * m_ prefix variables in EndToEndCompileRequest --- source/slang/slang-check-shader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/slang/slang-check-shader.cpp') diff --git a/source/slang/slang-check-shader.cpp b/source/slang/slang-check-shader.cpp index 7793dfcbc..800a0519f 100644 --- a/source/slang/slang-check-shader.cpp +++ b/source/slang/slang-check-shader.cpp @@ -1513,7 +1513,7 @@ namespace Slang List globalSpecializationArgs; parseSpecializationArgStrings( endToEndReq, - endToEndReq->globalSpecializationArgStrings, + endToEndReq->m_globalSpecializationArgStrings, globalSpecializationArgs); // Don't proceed further if anything failed to parse. @@ -1548,11 +1548,11 @@ namespace Slang // ahead and consider all the entry points that were found // by the front-end. // - Index entryPointCount = endToEndReq->entryPoints.getCount(); + Index entryPointCount = endToEndReq->m_entryPoints.getCount(); if( entryPointCount == 0 ) { entryPointCount = unspecializedProgram->getEntryPointCount(); - endToEndReq->entryPoints.setCount(entryPointCount); + endToEndReq->m_entryPoints.setCount(entryPointCount); } return specializedProgram; @@ -1617,7 +1617,7 @@ namespace Slang // We will thus draw a distinction between the "specified" entry points, // and the "found" entry points. // - auto specifiedEntryPointCount = endToEndReq->entryPoints.getCount(); + auto specifiedEntryPointCount = endToEndReq->m_entryPoints.getCount(); auto foundEntryPointCount = unspecializedGlobalAndEntryPointsComponentType->getEntryPointCount(); SLANG_ASSERT(foundEntryPointCount >= specifiedEntryPointCount); @@ -1627,7 +1627,7 @@ namespace Slang // for(Index ii = 0; ii < specifiedEntryPointCount; ++ii) { - auto& entryPointInfo = endToEndReq->entryPoints[ii]; + auto& entryPointInfo = endToEndReq->m_entryPoints[ii]; auto unspecializedEntryPoint = unspecializedGlobalAndEntryPointsComponentType->getEntryPoint(ii); auto specializedEntryPoint = createSpecializedEntryPoint(endToEndReq, unspecializedEntryPoint, entryPointInfo); -- cgit v1.2.3