Merge branch 'release-preview-1.10.2605' into main-with-merge-commit

Author: V-FEXrt

docs/ReleaseNotes.md

@@ -17,15 +17,33 @@ The included licenses apply to the following files:
 
 ## Changelog
 
-### Upcoming Release
+### Version 1.10.2605.1 (preview)
 
-Place release notes for the upcoming release below this line and remove this
-line upon naming the release. Refer to previous for appropriate section names.
+#### Experimental Shader Model 6.10
+- Added VectorAccumlate operaton to LinAlg Matrix API [#8448](https://github.com/microsoft/DirectXShaderCompiler/pull/8448)
+
+#### Experimental Shader Model 6.10 Bug Fixes
+- Fixed validator rejecting LinAlgMatrix type in DXIL [#8441](https://github.com/microsoft/DirectXShaderCompiler/pull/8441)
+- Fixed float trunc and coord calc errors in ExecTests [#8420](https://github.com/microsoft/DirectXShaderCompiler/pull/8420)
+- Convert Bias Vector to match the output type [#8394](https://github.com/microsoft/DirectXShaderCompiler/pull/8394)
+
+#### Bug Fixes
+- Fixed build break on certain platforms [#8307](https://github.com/microsoft/DirectXShaderCompiler/pull/8307)
+- SPIR-V: Fix compiler error for certain pointer casts [#7891](https://github.com/microsoft/DirectXShaderCompiler/issues/7891)
+- Raise a compliation error when invalid `volatile` keyword is used [8397](https://github.com/microsoft/DirectXShaderCompiler/pull/8397)
+- Fixed codegen that emitted illigal-width integerse [#8444](https://github.com/microsoft/DirectXShaderCompiler/pull/8444)
+- Fixed crash when using `-fcgl` when container has a resource arg function [#8442](https://github.com/microsoft/DirectXShaderCompiler/pull/8442)
+
+### Version 1.10.2605 (preview)
 
 #### Experimental Shader Model 6.10
 
-- Removed experimental Cooperative Vector, this has been replaced by LinAlg matrix.
-- Implement GetGroupWaveIndex and GetGroupWaveCount in experimental Shader Model 6.10.
+- Added DirectX LinAlg Matrix API in experimental Shader Model 6.10.
+  - [proposal](https://github.com/microsoft/hlsl-specs/blob/main/proposals/0035-linalg-matrix.md)
+  - New `Matrix` type that operates under three "scopes". ThreadScope, WaveScope, ThreadGroupScope
+  - Supports a comprehensive set of Matrix operations including matrix-vector and matrix-matrix multiply
+- Removed experimental Cooperative Vector, this has been replaced by LinAlg Matrix.
+- Added GetGroupWaveIndex and GetGroupWaveCount in experimental Shader Model 6.10.
   - [proposal](https://github.com/microsoft/hlsl-specs/blob/main/proposals/0048-group-wave-index.md)
   - GetGroupWaveIndex: New intrinsic for Compute, Mesh, Amplification and Node shaders which returns the index of the wave within the thread group that the the thread is executing.
   - GetGroupWaveCount: New intrinsic for Compute, Mesh, Amplification and Node
@@ -35,6 +53,13 @@ line upon naming the release. Refer to previous for appropriate section names.
   - `DebugBreak()` triggers a breakpoint if a debugger is attached.
   - `dx::IsDebuggerPresent()` returns true if a debugger is attached.
   - SPIR-V: `DebugBreak()` emits `NonSemantic.DebugBreak` extended instruction; `IsDebuggerPresent()` is not supported.
+- Added TriangleObjectPositions in experimental Shader Model 6.10.
+  - [proposal](https://github.com/microsoft/hlsl-specs/blob/main/proposals/0041-triangle-object-positions.md)
+- Added CluterID in experimental Shader Model 6.10.
+  - [proposal](https://github.com/microsoft/hlsl-specs/blob/main/proposals/0045-clustered-geometry.md)
+- Added Variable GroupShared Limits in experimental Shader Model 6.10.
+  - [proposal](https://github.com/microsoft/hlsl-specs/blob/main/proposals/0049-variable-groupshared-memory.md)
+
 
 #### Bug Fixes
 
@@ -45,6 +70,18 @@ line upon naming the release. Refer to previous for appropriate section names.
 - User-defined conversion operators (e.g., `operator float4()`) now produce an
   error instead of being silently ignored.
   [#5103](https://github.com/microsoft/DirectXShaderCompiler/pull/8206)
+- Fixed SPIRV crash with out-of-line template decl
+  [#8079](https://github.com/microsoft/DirectXShaderCompiler/pull/8079)
+- Fixed crash in CanConvert from incomplete type
+  [#8110](https://github.com/microsoft/DirectXShaderCompiler/pull/8110)
+- Fixed crash in diagnostics when source contains embedded nulls
+  [#8164](https://github.com/microsoft/DirectXShaderCompiler/pull/8164)
+- Fixed OOB in subscript indexing of col-major matrix in cbuffer
+  [#7866](https://github.com/microsoft/DirectXShaderCompiler/pull/7866)
+- Allow groupshared args in templates
+  [#8217](https://github.com/microsoft/DirectXShaderCompiler/pull/8217)
+- Fixed RawBufferVectorLoad/Store to use 32-bit element types for min precision types instead of 16-bit
+  [#8274](https://github.com/microsoft/DirectXShaderCompiler/pull/8274)
 - DXIL validation: added validation for `CreateHandleFromBinding`.
 - DXIL validation now rejects non-standard integer bit widths (e.g. `i25`) in
   instructions.
@@ -59,6 +96,8 @@ line upon naming the release. Refer to previous for appropriate section names.
   [#7979](https://github.com/microsoft/DirectXShaderCompiler/issues/7979). With
   this type, users no longer need to define both Sampler and Texture resources
   with the same binding number.
+- Added support for -Fre for Metal
+  [#8159](https://github.com/microsoft/DirectXShaderCompiler/pull/8159)
 
 ### Version 1.9.2602
 

utils/version/gen_version.py

@@ -80,7 +80,13 @@ def rc_version_field_1(self):
         return self.latest_release_info["version"]["major"]
 
     def rc_version_field_2(self):
-        return self.latest_release_info["version"]["minor"]
+        minor = self.latest_release_info["version"]["minor"]
+        # If this is a preview branch, we use the preview_minor field as the
+        # minor version in the RC file. This allows us to have a different
+        # minor version for preview releases, without changing the highest
+        # released minor version.
+        minor = self.latest_release_info["version"].get("preview_minor", minor)
+        return minor
 
     def rc_version_field_3(self):
         return self.latest_release_info["version"]["rev"] if self.options.official else "0"

utils/version/latest-release.json

@@ -2,7 +2,8 @@
   "version": {
     "major": "1",
     "minor": "9",
-    "rev": "2602"
+    "preview_minor": "10",
+    "rev": "2605"
   },
-  "sha": "f255809c3dd408c32349d6b7b16019b8b24e1d2e"
+  "sha": "c763461468246fb779fb234b08ad3b460fb93a02"
 }

utils/version/version.inc

@@ -13,12 +13,12 @@
 #ifdef RC_VERSION_FIELD_2
 #undef RC_VERSION_FIELD_2
 #endif
-#define RC_VERSION_FIELD_2 9
+#define RC_VERSION_FIELD_2 10
 
 #ifdef RC_VERSION_FIELD_3
 #undef RC_VERSION_FIELD_3
 #endif
-#define RC_VERSION_FIELD_3 2602
+#define RC_VERSION_FIELD_3 2605
 
 #ifdef RC_VERSION_FIELD_4
 #undef RC_VERSION_FIELD_4
@@ -28,7 +28,7 @@
 #ifdef RC_FILE_VERSION
 #undef RC_FILE_VERSION
 #endif
-#define RC_FILE_VERSION "1.9.2602.0"
+#define RC_FILE_VERSION "1.10.2605.0"
 
 #ifdef RC_FILE_DESCRIPTION
 #undef RC_FILE_DESCRIPTION
@@ -49,7 +49,7 @@
 #ifdef RC_PRODUCT_VERSION
 #undef RC_PRODUCT_VERSION
 #endif
-#define RC_PRODUCT_VERSION "1.9.2602.0"
+#define RC_PRODUCT_VERSION "1.10.2605.0"
 
 #ifdef HLSL_TOOL_NAME
 #undef HLSL_TOOL_NAME