From efa2c8f41aa5cd2c27990fd9b57ea0eff06976e7 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 21 Dec 2018 11:00:28 -0500 Subject: Feature/remove app context (#765) * Remove AppContext. Use StdChannels to hold writers, and TestToolUtil to hold test tool specific functionality. * StdChannels -> StdWriters * getStdOut -> getOut, getStdError -> getError --- tools/render-test/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/render-test/main.cpp') diff --git a/tools/render-test/main.cpp b/tools/render-test/main.cpp index dab8e9c6e..69874ac04 100644 --- a/tools/render-test/main.cpp +++ b/tools/render-test/main.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../source/core/slang-app-context.h" +#include "../../source/core/slang-test-tool-util.h" #define WIN32_LEAN_AND_MEAN #define NOMINMAX @@ -491,15 +491,15 @@ Result RenderTestApp::writeScreen(const char* filename) } // namespace renderer_test -SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(Slang::AppContext* appContext, SlangSession* session, int argcIn, const char*const* argvIn) +SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSession* session, int argcIn, const char*const* argvIn) { using namespace renderer_test; using namespace Slang; - AppContext::setSingleton(appContext); + StdWriters::setSingleton(stdWriters); // Parse command-line options - SLANG_RETURN_ON_FAIL(parseOptions(argcIn, argvIn, AppContext::getStdError())); + SLANG_RETURN_ON_FAIL(parseOptions(argcIn, argvIn, StdWriters::getError())); RefPtr window(new renderer_test::Window); SLANG_RETURN_ON_FAIL(window->initialize(gWindowWidth, gWindowHeight)); @@ -671,7 +671,7 @@ SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(Slang::AppContext* appContex int main(int argc, char** argv) { SlangSession* session = spCreateSession(nullptr); - SlangResult res = innerMain(Slang::AppContext::initDefault(), session, argc, argv); + SlangResult res = innerMain(Slang::StdWriters::initDefault(), session, argc, argv); spDestroySession(session); return SLANG_FAILED(res) ? 1 : 0; -- cgit v1.2.3