Skip to content

Commit ea883f8

Browse files
Move WGSL sources to Shaders/WgslSource
1 parent bd8d170 commit ea883f8

38 files changed

Lines changed: 9 additions & 57 deletions

src/ImageSharp.Drawing.WebGPU.ShaderGen/WgslSourceGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ namespace SixLabors.ImageSharp.Drawing.WebGPU.ShaderGen;
1717
/// </summary>
1818
/// <remarks>
1919
/// <para>
20-
/// Root shaders are every <c>.wgsl</c> file directly under the <c>Shaders</c> tree except files
21-
/// under <c>Shaders/Shared</c>. Shared files are only imported into roots.
20+
/// Root shaders are every <c>.wgsl</c> file directly under the <c>Shaders/WgslSource</c> tree except files
21+
/// under <c>Shaders/WgslSource/Shared</c>. Shared files are only imported into roots.
2222
/// </para>
2323
/// <para>
2424
/// The generator intentionally supports a very small preprocessor surface:
@@ -394,10 +394,10 @@ private static string ToPropertyName(string path)
394394
}
395395

396396
// AdditionalFiles come through as full paths. The generated API is keyed by the relative
397-
// path beneath the WebGPU Shaders tree so imports remain stable across machines.
397+
// path beneath the raw WGSL source tree so imports remain stable across machines.
398398
private static string? GetRelativeShaderPath(string path)
399399
{
400-
const string marker = "\\Shaders\\";
400+
const string marker = "\\Shaders\\WgslSource\\";
401401
int index = path.LastIndexOf(marker, StringComparison.OrdinalIgnoreCase);
402402
if (index < 0)
403403
{

src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</ItemGroup>
8383

8484
<ItemGroup>
85-
<AdditionalFiles Include="Shaders\*.wgsl" />
86-
<AdditionalFiles Include="Shaders\Shared\*.wgsl" />
85+
<AdditionalFiles Include="Shaders\WgslSource\*.wgsl" />
86+
<AdditionalFiles Include="Shaders\WgslSource\Shared\*.wgsl" />
8787
</ItemGroup>
8888
</Project>

src/ImageSharp.Drawing.WebGPU/Shaders/BackdropComputeShader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ internal static unsafe class BackdropComputeShader
1616
public static ReadOnlySpan<byte> EntryPoint => "main\0"u8;
1717

1818
[MethodImpl(MethodImplOptions.AggressiveInlining)]
19-
public static uint GetDispatchX(uint heightInTiles)
20-
=> heightInTiles;
19+
public static uint GetDispatchX(uint drawObjectCount)
20+
=> drawObjectCount;
2121

2222
public static bool TryCreateBindGroupLayout(
2323
WebGPU api,

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/bbox.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/bbox.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/blend.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/blend.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/bump.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/bump.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/clip.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/clip.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/config.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/config.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/cubic.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/cubic.wgsl

File renamed without changes.

src/ImageSharp.Drawing.WebGPU/Shaders/Shared/drawtag.wgsl renamed to src/ImageSharp.Drawing.WebGPU/Shaders/WgslSource/Shared/drawtag.wgsl

File renamed without changes.

0 commit comments

Comments
 (0)