From 69d2651056137eb7c6e542491ae5fd59af095022 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Sat, 2 Mar 2019 08:22:38 -0500 Subject: #include not using search paths (#873) * Fix warnings from visual studio due to coercion losing data. * Removed searchDirectories from FrontEndCompileRequest and use the one in Linkage as that is the one that is changed via Slang API. * * Add searchPaths back to FrontEndRequest * Add comments to explain the issue * Add a test to check include paths --- tools/render-test/slang-support.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/render-test') diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp index f3042828f..269df5a69 100644 --- a/tools/render-test/slang-support.cpp +++ b/tools/render-test/slang-support.cpp @@ -105,16 +105,16 @@ RefPtr ShaderCompiler::compileProgram( for (auto typeName : request.entryPointGenericTypeArguments) rawEntryPointTypeNames.Add(typeName.Buffer()); - UInt globalExistentialTypeCount = request.globalExistentialTypeArguments.Count(); - for( UInt ii = 0; ii < globalExistentialTypeCount; ++ii ) + const int globalExistentialTypeCount = int(request.globalExistentialTypeArguments.Count()); + for(int ii = 0; ii < globalExistentialTypeCount; ++ii ) { spSetTypeNameForGlobalExistentialSlot(slangRequest, ii, request.globalExistentialTypeArguments[ii].Buffer()); } - UInt entryPointExistentialTypeCount = request.entryPointExistentialTypeArguments.Count(); + const int entryPointExistentialTypeCount = int(request.entryPointExistentialTypeArguments.Count()); auto setEntryPointExistentialTypeArgs = [&](int entryPoint) { - for( UInt ii = 0; ii < entryPointExistentialTypeCount; ++ii ) + for( int ii = 0; ii < entryPointExistentialTypeCount; ++ii ) { spSetTypeNameForEntryPointExistentialSlot(slangRequest, entryPoint, ii, request.entryPointExistentialTypeArguments[ii].Buffer()); } -- cgit v1.2.3