internal/rosa: key metadata by string

For upcoming azalea integration. The API is quite ugly right now to ease migration.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 17 insertions, 17 deletions

diff --git a/internal/rosa/glslang.go b/internal/rosa/glslang.go
index fcfcdc3e..d71cfef0 100644
--- a/internal/rosa/glslang.go
+++ b/internal/rosa/glslang.go
@@ -7,12 +7,12 @@ import (
 	"hakurei.app/internal/pkg"
 )
 
-func (t Toolchain) newSPIRVHeaders() (pkg.Artifact, string) {
+func (t Toolchain) newSPIRVHeaders(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.4.341.0"
 		checksum = "0PL43-19Iaw4k7_D8J8BvoJ-iLgCVSYZ2ThgDPGfAJwIJFtre7l0cnQtLjcY-JvD"
 	)
-	return t.NewPackage("spirv-headers", version, newFromGitHub(
+	return s.NewPackage(t, "spirv-headers", version, newFromGitHub(
 		"KhronosGroup/SPIRV-Headers",
 		"vulkan-sdk-"+version,
 		checksum,
@@ -22,7 +22,7 @@ func (t Toolchain) newSPIRVHeaders() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	artifactsM[SPIRVHeaders] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newSPIRVHeaders,
 
 		Name:        "spirv-headers",
@@ -49,15 +49,15 @@ func init() {
 			}
 			return v.Latest
 		},
-	}
+	})
 }
 
-func (t Toolchain) newSPIRVTools() (pkg.Artifact, string) {
+func (t Toolchain) newSPIRVTools(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2026.1"
 		checksum = "ZSQPQx8NltCDzQLk4qlaVxyWRWeI_JtsjEpeFt3kezTanl9DTHfLixSUCezMFBjv"
 	)
-	return t.NewPackage("spirv-tools", version, newFromGitHub(
+	return s.NewPackage(t, "spirv-tools", version, newFromGitHub(
 		"KhronosGroup/SPIRV-Tools",
 		"v"+version,
 		checksum,
@@ -72,7 +72,7 @@ func (t Toolchain) newSPIRVTools() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[SPIRVTools] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newSPIRVTools,
 
 		Name:        "spirv-tools",
@@ -86,15 +86,15 @@ func init() {
 		ID: 14894,
 
 		latest: (*Versions).getStable,
-	}
+	})
 }
 
-func (t Toolchain) newGlslang() (pkg.Artifact, string) {
+func (t Toolchain) newGlslang(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "16.3.0"
 		checksum = "xyqDf8k3-D0_BXHGi0uLgMglnJ05Rf3j73QgbDs3sGtKNdBIQhY8JfqX1NcNoJQN"
 	)
-	return t.NewPackage("glslang", version, newFromGitHub(
+	return s.NewPackage(t, "glslang", version, newFromGitHub(
 		"KhronosGroup/glslang",
 		version,
 		checksum,
@@ -116,7 +116,7 @@ func (t Toolchain) newGlslang() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Glslang] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGlslang,
 
 		Name:        "glslang",
@@ -124,10 +124,10 @@ func init() {
 		Website:     "https://github.com/KhronosGroup/glslang",
 
 		ID: 205796,
-	}
+	})
 }
 
-func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
+func (t Toolchain) newSPIRVLLVMTranslator(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "22.1.2"
 		checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy"
@@ -137,7 +137,7 @@ func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
 		"cooperative_matrix_constant_null.spvasm",
 	}
 
-	switch arch {
+	switch s.arch {
 	case "arm64":
 		skipChecks = append(skipChecks,
 			// LLVM ERROR: unsupported calling convention
@@ -183,7 +183,7 @@ func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
 		)
 	}
 
-	return t.NewPackage("spirv-llvm-translator", version, newFromGitHub(
+	return s.NewPackage(t, "spirv-llvm-translator", version, newFromGitHub(
 		"KhronosGroup/SPIRV-LLVM-Translator",
 		"v"+version, checksum,
 	), &PackageAttr{
@@ -232,7 +232,7 @@ export LIT_OPTS=` + litArgs(true, skipChecks...) + `
 	), version
 }
 func init() {
-	artifactsM[SPIRVLLVMTranslator] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newSPIRVLLVMTranslator,
 
 		Name:        "spirv-llvm-translator",
@@ -244,5 +244,5 @@ func init() {
 		},
 
 		ID: 227273,
-	}
+	})
 }