major update to latest cogent core version, for achival purposes before removing from core.

Author: rcoreilly

README.md

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 

vgpu/cmds.go cmds.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -29,12 +29,12 @@ func (sy *System) ComputeCmdBuff() vk.CommandBuffer {
 
 // ComputeResetBindVars adds command to the given
 // command buffer, to bind the Vars descriptors,
-// for given collection of descriptors descIdx
+// for given collection of descriptors descIndex
 // (see Vars NDescs for info).
 // Required whenever variables have changed their mappings,
 // before running a command.
-func (sy *System) ComputeResetBindVars(cmd vk.CommandBuffer, descIdx int) {
-	sy.CmdResetBindVars(cmd, descIdx)
+func (sy *System) ComputeResetBindVars(cmd vk.CommandBuffer, descIndex int) {
+	sy.CmdResetBindVars(cmd, descIndex)
 }
 
 // ComputeResetBegin resets and begins the recording of commands
@@ -118,16 +118,16 @@ func (sy *System) ComputeWaitEvents(cmd vk.CommandBuffer, event ...string) error
 
 // ComputeCopyToGPU records command to copy given regions
 // in the Storage buffer memory from CPU to GPU, in one call.
-// Use SyncRegValIdxFmCPU to get the regions.
+// Use SyncRegValueIndexFromCPU to get the regions.
 func (sy *System) ComputeCopyToGPU(cmd vk.CommandBuffer, regs ...MemReg) {
 	sy.Mem.CmdTransferStorageRegsToGPU(cmd, regs)
 }
 
-// ComputeCopyFmGPU records command to copy given regions
+// ComputeCopyFromGPU records command to copy given regions
 // in the Storage buffer memory from GPU to CPU, in one call.
-// Use SyncRegValIdxFmCPU to get the regions.
-func (sy *System) ComputeCopyFmGPU(cmd vk.CommandBuffer, regs ...MemReg) {
-	sy.Mem.CmdTransferStorageRegsFmGPU(cmd, regs)
+// Use SyncRegValueIndexFromCPU to get the regions.
+func (sy *System) ComputeCopyFromGPU(cmd vk.CommandBuffer, regs ...MemReg) {
+	sy.Mem.CmdTransferStorageRegsFromGPU(cmd, regs)
 }
 
 // ComputeWaitMemWriteRead records pipeline barrier ensuring

vgpu/compute.go compute.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 

vgpu/consts.go consts.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -10,7 +10,7 @@ package vgpu
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"runtime"
 	"strings"
 )
@@ -64,7 +64,7 @@ func (frame *StackFrame) String() string {
 
 // SourceLine gets the line of code (from File and Line) of the original source if possible
 func (frame *StackFrame) SourceLine() (string, error) {
-	data, err := ioutil.ReadFile(frame.File)
+	data, err := os.ReadFile(frame.File)
 
 	if err != nil {
 		return "", err

vgpu/debug.go debug.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 

vgpu/device.go device.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@ Package vgpu implements a convenient interface to the Vulkan GPU-based
 graphics and compute framework, in Go, using the
 https://github.com/goki/vulkan Go bindings.
 
-The GoGi GUI framework runs on top if this, replacing the previous
+The Cogent Core GUI framework runs on top if this, replacing the previous
 OpenGL-based framework, and the compute engine is used for the
 emergent neural network simulation framework.
 */

doc.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 

enumgen.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -9,8 +9,8 @@ import (
 	"math/rand"
 	"runtime"
 
-	"goki.dev/mat32/v2"
-	"goki.dev/vgpu/v2/vgpu"
+	"cogentcore.org/core/math32"
+	"cogentcore.org/core/vgpu"
 )
 
 func init() {
@@ -28,7 +28,7 @@ func main() {
 	gp.Config("compute1")
 	fmt.Printf("Running on GPU: %s\n", gp.DeviceName)
 
-	// gp.PropsString(true) // print
+	// gp.PropertiesString(true) // print
 
 	sy := gp.NewComputeSystem("compute1")
 	pl := sy.NewPipeline("compute1")
@@ -40,19 +40,19 @@ func main() {
 	n := 20 // note: not necc to spec up-front, but easier if so
 
 	threads := 64
-	nInt := mat32.IntMultiple(float32(n), float32(threads))
+	nInt := math32.IntMultiple(float32(n), float32(threads))
 	n = int(nInt)       // enforce optimal n's -- otherwise requires range checking
 	nGps := n / threads // dispatch n
 	fmt.Printf("n: %d\n", n)
 
-	inv := set.Add("In", vgpu.Float32Vec4, n, vgpu.Storage, vgpu.ComputeShader)
-	outv := set.Add("Out", vgpu.Float32Vec4, n, vgpu.Storage, vgpu.ComputeShader)
+	inv := set.Add("In", vgpu.Float32Vector4, n, vgpu.Storage, vgpu.ComputeShader)
+	outv := set.Add("Out", vgpu.Float32Vector4, n, vgpu.Storage, vgpu.ComputeShader)
 	_ = outv
 
-	set.ConfigVals(1) // one val per var
-	sy.Config()       // configures vars, allocates vals, configs pipelines..
+	set.ConfigValues(1) // one val per var
+	sy.Config()         // configures vars, allocates vals, configs pipelines..
 
-	ivl, _ := inv.Vals.ValByIdxTry(0)
+	ivl, _ := inv.Values.ValueByIndexTry(0)
 	idat := ivl.Floats32()
 	for i := 0; i < n; i++ {
 		idat[i*4+0] = rand.Float32()
@@ -64,16 +64,16 @@ func main() {
 
 	sy.Mem.SyncToGPU()
 
-	vars.BindDynValsAllIdx(0)
+	vars.BindDynValuesAllIndex(0)
 
 	cmd := sy.ComputeCmdBuff()
 	sy.ComputeResetBindVars(cmd, 0)
 	pl.ComputeDispatch(cmd, nGps, 1, 1)
 	sy.ComputeCmdEnd(cmd)
 	sy.ComputeSubmitWait(cmd) // if no wait, faster, but validation complains
 
-	sy.Mem.SyncValIdxFmGPU(0, "Out", 0)
-	_, ovl, _ := vars.ValByIdxTry(0, "Out", 0)
+	sy.Mem.SyncValueIndexFromGPU(0, "Out", 0)
+	_, ovl, _ := vars.ValueByIndexTry(0, "Out", 0)
 
 	odat := ovl.Floats32()
 	for i := 0; i < n; i++ {

vgpu/errors.go errors.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, The Goki Authors. All rights reserved.
+// Copyright (c) 2022, Cogent Core. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -13,9 +13,9 @@ import (
 
 	vk "github.com/goki/vulkan"
 
+	"cogentcore.org/core/math32"
+	"cogentcore.org/core/vgpu"
 	"github.com/go-gl/glfw/v3.3/glfw"
-	"goki.dev/mat32/v2"
-	"goki.dev/vgpu/v2/vgpu"
 )
 
 func init() {
@@ -24,9 +24,9 @@ func init() {
 }
 
 type CamView struct {
-	Model mat32.Mat4
-	View  mat32.Mat4
-	Prjn  mat32.Mat4
+	Model      math32.Matrix4
+	View       math32.Matrix4
+	Projection math32.Matrix4
 }
 
 func main() {
@@ -45,7 +45,7 @@ func main() {
 	vgpu.Debug = true
 	gp.Config("drawidx")
 
-	// gp.PropsString(true) // print
+	// gp.PropertiesString(true) // print
 
 	surfPtr, err := window.CreateWindowSurface(gp.Instance, nil)
 	if err != nil {
@@ -83,47 +83,47 @@ func main() {
 
 	nPts := 3
 
-	posv := vset.Add("Pos", vgpu.Float32Vec3, nPts, vgpu.Vertex, vgpu.VertexShader)
-	clrv := vset.Add("Color", vgpu.Float32Vec3, nPts, vgpu.Vertex, vgpu.VertexShader)
+	posv := vset.Add("Pos", vgpu.Float32Vector3, nPts, vgpu.Vertex, vgpu.VertexShader)
+	clrv := vset.Add("Color", vgpu.Float32Vector3, nPts, vgpu.Vertex, vgpu.VertexShader)
 	// note: always put indexes last so there isn't a gap in the location indexes!
 	// just the fact of adding one (and only one) Index type triggers indexed render
 	idxv := vset.Add("Index", vgpu.Uint16, nPts, vgpu.Index, vgpu.VertexShader)
 
 	camv := set.Add("Camera", vgpu.Struct, 1, vgpu.Uniform, vgpu.VertexShader)
-	camv.SizeOf = vgpu.Float32Mat4.Bytes() * 3 // no padding for these
+	camv.SizeOf = vgpu.Float32Matrix4.Bytes() * 3 // no padding for these
 
-	vset.ConfigVals(1) // one val per var
-	set.ConfigVals(1)  // one val per var
+	vset.ConfigValues(1) // one val per var
+	set.ConfigValues(1)  // one val per var
 	sy.Config()
 
-	triPos, _ := posv.Vals.ValByIdxTry(0)
+	triPos, _ := posv.Values.ValueByIndexTry(0)
 	triPosA := triPos.Floats32()
 	triPosA.Set(0,
 		-0.5, 0.5, 0.0,
 		0.5, 0.5, 0.0,
 		0.0, -0.5, 0.0) // negative point is UP in native Vulkan
 	triPos.SetMod()
 
-	triClr, _ := clrv.Vals.ValByIdxTry(0)
+	triClr, _ := clrv.Values.ValueByIndexTry(0)
 	triClrA := triClr.Floats32()
 	triClrA.Set(0,
 		1.0, 0.0, 0.0,
 		0.0, 1.0, 0.0,
 		0.0, 0.0, 1.0)
 	triClr.SetMod()
 
-	triIdx, _ := idxv.Vals.ValByIdxTry(0)
+	triIndex, _ := idxv.Values.ValueByIndexTry(0)
 	idxs := []uint16{0, 1, 2}
-	triIdx.CopyFromBytes(unsafe.Pointer(&idxs[0]))
+	triIndex.CopyFromBytes(unsafe.Pointer(&idxs[0]))
 
 	// This is the standard camera view projection computation
-	cam, _ := camv.Vals.ValByIdxTry(0)
-	campos := mat32.V3(0, 0, 2)
-	target := mat32.V3(0, 0, 0)
-	var lookq mat32.Quat
-	lookq.SetFromRotationMatrix(mat32.NewLookAt(campos, target, mat32.V3(0, 1, 0)))
-	scale := mat32.V3(1, 1, 1)
-	var cview mat32.Mat4
+	cam, _ := camv.Values.ValueByIndexTry(0)
+	campos := math32.Vec3(0, 0, 2)
+	target := math32.Vec3(0, 0, 0)
+	var lookq math32.Quat
+	lookq.SetFromRotationMatrix(math32.NewLookAt(campos, target, math32.Vec3(0, 1, 0)))
+	scale := math32.Vec3(1, 1, 1)
+	var cview math32.Matrix4
 	cview.SetTransform(campos, lookq, scale)
 	view, _ := cview.Inverse()
 
@@ -132,16 +132,13 @@ func main() {
 	camo.View.CopyFrom(view)
 	aspect := float32(sf.Format.Size.X) / float32(sf.Format.Size.Y)
 	fmt.Printf("aspect: %g\n", aspect)
-	// VkPerspective version automatically flips Y axis and shifts depth
-	// into a 0..1 range instead of -1..1, so original GL based geometry
-	// will render identically here.
-	camo.Prjn.SetVkPerspective(45, aspect, 0.01, 100)
+	camo.Projection.SetPerspective(45, aspect, 0.01, 100)
 
 	cam.CopyFromBytes(unsafe.Pointer(&camo)) // sets mod
 
 	sy.Mem.SyncToGPU()
 
-	vars.BindDynVal(0, camv, cam)
+	vars.BindDynamicValue(0, camv, cam)
 
 	frameCount := 0
 	stTime := time.Now()
@@ -153,12 +150,15 @@ func main() {
 		cam.CopyFromBytes(unsafe.Pointer(&camo)) // sets mod
 		sy.Mem.SyncToGPU()
 
-		idx := sf.AcquireNextImage()
+		idx, ok := sf.AcquireNextImage()
+		if !ok {
+			return
+		}
 		// fmt.Printf("\nacq: %v\n", time.Now().Sub(rt))
-		descIdx := 0 // if running multiple frames in parallel, need diff sets
+		descIndex := 0 // if running multiple frames in parallel, need diff sets
 		cmd := sy.CmdPool.Buff
-		sy.ResetBeginRenderPass(cmd, sf.Frames[idx], descIdx)
-		pl.BindDrawVertex(cmd, descIdx)
+		sy.ResetBeginRenderPass(cmd, sf.Frames[idx], descIndex)
+		pl.BindDrawVertex(cmd, descIndex)
 		sy.EndRenderPass(cmd)
 		// fmt.Printf("cmd %v\n", time.Now().Sub(rt))
 		sf.SubmitRender(cmd) // this is where it waits for the 16 msec

examples/compute1/compute.go

@@ -6,15 +6,15 @@ layout(binding = 0) uniform UniformBufferObject {
     mat4 Proj;
 } Camera;
 
-layout(location = 0) in vec3 Pos;
-layout(location = 1) in vec3 Color;
-// layout(location = 2) in vec2 TexCoord;
+layout(location = 0) in vector3 Pos;
+layout(location = 1) in vector3 Color;
+// layout(location = 2) in vector2 TexCoord;
 
-layout(location = 0) out vec3 FragColor;
-// layout(location = 1) out vec2 FragTexCoord;
+layout(location = 0) out vector3 FragColor;
+// layout(location = 1) out vector2 FragTexCoord;
 
 void main() {
-   vec4 pos = vec4(Pos, 1.0);
+   vector4 pos = vector4(Pos, 1.0);
    gl_Position = Camera.Proj * Camera.View * Camera.Model * pos;
     FragColor = Color;
    // FragTexCoord = TexCoord;

examples/drawidx/drawidx.go

@@ -1,10 +1,10 @@
 #version 450
 
-layout(location = 0) in vec3 FragColor;
+layout(location = 0) in vector3 FragColor;
 
-layout(location = 0) out vec4 OutColor;
+layout(location = 0) out vector4 OutColor;
 
 void main() {
-    OutColor = vec4(FragColor, 1.0);
+    OutColor = vector4(FragColor, 1.0);
 }