summaryrefslogtreecommitdiffstats
path: root/tools/slang-reflection-test/main.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-12-21 11:00:28 -0500
committerGitHub <noreply@github.com>2018-12-21 11:00:28 -0500
commitefa2c8f41aa5cd2c27990fd9b57ea0eff06976e7 (patch)
tree4c1a4d8e6e71e81c42cfbf315610e380d75527bf /tools/slang-reflection-test/main.cpp
parentb5bda9b3d155234be079debe6997cbc900773cf2 (diff)
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
Diffstat (limited to 'tools/slang-reflection-test/main.cpp')
-rw-r--r--tools/slang-reflection-test/main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/slang-reflection-test/main.cpp b/tools/slang-reflection-test/main.cpp
index ad474ee70..04818dfdf 100644
--- a/tools/slang-reflection-test/main.cpp
+++ b/tools/slang-reflection-test/main.cpp
@@ -8,7 +8,7 @@
#include <slang.h>
#include <slang-com-helper.h>
-#include "../../source/core/slang-app-context.h"
+#include "../../source/core/slang-test-tool-util.h"
struct PrettyWriter
{
@@ -19,7 +19,7 @@ struct PrettyWriter
static void writeRaw(PrettyWriter& writer, char const* begin, char const* end)
{
SLANG_ASSERT(end >= begin);
- Slang::AppContext::getStdOut().write(begin, size_t(end - begin));
+ Slang::StdWriters::getOut().write(begin, size_t(end - begin));
}
static void writeRaw(PrettyWriter& writer, char const* begin)
@@ -80,7 +80,7 @@ static void write(PrettyWriter& writer, char const* text)
static void write(PrettyWriter& writer, SlangUInt val)
{
adjust(writer);
- Slang::AppContext::getStdOut().print("%llu", (unsigned long long)val);
+ Slang::StdWriters::getOut().print("%llu", (unsigned long long)val);
}
static void emitReflectionVarInfoJSON(PrettyWriter& writer, slang::VariableReflection* var);
@@ -893,18 +893,18 @@ static SlangResult maybeDumpDiagnostic(SlangResult res, SlangCompileRequest* req
const char* diagnostic;
if (SLANG_FAILED(res) && (diagnostic = spGetDiagnosticOutput(request)))
{
- Slang::AppContext::getStdError().put(diagnostic);
+ Slang::StdWriters::getError().put(diagnostic);
}
return res;
}
-SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(Slang::AppContext* appContext, SlangSession* session, int argc, const char*const* argv)
+SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSession* session, int argc, const char*const* argv)
{
- Slang::AppContext::setSingleton(appContext);
+ Slang::StdWriters::setSingleton(stdWriters);
SlangCompileRequest* request = spCreateCompileRequest(session);
- appContext->configureRequest(request);
+ stdWriters->setRequestWriters(request);
char const* appName = "slang-reflection-test";
if (argc > 0) appName = argv[0];
@@ -928,7 +928,7 @@ int main(
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;