summaryrefslogtreecommitdiffstats
path: root/source/slang
diff options
context:
space:
mode:
authorJay Kwak <82421531+jkwak-work@users.noreply.github.com>2024-10-25 15:59:17 -0700
committerGitHub <noreply@github.com>2024-10-25 15:59:17 -0700
commitd8969d87dcc9eea3f186a0c93c5e48d3d1659e05 (patch)
treea7c17a8d8ce08bdd1551ba4815de809a4d1783f6 /source/slang
parent4bad669bbc5ec3ff77321f083c59cde87eb10229 (diff)
Replace stdlib with core-module on files and projects (#5411)
This commit renames the files and projects to prefer "core-module" over "stdlib". The directory name `source/slang-stdlib` needs to be renamed too, and there will be another commit for it soon.
Diffstat (limited to 'source/slang')
-rw-r--r--source/slang/CMakeLists.txt24
-rw-r--r--source/slang/slang-core-module-textures.cpp (renamed from source/slang/slang-stdlib-textures.cpp)4
-rw-r--r--source/slang/slang-core-module-textures.h (renamed from source/slang/slang-stdlib-textures.h)0
-rw-r--r--source/slang/slang-core-module.cpp (renamed from source/slang/slang-stdlib.cpp)2
4 files changed, 14 insertions, 16 deletions
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt
index 8e3be2069..a08ad1efc 100644
--- a/source/slang/CMakeLists.txt
+++ b/source/slang/CMakeLists.txt
@@ -205,22 +205,22 @@ set(slang_public_lib_args
${slang_SOURCE_DIR}/include/slang*.h
${CMAKE_CURRENT_BINARY_DIR}/slang-version-header/*.h
LINK_WITH_PRIVATE
- $<IF:$<BOOL:${SLANG_EMBED_STDLIB}>,slang-embedded-stdlib,slang-no-embedded-stdlib>
- $<IF:$<BOOL:${SLANG_EMBED_STDLIB_SOURCE}>,slang-embedded-stdlib-source,slang-no-embedded-stdlib-source>
+ $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE}>,slang-embedded-core-module,slang-no-embedded-core-module>
+ $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE_SOURCE}>,slang-embedded-core-module-source,slang-no-embedded-core-module-source>
INSTALL
)
#
-# Minimal static slang used in generating the embedded stdlib
+# Minimal static slang used in generating the embedded core module
#
#
# Slang itself
#
-if(NOT SLANG_EMBED_STDLIB)
- # If we're not embedding stdlib we can just do a normal build of slang,
- # including all the options, this can also serve as our no embedded stdlib
+if(NOT SLANG_EMBED_CORE_MODULE)
+ # If we're not embedding core module we can just do a normal build of slang,
+ # including all the options, this can also serve as our no embedded core module
# library for slang-bootstrap (not that we need that anyway)
slang_add_target(
.
@@ -231,10 +231,10 @@ if(NOT SLANG_EMBED_STDLIB)
${slang_public_lib_args}
INSTALL_COMPONENT generators
)
- add_library(slang-without-embedded-stdlib ALIAS slang)
+ add_library(slang-without-embedded-core-module ALIAS slang)
else()
- # However if we're embedding stdlib, we need to make two different
- # libraries, one with the embedded stdlib and one without, so first define
+ # However if we're embedding core module, we need to make two different
+ # libraries, one with the embedded core module and one without, so first define
# the shared objects as one target so we don't build them twice.
slang_add_target(
.
@@ -251,12 +251,12 @@ else()
${slang_interface_args}
NO_SOURCE
TARGET_NAME
- slang-without-embedded-stdlib
+ slang-without-embedded-core-module
EXCLUDE_FROM_ALL
LINK_WITH_PRIVATE
slang-common-objects
- slang-no-embedded-stdlib
- slang-embedded-stdlib-source
+ slang-no-embedded-core-module
+ slang-embedded-core-module-source
OUTPUT_DIR generators
FOLDER generators
INSTALL_COMPONENT generators
diff --git a/source/slang/slang-stdlib-textures.cpp b/source/slang/slang-core-module-textures.cpp
index c9b7598c7..a74a954d5 100644
--- a/source/slang/slang-stdlib-textures.cpp
+++ b/source/slang/slang-core-module-textures.cpp
@@ -1,7 +1,7 @@
-#include "slang-stdlib-textures.h"
+#include "slang-core-module-textures.h"
#include <spirv/unified1/spirv.h>
-#define EMIT_LINE_DIRECTIVE() sb << "#line " << (__LINE__+1) << " \"slang-stdlib-textures.cpp\"\n"
+#define EMIT_LINE_DIRECTIVE() sb << "#line " << (__LINE__+1) << " \"slang-core-module-textures.cpp\"\n"
namespace Slang
{
diff --git a/source/slang/slang-stdlib-textures.h b/source/slang/slang-core-module-textures.h
index a521a44d3..a521a44d3 100644
--- a/source/slang/slang-stdlib-textures.h
+++ b/source/slang/slang-core-module-textures.h
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-core-module.cpp
index e28d95ad5..8867ba1c3 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-core-module.cpp
@@ -1,5 +1,3 @@
-// slang-stdlib.cpp
-
#include "slang-compiler.h"
#include "slang-ir.h"
#include "../core/slang-string-util.h"