From 1e7100eb9032e56f343c84a75613608ba022c906 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 10 Jan 2025 15:17:50 -0800
Subject: [PATCH 1/3] Fix documentation on DescriptorHandle.
---
source/slang/hlsl.meta.slang | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index 7964e26d8d..dac49b5a92 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -20932,6 +20932,8 @@ struct ConstBufferPointer
// new aliased bindings for each distinct cast type.
//
+//@public:
+
/// Represent the kind of a descriptor type.
enum DescriptorKind
{
@@ -21048,8 +21050,18 @@ ${{{{
}
}}}}
-/// Represents a bindless resource handle. A bindless resource handle is always a concrete type and can be
+/// Represents a bindless handle to a descriptor. A descriptor handle is always a ordinary data type and can be
/// declared in any memory location.
+/// @remarks Opaque descriptor types such as textures(`Texture2D` etc.), `SamplerState` and buffers (e.g. `StructuredBuffer`)
+/// can have undefined size and data representation on many targets. On platforms such as Vulkan and D3D12, descriptors are
+/// communicated to the shader code by calling the host side API to write the descriptor into a descriptor set or table, instead
+/// of directly writing bytes into an ordinary GPU accessible buffer. As a result, oapque handle types cannot be used in places
+/// that refer to a ordinary buffer location, such as as element types of a `StructuredBuffer`.
+/// However, a `DescriptorHandle<T>` stores a handle (or address) to the actual descriptor, and is always an ordinary data type
+/// that can be manipulated directly in the shader code. This gives the developer the flexibility to embed and pass around descriptor
+/// parameters throughout the code, to enable cleaner modular designs.
+/// See [User Guide](https://shader-slang.com/slang/user-guide/convenience-features.html#descriptorhandle-for-bindless-descriptor-access)
+/// for more information on how to use `DescriptorHandle<T>` in your code.
__magic_type(DescriptorHandleType)
__intrinsic_type($(kIROp_DescriptorHandleType))
struct DescriptorHandle<T:IOpaqueDescriptor> : IComparable
@@ -21140,6 +21152,8 @@ extern T getDescriptorFromHandle<T:IOpaqueDescriptor>(DescriptorHandle<T> handle
__intrinsic_op($(kIROp_NonUniformResourceIndex))
DescriptorHandle<T> nonuniform<T:IOpaqueDescriptor>(DescriptorHandle<T> ptr);
+//@hidden:
+
__glsl_version(450)
__glsl_extension(GL_ARB_shader_clock)
[require(glsl_spirv, GL_ARB_shader_clock)]
From 4a6b7ae8cde30f7898e1fd889eb850f55a084d7a Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 10 Jan 2025 15:18:40 -0800
Subject: [PATCH 2/3] Fix.
---
source/slang/hlsl.meta.slang | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index dac49b5a92..11c4ab6f45 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -21050,7 +21050,7 @@ ${{{{
}
}}}}
-/// Represents a bindless handle to a descriptor. A descriptor handle is always a ordinary data type and can be
+/// Represents a bindless handle to a descriptor. A descriptor handle is always an ordinary data type and can be
/// declared in any memory location.
/// @remarks Opaque descriptor types such as textures(`Texture2D` etc.), `SamplerState` and buffers (e.g. `StructuredBuffer`)
/// can have undefined size and data representation on many targets. On platforms such as Vulkan and D3D12, descriptors are
From 3eb559d3a792ee3d58eebd01cd5693e5963d6dd6 Mon Sep 17 00:00:00 2001
From: slangbot <186143334+slangbot@users.noreply.github.com>
Date: Tue, 14 Jan 2025 18:37:38 +0000
Subject: [PATCH 3/3] format code
---
cmake/SlangTarget.cmake | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/cmake/SlangTarget.cmake b/cmake/SlangTarget.cmake
index 45e7cf1e1d..eae5cf35e4 100644
--- a/cmake/SlangTarget.cmake
+++ b/cmake/SlangTarget.cmake
@@ -505,10 +505,14 @@ function(slang_add_target dir type)
endif()
install(
TARGETS ${target} ${export_args}
- ARCHIVE DESTINATION ${archive_subdir} ${ARGN}
- LIBRARY DESTINATION ${library_subdir} ${ARGN}
- RUNTIME DESTINATION ${runtime_subdir} ${ARGN}
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ${ARGN}
+ ARCHIVE DESTINATION ${archive_subdir}
+ ${ARGN}
+ LIBRARY DESTINATION ${library_subdir}
+ ${ARGN}
+ RUNTIME DESTINATION ${runtime_subdir}
+ ${ARGN}
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ ${ARGN}
)
endmacro()