rename DescriptorHandle::handle to DescriptorHandle::value (#338)

Author: skallweitNV

include/slang-rhi.h

@@ -535,7 +535,7 @@ enum class DescriptorHandleAccess
 struct DescriptorHandle
 {
     DescriptorHandleType type = DescriptorHandleType::Undefined;
-    uint64_t handle;
+    uint64_t value;
 
     explicit operator bool() const { return type != DescriptorHandleType::Undefined; }
 };

src/d3d12/d3d12-bindless-descriptor-set.cpp

@@ -90,7 +90,7 @@ Result BindlessDescriptorSet::allocBufferHandle(
         return SLANG_E_INVALID_ARG;
     }
 
-    outHandle->handle = m_srvUavHeapOffset + slot;
+    outHandle->value = m_srvUavHeapOffset + slot;
 
     return SLANG_OK;
 }
@@ -129,7 +129,7 @@ Result BindlessDescriptorSet::allocTextureHandle(
         return SLANG_E_INVALID_ARG;
     }
 
-    outHandle->handle = m_srvUavHeapOffset + m_firstTextureHandle + slot;
+    outHandle->value = m_srvUavHeapOffset + m_firstTextureHandle + slot;
 
     return SLANG_OK;
 }
@@ -148,7 +148,7 @@ Result BindlessDescriptorSet::allocSamplerHandle(ISampler* sampler, DescriptorHa
     );
 
     outHandle->type = DescriptorHandleType::Sampler;
-    outHandle->handle = m_samplerHeapOffset + slot;
+    outHandle->value = m_samplerHeapOffset + slot;
 
     return SLANG_OK;
 }
@@ -170,7 +170,7 @@ Result BindlessDescriptorSet::allocAccelerationStructureHandle(
     );
 
     outHandle->type = DescriptorHandleType::AccelerationStructure;
-    outHandle->handle = m_srvUavHeapOffset + m_firstAccelerationStructureHandle + slot;
+    outHandle->value = m_srvUavHeapOffset + m_firstAccelerationStructureHandle + slot;
 
     return SLANG_OK;
 }
@@ -181,15 +181,15 @@ Result BindlessDescriptorSet::freeHandle(const DescriptorHandle& handle)
     {
     case DescriptorHandleType::Buffer:
     case DescriptorHandleType::RWBuffer:
-        return m_bufferAllocator.free(handle.handle - m_srvUavHeapOffset);
+        return m_bufferAllocator.free(handle.value - m_srvUavHeapOffset);
     case DescriptorHandleType::Texture:
     case DescriptorHandleType::RWTexture:
-        return m_textureAllocator.free(handle.handle - m_srvUavHeapOffset - m_firstTextureHandle);
+        return m_textureAllocator.free(handle.value - m_srvUavHeapOffset - m_firstTextureHandle);
     case DescriptorHandleType::Sampler:
-        return m_samplerAllocator.free(handle.handle - m_samplerHeapOffset);
+        return m_samplerAllocator.free(handle.value - m_samplerHeapOffset);
     case DescriptorHandleType::AccelerationStructure:
         return m_accelerationStructureAllocator.free(
-            handle.handle - m_srvUavHeapOffset - m_firstAccelerationStructureHandle
+            handle.value - m_srvUavHeapOffset - m_firstAccelerationStructureHandle
         );
     default:
         return SLANG_E_INVALID_ARG;

src/shader-object.cpp

@@ -327,7 +327,7 @@ Result ShaderObject::setDescriptorHandle(const ShaderOffset& offset, const Descr
         return SLANG_E_INVALID_ARG;
     }
 
-    ::memcpy(m_data.data() + offset.uniformOffset, &handle.handle, 8);
+    ::memcpy(m_data.data() + offset.uniformOffset, &handle.value, 8);
 
     incrementVersion();
 

src/vulkan/vk-bindless-descriptor-set.cpp

@@ -196,7 +196,7 @@ Result BindlessDescriptorSet::allocBufferHandle(
     const auto& api = m_device->m_api;
     api.vkUpdateDescriptorSets(api.m_device, 1, &write, 0, nullptr);
 
-    outHandle->handle = slot;
+    outHandle->value = slot;
 
     return SLANG_OK;
 }
@@ -241,7 +241,7 @@ Result BindlessDescriptorSet::allocTextureHandle(
     const auto& api = m_device->m_api;
     api.vkUpdateDescriptorSets(api.m_device, 1, &write, 0, nullptr);
 
-    outHandle->handle = m_firstTextureHandle + slot;
+    outHandle->value = m_firstTextureHandle + slot;
 
     return SLANG_OK;
 }
@@ -269,7 +269,7 @@ Result BindlessDescriptorSet::allocSamplerHandle(ISampler* sampler, DescriptorHa
     api.vkUpdateDescriptorSets(api.m_device, 1, &write, 0, nullptr);
 
     outHandle->type = DescriptorHandleType::Sampler;
-    outHandle->handle = slot;
+    outHandle->value = slot;
 
     return SLANG_OK;
 }
@@ -302,7 +302,7 @@ Result BindlessDescriptorSet::allocAccelerationStructureHandle(
     api.vkUpdateDescriptorSets(api.m_device, 1, &write, 0, nullptr);
 
     outHandle->type = DescriptorHandleType::AccelerationStructure;
-    outHandle->handle = m_firstAccelerationStructureHandle + slot;
+    outHandle->value = m_firstAccelerationStructureHandle + slot;
 
     return SLANG_OK;
 }
@@ -313,14 +313,14 @@ Result BindlessDescriptorSet::freeHandle(const DescriptorHandle& handle)
     {
     case DescriptorHandleType::Buffer:
     case DescriptorHandleType::RWBuffer:
-        return m_bufferAllocator.free(handle.handle);
+        return m_bufferAllocator.free(handle.value);
     case DescriptorHandleType::Texture:
     case DescriptorHandleType::RWTexture:
-        return m_textureAllocator.free(handle.handle - m_firstTextureHandle);
+        return m_textureAllocator.free(handle.value - m_firstTextureHandle);
     case DescriptorHandleType::Sampler:
-        return m_samplerAllocator.free(handle.handle);
+        return m_samplerAllocator.free(handle.value);
     case DescriptorHandleType::AccelerationStructure:
-        return m_accelerationStructureAllocator.free(handle.handle - m_firstAccelerationStructureHandle);
+        return m_accelerationStructureAllocator.free(handle.value - m_firstAccelerationStructureHandle);
     default:
         return SLANG_E_INVALID_ARG;
     }