From 7258ef4ddebd021208a019f6ee73edcda57a88f7 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 20 Aug 2019 09:43:59 -0400 Subject: User defined downstream compiler prelude (#1028) * Added setDownstreamCompilerPrelude Renamed setPassThroughPath to setDownstreamCompilerPath. Fixed tests. Added prelude directory & code to TestToolUtil to setup default preludes for testing/command line apis. * Fix merge problem * Remove hacks to make prelude work by adding a search path as no longer needed with 'user prelude'. * Split up prelude into scalar intrinsics, and types. Use slang.h for main header. slang-cpp-prelude.h can now just include what it needs (relative to prelude directory) and define the few remaining things/work arounds. * Fix typo. --- tools/render-test/render-test-main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools/render-test/render-test-main.cpp') diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 91230b9d0..e8170be40 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -13,13 +13,14 @@ #include "shader-renderer-util.h" +#include "../source/core/slang-io.h" + #include "shader-input-layout.h" #include #include -// TODO(JS): We need to put the prelude into a better place #define SLANG_PRELUDE_NAMESPACE CPPPrelude -#include "../../tests/cross-compile/slang-cpp-prelude.h" +#include "../../prelude/slang-cpp-types.h" #include "../../source/core/slang-test-tool-util.h" #include "../../source/core/slang-memory-arena.h" @@ -1059,6 +1060,8 @@ int main(int argc, char** argv) using namespace Slang; SlangSession* session = spCreateSession(nullptr); + TestToolUtil::setSessionDefaultPrelude(argv[0], session); + auto stdWriters = StdWriters::initDefaultSingleton(); SlangResult res = innerMain(stdWriters, session, argc, argv); -- cgit v1.2.3