NRI v1.84:

- VK: fixed bug in GetTextureDescriptorVK - updated VK headers to v1.3.216
NVIDIA-RTX · Aug 15, 2022 · dcd4f63 · dcd4f63
1 parent 0d00b9d
commit dcd4f63
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "External/vulkan"]
 	path = External/vulkan
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
-	branch = sdk-1.3.211
+	branch = sdk-1.3.216
 	update = merge
diff --git a/External/vulkan b/External/vulkan
diff --git a/Include/NRI.h b/Include/NRI.h
@@ -16,8 +16,8 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
 #include <cstddef>
 
 #define NRI_VERSION_MAJOR 1
-#define NRI_VERSION_MINOR 83
-#define NRI_VERSION_DATE "4 Jun 2022"
+#define NRI_VERSION_MINOR 84
+#define NRI_VERSION_DATE "14 August 2022"
 #define NRI_INTERFACE( name ) #name, sizeof(name)
 
 #if _WIN32

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# NVIDIA Render Interface v1.83 (NRI)
+# NVIDIA Render Interface v1.84 (NRI)
 
 *NRI* is a low-level abstract render interface which currently supports three backends: D3D11, D3D12 and Vulkan. *NRI* has been designed to support all (at least major) low level features of D3D12 and Vulkan APIs, but at the same time to simplify usage and reduce the amount of code needed (especially compared with Vulkan).
 

diff --git a/Resources/Version.h b/Resources/Version.h
@@ -21,7 +21,7 @@ Versioning rules:
 */
 
 #define VERSION_MAJOR                   1
-#define VERSION_MINOR                   83
+#define VERSION_MINOR                   84
 #define VERSION_BUILD                   0
 #define VERSION_REVISION                0
 

diff --git a/Source/VK/DescriptorVK.cpp b/Source/VK/DescriptorVK.cpp
@@ -51,12 +51,15 @@ void FillTextureDesc(const T& textureViewDesc, DescriptorTextureDesc& descriptor
 {
     const TextureVK& texture = *(const TextureVK*)textureViewDesc.texture;
 
+    const uint32_t mipLevelsLeft = texture.GetMipNum() - textureViewDesc.mipOffset;
+    const uint32_t arrayLayersLeft = texture.GetArraySize() - descriptorTextureDesc.imageArrayOffset;
+
     descriptorTextureDesc.texture = &texture;
     descriptorTextureDesc.imageAspectFlags = texture.GetImageAspectFlags();
     descriptorTextureDesc.imageMipOffset = textureViewDesc.mipOffset;
-    descriptorTextureDesc.imageMipNum = textureViewDesc.mipNum;
+    descriptorTextureDesc.imageMipNum = (textureViewDesc.mipNum == REMAINING_MIP_LEVELS) ? mipLevelsLeft : textureViewDesc.mipNum;
     descriptorTextureDesc.imageArrayOffset = textureViewDesc.arrayOffset;
-    descriptorTextureDesc.imageArraySize = textureViewDesc.arraySize;
+    descriptorTextureDesc.imageArraySize = (textureViewDesc.arraySize == REMAINING_ARRAY_LAYERS) ? arrayLayersLeft : textureViewDesc.arraySize;
     descriptorTextureDesc.imageLayout = GetImageLayoutForView(textureViewDesc.viewType);
 }
 
@@ -65,10 +68,12 @@ void FillTextureDesc(const Texture3DViewDesc& textureViewDesc, DescriptorTexture
 {
     const TextureVK& texture = *(const TextureVK*)textureViewDesc.texture;
 
+    const uint32_t mipLevelsLeft = texture.GetMipNum() - textureViewDesc.mipOffset;
+
     descriptorTextureDesc.texture = &texture;
     descriptorTextureDesc.imageAspectFlags = texture.GetImageAspectFlags();
     descriptorTextureDesc.imageMipOffset = textureViewDesc.mipOffset;
-    descriptorTextureDesc.imageMipNum = textureViewDesc.mipNum;
+    descriptorTextureDesc.imageMipNum = (textureViewDesc.mipNum == REMAINING_MIP_LEVELS) ? mipLevelsLeft : textureViewDesc.mipNum;
     descriptorTextureDesc.imageArrayOffset = 0;
     descriptorTextureDesc.imageArraySize = 1;
     descriptorTextureDesc.imageLayout = GetImageLayoutForView(textureViewDesc.viewType);
+0 −2		include/vk_video/vulkan_video_codec_h265std.h
+2 −2		include/vk_video/vulkan_video_codec_h265std_decode.h
+2 −2		include/vk_video/vulkan_video_codec_h265std_encode.h
+327 −167		include/vulkan/vulkan.hpp
+26 −24		include/vulkan/vulkan_beta.h
+279 −15		include/vulkan/vulkan_core.h
+557 −213		include/vulkan/vulkan_enums.hpp
+2,873 −2,108		include/vulkan/vulkan_funcs.hpp
+806 −690		include/vulkan/vulkan_handles.hpp
+269 −6		include/vulkan/vulkan_hash.hpp
+461 −475		include/vulkan/vulkan_raii.hpp
+2,022 −29		include/vulkan/vulkan_structs.hpp
+23 −3		registry/reg.py
+1,264 −426		registry/validusage.json
+10 −12		registry/video.xml
+438 −95		registry/vk.xml