SDSL: emit UserTypeGOOGLE + NonWritable on rgroup StructuredBuffer vars

xen2 · xen2 · commit 50617966bbdc · 2026-04-24T19:31:58.000+09:00
Stage-scoped StructuredBuffer&lt;T&gt; declarations in ShaderMember.Compile
already emit these decorations so SPIRV-Cross maps them to the correct
HLSL type. The rgroup path forgot to, leaving rgroup-declared read-only
StructuredBuffer&lt;T&gt; (e.g. TransformationInstancing.InstanceWorld) to
drop through SPIRV-Cross as RWByteAddressBuffer on a UAV register.
Regression-tested via CSStructuredBuffer + rgroup.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -91,7 +91,7 @@ jobs:
         run: |
           dotnet build build\Stride.Android.slnf `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Android `
             -p:StrideSkipUnitTests=true `
diff --git a/.github/workflows/build-assembly-processor.yml b/.github/workflows/build-assembly-processor.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Build
         run: |
           dotnet build build\Stride.AssemblyProcessor.sln `
-            -restore -m:1 -nr:false `
+            -restore -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StrideSkipUnitTests=true `
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -59,7 +59,7 @@ jobs:
         run: |
           dotnet build build\Stride.iOS.slnf `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=iOS `
diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml
@@ -57,7 +57,7 @@ jobs:
         run: |
           dotnet build build\Stride.Runtime.slnf `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Linux `
diff --git a/.github/workflows/build-vs-package.yml b/.github/workflows/build-vs-package.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Build
         run: |
           msbuild build\Stride.VisualStudio.sln `
-            -restore -m:1 -nr:false `
+            -restore -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StrideSkipUnitTests=true `
diff --git a/.github/workflows/build-windows-full.yml b/.github/workflows/build-windows-full.yml
@@ -52,7 +52,7 @@ jobs:
         run: |
           dotnet build build\Stride.sln `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Windows `
diff --git a/.github/workflows/build-windows-runtime.yml b/.github/workflows/build-windows-runtime.yml
@@ -68,7 +68,7 @@ jobs:
         run: |
           dotnet build build\Stride.Runtime.slnf `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Windows `
diff --git a/.github/workflows/test-linux-game.yml b/.github/workflows/test-linux-game.yml
@@ -68,7 +68,7 @@ jobs:
           dotnet build build\Stride.Tests.Game.GPU.slnf `
             -p:StrideTestRuntimeIdentifier=linux-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatform=Linux `
@@ -79,7 +79,7 @@ jobs:
           dotnet build build\Stride.Tests.Game.Linux.slnf `
             -p:StrideTestRuntimeIdentifier=linux-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatform=Linux `
diff --git a/.github/workflows/test-linux-simple.yml b/.github/workflows/test-linux-simple.yml
@@ -40,7 +40,7 @@ jobs:
           dotnet build build\Stride.Tests.Simple.Linux.slnf `
             -p:StrideTestRuntimeIdentifier=linux-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatform=Linux `
diff --git a/.github/workflows/test-windows-game.yml b/.github/workflows/test-windows-game.yml
@@ -57,7 +57,7 @@ jobs:
           dotnet build build\Stride.Tests.Game.slnf `
             -p:StrideTestRuntimeIdentifier=win-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Windows `
@@ -167,7 +167,7 @@ jobs:
           dotnet build build\Stride.Tests.Game.GPU.slnf `
             -p:StrideTestRuntimeIdentifier=win-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Windows `
diff --git a/.github/workflows/test-windows-simple.yml b/.github/workflows/test-windows-simple.yml
@@ -39,7 +39,7 @@ jobs:
           dotnet build build\Stride.Tests.Simple.slnf `
             -p:StrideTestRuntimeIdentifier=win-x64 `
             -p:StrideNativeBuildMode=Clang `
-            -m:1 -nr:false `
+            -nr:false `
             -v:m -p:WarningLevel=0 `
             -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
             -p:StridePlatforms=Windows `
