diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-17 16:44:13 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-17 17:50:30 +0900 |
| commit | 38bc2c750842826c5af4f66abe3e1905258cd274 (patch) | |
| tree | 75e1d17961fd980ff8b20a9dfd937789de10836e /internal/rosa/glslang.go | |
| parent | 30eb0d6a613ad268f6805ccbcdcabf158e7f526f (diff) | |
internal/rosa: pass stage alongside state
This cleans up many function signatures.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/glslang.go')
| -rw-r--r-- | internal/rosa/glslang.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/internal/rosa/glslang.go b/internal/rosa/glslang.go index d71cfef0..969cf2ad 100644 --- a/internal/rosa/glslang.go +++ b/internal/rosa/glslang.go @@ -7,12 +7,12 @@ import ( "hakurei.app/internal/pkg" ) -func (t Toolchain) newSPIRVHeaders(s *S) (pkg.Artifact, string) { +func (t Toolchain) newSPIRVHeaders() (pkg.Artifact, string) { const ( version = "1.4.341.0" checksum = "0PL43-19Iaw4k7_D8J8BvoJ-iLgCVSYZ2ThgDPGfAJwIJFtre7l0cnQtLjcY-JvD" ) - return s.NewPackage(t, "spirv-headers", version, newFromGitHub( + return t.NewPackage("spirv-headers", version, newFromGitHub( "KhronosGroup/SPIRV-Headers", "vulkan-sdk-"+version, checksum, @@ -52,12 +52,12 @@ func init() { }) } -func (t Toolchain) newSPIRVTools(s *S) (pkg.Artifact, string) { +func (t Toolchain) newSPIRVTools() (pkg.Artifact, string) { const ( version = "2026.1" checksum = "ZSQPQx8NltCDzQLk4qlaVxyWRWeI_JtsjEpeFt3kezTanl9DTHfLixSUCezMFBjv" ) - return s.NewPackage(t, "spirv-tools", version, newFromGitHub( + return t.NewPackage("spirv-tools", version, newFromGitHub( "KhronosGroup/SPIRV-Tools", "v"+version, checksum, @@ -89,12 +89,12 @@ func init() { }) } -func (t Toolchain) newGlslang(s *S) (pkg.Artifact, string) { +func (t Toolchain) newGlslang() (pkg.Artifact, string) { const ( version = "16.3.0" checksum = "xyqDf8k3-D0_BXHGi0uLgMglnJ05Rf3j73QgbDs3sGtKNdBIQhY8JfqX1NcNoJQN" ) - return s.NewPackage(t, "glslang", version, newFromGitHub( + return t.NewPackage("glslang", version, newFromGitHub( "KhronosGroup/glslang", version, checksum, @@ -127,7 +127,7 @@ func init() { }) } -func (t Toolchain) newSPIRVLLVMTranslator(s *S) (pkg.Artifact, string) { +func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) { const ( version = "22.1.2" checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy" @@ -137,7 +137,7 @@ func (t Toolchain) newSPIRVLLVMTranslator(s *S) (pkg.Artifact, string) { "cooperative_matrix_constant_null.spvasm", } - switch s.arch { + switch t.arch { case "arm64": skipChecks = append(skipChecks, // LLVM ERROR: unsupported calling convention @@ -183,7 +183,7 @@ func (t Toolchain) newSPIRVLLVMTranslator(s *S) (pkg.Artifact, string) { ) } - return s.NewPackage(t, "spirv-llvm-translator", version, newFromGitHub( + return t.NewPackage("spirv-llvm-translator", version, newFromGitHub( "KhronosGroup/SPIRV-LLVM-Translator", "v"+version, checksum, ), &PackageAttr{ |