V25: update to wgpu_native v25

README.md

@@ -1,5 +1,8 @@
 # WebGPU
 
+Current upstream version: v25.0.2.1
+* Use [getrelease.goal](getrelease.goal) for current mechanism to get the released `wgpu-native` libraries downloaded and installed. The libraries will be committed to this repo when v26 comes out, but for now, this is required.
+
 Go bindings for WebGPU, a cross-platform, safe graphics API. It runs natively using [wgpu-native](https://github.com/gfx-rs/wgpu-native) on Vulkan, Metal, D3D12, and OpenGL ES based on https://github.com/rajveermalviya/go-webgpu. It also comes with web (JS) support based on https://github.com/mokiat/wasmgpu.
 
 For more information, see:

examples/boids/main.go

@@ -110,7 +110,7 @@ func InitState(window *glfw.Window) (s *State, err error) {
 
 	computeShader, err := s.device.CreateShaderModule(&wgpu.ShaderModuleDescriptor{
 		Label: "compute.wgsl",
-		WGSLDescriptor: &wgpu.ShaderModuleWGSLDescriptor{
+		WGSLSource: &wgpu.ShaderSourceWGSL{
 			Code: compute,
 		},
 	})
@@ -121,7 +121,7 @@ func InitState(window *glfw.Window) (s *State, err error) {
 
 	drawShader, err := s.device.CreateShaderModule(&wgpu.ShaderModuleDescriptor{
 		Label: "draw.wgsl",
-		WGSLDescriptor: &wgpu.ShaderModuleWGSLDescriptor{
+		WGSLSource: &wgpu.ShaderSourceWGSL{
 			Code: draw,
 		},
 	})

examples/capture/main.go

@@ -132,9 +132,9 @@ func main() {
 	// Copy the data from the texture to the buffer
 	encoder.CopyTextureToBuffer(
 		texture.AsImageCopy(),
-		&wgpu.ImageCopyBuffer{
+		&wgpu.TexelCopyBufferInfo{
 			Buffer: outputBuffer,
-			Layout: wgpu.TextureDataLayout{
+			Layout: wgpu.TexelCopyBufferLayout{
 				Offset:       0,
 				BytesPerRow:  uint32(bufferDimensions.paddedBytesPerRow),
 				RowsPerImage: wgpu.CopyStrideUndefined,
@@ -151,8 +151,8 @@ func main() {
 
 	queue.Submit(cmdBuffer)
 
-	outputBuffer.MapAsync(wgpu.MapModeRead, 0, bufferSize, func(status wgpu.BufferMapAsyncStatus) {
-		if status != wgpu.BufferMapAsyncStatusSuccess {
+	outputBuffer.MapAsync(wgpu.MapModeRead, 0, bufferSize, func(status wgpu.MapAsyncStatus) {
+		if status != wgpu.MapAsyncStatusSuccess {
 			panic("failed to map buffer")
 		}
 	})

examples/compute/main.go

@@ -60,7 +60,7 @@ func main() {
 
 	shaderModule, err := device.CreateShaderModule(&wgpu.ShaderModuleDescriptor{
 		Label: "shader.wgsl",
-		WGSLDescriptor: &wgpu.ShaderModuleWGSLDescriptor{
+		WGSLSource: &wgpu.ShaderSourceWGSL{
 			Code: shader,
 		},
 	})
@@ -141,8 +141,8 @@ func main() {
 	}
 	queue.Submit(cmdBuffer)
 
-	var status wgpu.BufferMapAsyncStatus
-	err = stagingBuffer.MapAsync(wgpu.MapModeRead, 0, size, func(s wgpu.BufferMapAsyncStatus) {
+	var status wgpu.MapAsyncStatus
+	err = stagingBuffer.MapAsync(wgpu.MapModeRead, 0, size, func(s wgpu.MapAsyncStatus) {
 		status = s
 	})
 	if err != nil {
@@ -152,7 +152,7 @@ func main() {
 
 	device.Poll(true, nil)
 
-	if status != wgpu.BufferMapAsyncStatusSuccess {
+	if status != wgpu.MapAsyncStatusSuccess {
 		panic(status)
 	}
 

examples/cube/main.go

@@ -243,7 +243,7 @@ func InitState(window *glfw.Window) (s *State, err error) {
 	s.queue.WriteTexture(
 		texture.AsImageCopy(),
 		wgpu.ToBytes(texels[:]),
-		&wgpu.TextureDataLayout{
+		&wgpu.TexelCopyBufferLayout{
 			Offset:       0,
 			BytesPerRow:  texelsSize,
 			RowsPerImage: wgpu.CopyStrideUndefined,
@@ -262,8 +262,8 @@ func InitState(window *glfw.Window) (s *State, err error) {
 	}
 
 	shader, err := s.device.CreateShaderModule(&wgpu.ShaderModuleDescriptor{
-		Label:          "shader.wgsl",
-		WGSLDescriptor: &wgpu.ShaderModuleWGSLDescriptor{Code: shader},
+		Label:      "shader.wgsl",
+		WGSLSource: &wgpu.ShaderSourceWGSL{Code: shader},
 	})
 	if err != nil {
 		return s, err

examples/triangle/main.go

@@ -72,8 +72,8 @@ func InitState[T interface{ GetSize() (int, int) }](window T, sd *wgpu.SurfaceDe
 	s.queue = s.device.GetQueue()
 
 	shader, err := s.device.CreateShaderModule(&wgpu.ShaderModuleDescriptor{
-		Label:          "shader.wgsl",
-		WGSLDescriptor: &wgpu.ShaderModuleWGSLDescriptor{Code: shader},
+		Label:      "shader.wgsl",
+		WGSLSource: &wgpu.ShaderSourceWGSL{Code: shader},
 	})
 	if err != nil {
 		return s, err

getrelease.goal

@@ -0,0 +1,63 @@
+#!/usr/bin/env goal
+
+// gets the prebuilt release files from wgpu-native and installs
+// to wgpu/lib, moving exiting lib to lib_old.
+// after doing this, use:
+// * lib-old.goal to switch lib-> lib_new, lib_old -> lib
+// * lib-new.goal to go the other way
+// notes:
+// requires gh tool: https://github.com/cli/cli with authentication configured.
+// and goal: go install cogentcore.org/lab/goal/cmd/goal@main
+
+[mkdir release]
+cd release
+[/bin/rm -rf wgpu-native]
+[/bin/rm -rf zips]
+[mkdir zips]
+git clone https://github.com/gfx-rs/wgpu-native
+cd wgpu-native
+gh release download --dir ../zips -p "*-release.zip"
+cd ../zips
+zips := goalib.SplitLines($ls -1 "*.zip"$)
+cd ../..
+mv wgpu/lib wgpu/lib_old
+[/bin/rm -rf wgpu/lib]
+mkdir wgpu/lib
+cd wgpu/lib
+for _, f := range zips {
+	fmt.Println(f)
+	if strings.Contains(f, "-x86_64-msvc-") || strings.Contains(f, "-aarch64-simulator-") {
+		continue
+	}
+	sp := strings.Split(f, "-")
+	plt := strings.Join(sp[1:3], "-")
+	[mkdir {plt}]
+	cd {plt}
+	unzip {"../../../release/zips/" + f}
+	cd ../
+}
+
+/bin/cp ../lib_old/vendor.go .
+
+type files struct {
+	zip, trg, arch string
+}
+
+fls := []files{{"macos-aarch64", "darwin", "arm64"},{"macos-x86_64", "darwin", "amd64"},{"ios-aarch64", "ios", "arm64"},{"ios-x86_64", "ios", "amd64"},{"windows-aarch64", "windows", "arm64"},{"windows-x86_64", "windows", "amd64"}, {"windows-i686", "windows", "386"}, {"linux-aarch64", "linux", "arm64"},{"linux-x86_64", "linux", "amd64"}, {"android-aarch64", "android", "arm64"}, {"android-x86_64", "android", "amd64"}, {"android-armv7", "android", "arm"},{"android-i686", "android", "386"}}
+
+for _, f := range fls {
+	fmt.Println(f)
+	[mkdir {f.trg}]
+	cd {f.trg}
+	[mkdir {f.arch}]
+	cd {f.arch}
+	[/bin/cp -av {"../../" + f.zip + "/lib/libwgpu_native.a"} .]
+	if f.zip == "windows-aarch64" {
+		/bin/cp -av {"../../" + f.zip + "/lib/wgpu_native.lib"} libwgpu_native.a
+	}
+	/bin/cp -av {"../../" + f.zip + "/include/webgpu/*.h"} .
+	goalib.WriteFile("vendor.go", "package vendor")
+	cd ../../
+	/bin/rm -rf {f.zip}
+}
+

lib-new.goal

@@ -0,0 +1,8 @@
+#!/usr/bin/env goal
+
+// moves current wgpu/lib to wgpu/lib_old
+// and restores wgpu/lib_new as wgpu/lib
+
+mv wgpu/lib wgpu/lib_old
+mv wgpu/lib_new wgpu/lib
+

lib-old.goal

@@ -0,0 +1,8 @@
+#!/usr/bin/env goal
+
+// moves current wgpu/lib to wgpu/lib_new
+// and restores wgpu/lib_old as wgpu/lib
+
+mv wgpu/lib wgpu/lib_new
+mv wgpu/lib_old wgpu/lib
+