diff --git a/build/test-linux-gpu.ps1 b/build/test-linux-gpu.ps1
@@ -48,7 +48,7 @@ foreach ($proj in $testProjects) {
 Write-Host "=== Step 2: Build (targeting Linux/Vulkan) ===" -ForegroundColor Cyan
 dotnet build build\Stride.Tests.Game.GPU.slnf `
     -p:StrideNativeBuildMode=Clang `
-    -m:1 -nr:false `
+    -nr:false `
     -v:m -p:WarningLevel=0 `
     -p:Configuration=Debug `
     -p:StridePlatform=Linux `
diff --git a/sources/sdk/Stride.Build.Sdk.Tests/Sdk/Sdk.props b/sources/sdk/Stride.Build.Sdk.Tests/Sdk/Sdk.props
@@ -12,6 +12,12 @@
     <!-- Mark as test project for dotnet test -->
     <IsTestProject>true</IsTestProject>
 
+    <!-- Test projects don't need to produce NuGet packages. Local property only — do NOT
+         let it propagate to referenced projects (e.g. Stride.Core.Assets.CompilerApp), which
+         still need their own .nupkg in bin\packages\ for the test's AssetCompiler run. The
+         ProjectReference metadata below adds this to GlobalPropertiesToRemove to be sure. -->
+    <StrideSkipAutoPack>true</StrideSkipAutoPack>
+
     <!-- Tests are executables (for asset compilation, native libs, etc.) -->
     <OutputType>WinExe</OutputType>
     <StrideIsExecutable>true</StrideIsExecutable>
diff --git a/sources/sdk/Stride.Build.Sdk.Tests/Sdk/Sdk.targets b/sources/sdk/Stride.Build.Sdk.Tests/Sdk/Sdk.targets
@@ -70,7 +70,12 @@
     <ProjectReference Include="$(StrideRoot)sources\assets\Stride.Core.Assets.CompilerApp\Stride.Core.Assets.CompilerApp.csproj">
       <Private>false</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <!-- Pin to xplat TFM to avoid VS design-time GetTargetPath error on CompilerApp's
+           cross-targeting (cross-targeting outer build has no GetTargetPath target). -->
       <SetTargetFramework>TargetFramework=$(StrideXplatEditorTargetFramework)</SetTargetFramework>
+      <!-- Strip StrideSkipAutoPack so CompilerApp still packs its .nupkg (needed at
+           AssetCompiler time for the test's package graph resolution). -->
+      <GlobalPropertiesToRemove>StrideSkipAutoPack</GlobalPropertiesToRemove>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>
diff --git a/sources/sdk/Stride.Build.Sdk/Sdk/Sdk.targets b/sources/sdk/Stride.Build.Sdk/Sdk/Sdk.targets
@@ -97,10 +97,13 @@
   <!-- ================================================================ -->
   <!-- Stride.Core.CompilerServices Roslyn Analyzer -->
   <!-- ================================================================ -->
+  <!-- Stride.Core.CompilerServices is single-TF (netstandard2.0), so an explicit
+       SetTargetFramework is redundant — and harmful: it forces TargetFramework into the
+       consumer-ref dispatch globals, producing a cache key distinct from the slnf-direct
+       outer dispatch (which has no TF global). Both then race on obj/. -->
   <ItemGroup Condition="!$(MSBuildProjectName.StartsWith('Stride.Core.CompilerServices'))">
     <ProjectReference Include="$(StrideRoot)sources\core\Stride.Core.CompilerServices\Stride.Core.CompilerServices.csproj"
                       OutputItemType="Analyzer"
-                      SetTargetFramework="TargetFramework=netstandard2.0"
                       ReferenceOutputAssembly="false" />
   </ItemGroup>
 
@@ -236,7 +239,6 @@
     <MSBuild Projects="@(_MSBuildProjectReferenceExistent)"
              Condition="'%(_MSBuildProjectReferenceExistent.SetTargetFramework)' != ''"
              BuildInParallel="$(BuildInParallel)"
-             Targets="Build;Pack"
              RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove);TargetFramework;StrideGraphicsApi">
     </MSBuild>
   </Target>
diff --git a/sources/sdk/Stride.Build.Sdk/Sdk/Stride.Dependencies.targets b/sources/sdk/Stride.Build.Sdk/Sdk/Stride.Dependencies.targets
@@ -32,14 +32,46 @@
   <!-- ================================================================ -->
 
   <!-- List dependency files from .ssdeps -->
+  <!-- When the current build targets a specific StrideGraphicsApi, drop candidate paths whose
+       parent directory is a non-current API folder. Otherwise a non-API-dependent middle project
+       (say Stride.Engine, built with default API=Direct3D11) re-exports its CopyLocal'd
+       Stride.Graphics.ssdeps through the reference graph, and the direct API-dependent reference
+       also provides one — both land on the same filename in the output folder and race. -->
   <Target Name="_StrideListDepsFiles" DependsOnTargets="ResolveAssemblyReferences">
     <ItemGroup>
       <_StrideDepsFile Include="@(ReferencePath->'%(RootDir)%(Directory)%(Filename).ssdeps')" Condition="'%(ReferencePath.CopyLocal)' != 'false' And Exists('%(RootDir)%(Directory)%(Filename).ssdeps')"/>
       <_StrideDepsFile Include="@(ReferenceDependencyPaths->'%(RootDir)%(Directory)%(Filename).ssdeps')" Condition="'%(ReferenceDependencyPaths.CopyLocal)' != 'false' And Exists('%(RootDir)%(Directory)%(Filename).ssdeps')"/>
+    </ItemGroup>
+    <ItemGroup Condition="'$(StrideGraphicsApi)' != ''">
+      <_StrideDepsFile Remove="@(_StrideDepsFile)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Direct3D11\')) And '$(StrideGraphicsApi)' != 'Direct3D11'" />
+      <_StrideDepsFile Remove="@(_StrideDepsFile)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Direct3D12\')) And '$(StrideGraphicsApi)' != 'Direct3D12'" />
+      <_StrideDepsFile Remove="@(_StrideDepsFile)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Vulkan\')) And '$(StrideGraphicsApi)' != 'Vulkan'" />
+      <_StrideDepsFile Remove="@(_StrideDepsFile)" Condition="$([System.String]::Copy('%(Identity)').Contains('\OpenGL\')) And '$(StrideGraphicsApi)' != 'OpenGL'" />
+      <_StrideDepsFile Remove="@(_StrideDepsFile)" Condition="$([System.String]::Copy('%(Identity)').Contains('\OpenGLES\')) And '$(StrideGraphicsApi)' != 'OpenGLES'" />
+    </ItemGroup>
+    <ItemGroup>
       <None Include="@(_StrideDepsFile)" CopyToOutputDirectory="PreserveNewest" />
     </ItemGroup>
   </Target>
 
+  <!-- Filter transitive CopyToOutput items coming from non-API-dependent project references.
+       They would otherwise pull the default-API variant (e.g. Direct3D11) of API-dependent
+       side files (Stride.Graphics.ssdeps, Stride.VirtualReality.ssdeps, and the native libs
+       they manifest) through the reference graph, colliding in the consumer's output folder
+       with the direct API-dependent reference's correct variant. -->
+  <Target Name="_StrideFilterTransitiveCopyToOutputDirectoryItems"
+          BeforeTargets="_CopyOutOfDateSourceItemsToOutputDirectory;_CopyOutOfDateSourceItemsToOutputDirectoryAlways"
+          DependsOnTargets="GetCopyToOutputDirectoryItems"
+          Condition="'$(StrideGraphicsApi)' != ''">
+    <ItemGroup>
+      <_SourceItemsToCopyToOutputDirectory Remove="@(_SourceItemsToCopyToOutputDirectory)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Direct3D11\')) And '$(StrideGraphicsApi)' != 'Direct3D11'" />
+      <_SourceItemsToCopyToOutputDirectory Remove="@(_SourceItemsToCopyToOutputDirectory)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Direct3D12\')) And '$(StrideGraphicsApi)' != 'Direct3D12'" />
+      <_SourceItemsToCopyToOutputDirectory Remove="@(_SourceItemsToCopyToOutputDirectory)" Condition="$([System.String]::Copy('%(Identity)').Contains('\Vulkan\')) And '$(StrideGraphicsApi)' != 'Vulkan'" />
+      <_SourceItemsToCopyToOutputDirectory Remove="@(_SourceItemsToCopyToOutputDirectory)" Condition="$([System.String]::Copy('%(Identity)').Contains('\OpenGL\')) And '$(StrideGraphicsApi)' != 'OpenGL'" />
+      <_SourceItemsToCopyToOutputDirectory Remove="@(_SourceItemsToCopyToOutputDirectory)" Condition="$([System.String]::Copy('%(Identity)').Contains('\OpenGLES\')) And '$(StrideGraphicsApi)' != 'OpenGLES'" />
+    </ItemGroup>
+  </Target>
+
   <!-- Note: this target Outputs are not real, used so that it gets expanded for each file
              also, if _StrideDepsFile is empty the target is still called so check for it -->
   <Target Name="_StrideBuildDependencies" DependsOnTargets="_StrideListDepsFiles" Outputs="%(_StrideDepsFile.Identity)">
diff --git a/sources/sdk/Stride.Build.Sdk/Sdk/Stride.GraphicsApi.InnerBuild.targets b/sources/sdk/Stride.Build.Sdk/Sdk/Stride.GraphicsApi.InnerBuild.targets
diff --git a/sources/shaders/Stride.Shaders.Parsers/Parsing/SDSL/AST/ShaderElements.cs b/sources/shaders/Stride.Shaders.Parsers/Parsing/SDSL/AST/ShaderElements.cs
diff --git a/sources/shaders/Stride.Shaders.Tests/RenderingTests.cs b/sources/shaders/Stride.Shaders.Tests/RenderingTests.cs
diff --git a/sources/shaders/assets/SDSL/ComputeTests/CSStructuredBuffer.sdsl b/sources/shaders/assets/SDSL/ComputeTests/CSStructuredBuffer.sdsl
