summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--slang.h4
-rw-r--r--source/compiler-core/slang-artifact-desc-util.cpp2
-rw-r--r--source/core/slang-type-convert-util.cpp2
-rw-r--r--source/core/slang-type-text-util.cpp4
-rw-r--r--source/slang/slang-compiler.cpp5
-rwxr-xr-xsource/slang/slang-compiler.h2
-rw-r--r--source/slang/slang-emit-c-like.cpp2
-rw-r--r--source/slang/slang-type-layout.cpp2
-rw-r--r--source/slang/slang.cpp4
9 files changed, 3 insertions, 24 deletions
diff --git a/slang.h b/slang.h
index 4458f31ea..cdd20f99b 100644
--- a/slang.h
+++ b/slang.h
@@ -588,8 +588,8 @@ extern "C"
SLANG_TARGET_UNKNOWN,
SLANG_TARGET_NONE,
SLANG_GLSL,
- SLANG_GLSL_VULKAN, //< deprecated: just use `SLANG_GLSL`
- SLANG_GLSL_VULKAN_ONE_DESC, //< deprecated
+ SLANG_GLSL_VULKAN_DEPRECATED, //< deprecated and removed: just use `SLANG_GLSL`.
+ SLANG_GLSL_VULKAN_ONE_DESC_DEPRECATED, //< deprecated and removed.
SLANG_HLSL,
SLANG_SPIRV,
SLANG_SPIRV_ASM,
diff --git a/source/compiler-core/slang-artifact-desc-util.cpp b/source/compiler-core/slang-artifact-desc-util.cpp
index 783833902..a4190992c 100644
--- a/source/compiler-core/slang-artifact-desc-util.cpp
+++ b/source/compiler-core/slang-artifact-desc-util.cpp
@@ -256,8 +256,6 @@ SLANG_HIERARCHICAL_ENUM(ArtifactStyle, SLANG_ARTIFACT_STYLE, SLANG_ARTIFACT_STYL
{
case SLANG_TARGET_UNKNOWN: return Desc::make(Kind::Unknown, Payload::None, Style::Unknown, 0);
case SLANG_TARGET_NONE: return Desc::make(Kind::None, Payload::None, Style::Unknown, 0);
- case SLANG_GLSL_VULKAN:
- case SLANG_GLSL_VULKAN_ONE_DESC:
case SLANG_GLSL:
{
// For the moment we Desc::make all just map to GLSL, but we could use flags
diff --git a/source/core/slang-type-convert-util.cpp b/source/core/slang-type-convert-util.cpp
index c763b2835..cb5b4d38b 100644
--- a/source/core/slang-type-convert-util.cpp
+++ b/source/core/slang-type-convert-util.cpp
@@ -9,8 +9,6 @@ namespace Slang
switch (target)
{
case SLANG_GLSL:
- case SLANG_GLSL_VULKAN:
- case SLANG_GLSL_VULKAN_ONE_DESC:
{
return SLANG_SOURCE_LANGUAGE_GLSL;
}
diff --git a/source/core/slang-type-text-util.cpp b/source/core/slang-type-text-util.cpp
index e6c575bc3..9fa91abf6 100644
--- a/source/core/slang-type-text-util.cpp
+++ b/source/core/slang-type-text-util.cpp
@@ -44,9 +44,7 @@ static const TypeTextUtil::CompileTargetInfo s_compileTargetInfos[] =
{ SLANG_DXBC_ASM, "dxbc-asm", "dxbc-asm,dxbc-assembly", "DirectX shader bytecode assembly" },
{ SLANG_DXIL, "dxil", "dxil", "DirectX Intermediate Language binary" },
{ SLANG_DXIL_ASM, "dxil-asm", "dxil-asm,dxil-assembly", "DirectX Intermediate Language assembly"},
- { SLANG_GLSL, "glsl,vert,frag,geom,tesc,tese,comp", "glsl", "GLSL source code" },
- { SLANG_GLSL_VULKAN, "", "glsl-vulkan", "GLSL Vulkan source code" },
- { SLANG_GLSL_VULKAN_ONE_DESC, "", "glsl-vulkan-one-desc", "GLSL Vulkan source code" },
+ { SLANG_GLSL, "glsl,vert,frag,geom,tesc,tese,comp", "glsl", "GLSL(Vulkan) source code" },
{ SLANG_SPIRV, "spv", "spirv", "SPIR-V binary"},
{ SLANG_SPIRV_ASM, "spv-asm", "spirv-asm,spirv-assembly", "SPIR-V assembly" },
{ SLANG_C_SOURCE, "c", "c", "C source code" },
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index fce01b770..cee104dc9 100644
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -563,11 +563,6 @@ namespace Slang
{
return PassThroughMode::Dxc;
}
- case CodeGenTarget::GLSL_Vulkan:
- case CodeGenTarget::GLSL_Vulkan_OneDesc:
- {
- return PassThroughMode::Glslang;
- }
case CodeGenTarget::MetalLib:
case CodeGenTarget::MetalLibAssembly:
{
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
index 8f1860433..056e6ea21 100755
--- a/source/slang/slang-compiler.h
+++ b/source/slang/slang-compiler.h
@@ -71,8 +71,6 @@ namespace Slang
Unknown = SLANG_TARGET_UNKNOWN,
None = SLANG_TARGET_NONE,
GLSL = SLANG_GLSL,
- GLSL_Vulkan = SLANG_GLSL_VULKAN,
- GLSL_Vulkan_OneDesc = SLANG_GLSL_VULKAN_ONE_DESC,
HLSL = SLANG_HLSL,
SPIRV = SLANG_SPIRV,
SPIRVAssembly = SLANG_SPIRV_ASM,
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 81b68038e..448a67bb9 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -58,8 +58,6 @@ struct CLikeSourceEmitter::ComputeEmitActionsContext
return SourceLanguage::Unknown;
}
case CodeGenTarget::GLSL:
- case CodeGenTarget::GLSL_Vulkan:
- case CodeGenTarget::GLSL_Vulkan_OneDesc:
{
return SourceLanguage::GLSL;
}
diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index bc7e4608f..623483efe 100644
--- a/source/slang/slang-type-layout.cpp
+++ b/source/slang/slang-type-layout.cpp
@@ -2030,8 +2030,6 @@ SourceLanguage getIntermediateSourceLanguageForTarget(TargetProgram* targetProgr
switch (targetProgram->getTargetReq()->getTarget())
{
case CodeGenTarget::GLSL:
- case CodeGenTarget::GLSL_Vulkan:
- case CodeGenTarget::GLSL_Vulkan_OneDesc:
// If we aren't emitting directly we are going to output GLSL to feed to GLSLANG
case CodeGenTarget::SPIRV:
case CodeGenTarget::SPIRVAssembly:
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index e87aeb399..67492d9b2 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -926,8 +926,6 @@ Profile getEffectiveProfile(EntryPoint* entryPoint, TargetRequest* target)
break;
case CodeGenTarget::GLSL:
- case CodeGenTarget::GLSL_Vulkan:
- case CodeGenTarget::GLSL_Vulkan_OneDesc:
case CodeGenTarget::SPIRV:
case CodeGenTarget::SPIRVAssembly:
if(targetProfile.getFamily() != ProfileFamily::GLSL)
@@ -1706,8 +1704,6 @@ CapabilitySet TargetRequest::getTargetCaps()
switch(getTarget())
{
case CodeGenTarget::GLSL:
- case CodeGenTarget::GLSL_Vulkan:
- case CodeGenTarget::GLSL_Vulkan_OneDesc:
isGLSLTarget = true;
atoms.add(CapabilityName::glsl);
break;
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 13:48:04 +0000