From 66b103180e168c597f3c246c68a9886b69707493 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 16 Oct 2024 00:38:39 +0800 Subject: Move C interface from slang.h to slang-deprecated.h (#5301) * Squash redundant move warnings * Move C interface from slang.h to slang-deprecated.h spGetBuildTagString remains, because it's useful to have before the global session exists. This C API is used quite pervasively in the C++ helpers (for example slang::UserAttribute. It's not trivial to move these to slang-deprecated.h as they're entangled with some enums which are themselves used elsewhere in the compiler. The fact that these helpers use the C API can be viewed as an implementation detail for now, and this usage moved to slang-deprecated in due course. Closes https://github.com/shader-slang/slang/issues/4758 * Squash warnings for our usage of our deprecated API --------- Co-authored-by: Yong He --- tools/render-test/slang-support.cpp | 2 ++ tools/slang-test/slangc-tool.cpp | 2 ++ tools/slang-unit-test/unit-test-com-host-callable.cpp | 2 ++ tools/test-server/test-server-main.cpp | 2 ++ 4 files changed, 8 insertions(+) (limited to 'tools') diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp index 1f174dc72..2de67e538 100644 --- a/tools/render-test/slang-support.cpp +++ b/tools/render-test/slang-support.cpp @@ -51,7 +51,9 @@ void ShaderCompilerUtil::Output::reset() sessionDesc.preprocessorMacros = macros.getBuffer(); ComPtr slangRequest = nullptr; + SLANG_ALLOW_DEPRECATED_BEGIN globalSession->createCompileRequest(slangRequest.writeRef()); + SLANG_ALLOW_DEPRECATED_END out.m_requestForKernels = slangRequest; out.session = globalSession; diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp index 13e6b192e..159e6faf2 100644 --- a/tools/slang-test/slangc-tool.cpp +++ b/tools/slang-test/slangc-tool.cpp @@ -23,7 +23,9 @@ SlangResult SlangCTool::innerMain(StdWriters* stdWriters, slang::IGlobalSession* } ComPtr compileRequest; + SLANG_ALLOW_DEPRECATED_BEGIN SLANG_RETURN_ON_FAIL(session->createCompileRequest(compileRequest.writeRef())); + SLANG_ALLOW_DEPRECATED_END auto compilerExecutablePath = Path::getParentDirectory(Path::getExecutablePath()); compileRequest->addSearchPath(compilerExecutablePath.getBuffer()); diff --git a/tools/slang-unit-test/unit-test-com-host-callable.cpp b/tools/slang-unit-test/unit-test-com-host-callable.cpp index 82aa14aa4..29bc91739 100644 --- a/tools/slang-unit-test/unit-test-com-host-callable.cpp +++ b/tools/slang-unit-test/unit-test-com-host-callable.cpp @@ -181,7 +181,9 @@ SlangResult ComTestContext::_runTest() // Create a compile request Slang::ComPtr request; + SLANG_ALLOW_DEPRECATED_BEGIN SLANG_RETURN_ON_FAIL(slangSession->createCompileRequest(request.writeRef())); + SLANG_ALLOW_DEPRECATED_END // We want to compile to 'HOST_CALLABLE' here such that we can execute the Slang code. // diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp index ba77d9c84..bfc96af9a 100644 --- a/tools/test-server/test-server-main.cpp +++ b/tools/test-server/test-server-main.cpp @@ -114,7 +114,9 @@ SlangResult innerMain(StdWriters* stdWriters, slang::IGlobalSession* sharedSessi } ComPtr compileRequest; + SLANG_ALLOW_DEPRECATED_BEGIN SLANG_RETURN_ON_FAIL(session->createCompileRequest(compileRequest.writeRef())); + SLANG_ALLOW_DEPRECATED_END // Do any app specific configuration for (int i = 0; i < int{SLANG_WRITER_CHANNEL_COUNT_OF}; ++i) -- cgit v1.2.3