gpu: avoid internal uniform buffer pointers

Uniform buffers are byte slice backed by Go structs. However, if a uniform
buffer value is embedded in a larger structure with pointers, the Cgo
pointer checker will complain. Avoid the error by moving the uniform
values into separate structures.

Signed-off-by: Elias Naur <mail@eliasnaur.com>

gpu/gpu.go

@@ -216,22 +216,26 @@ type blitter struct {
 	viewport    image.Point
 	prog        [2]*program
 	layout      backend.InputLayout
-	colUniforms struct {
+	colUniforms *blitColUniforms
-		vert struct {
+	texUniforms *blitTexUniforms
-			blitUniforms
+	quadVerts   backend.Buffer
-			_ [8]byte // Padding to a multiple of 16.
+}
-		}
+
-		frag struct {
+type blitColUniforms struct {
-			colorUniforms
+	vert struct {
-		}
+		blitUniforms
+		_ [8]byte // Padding to a multiple of 16.
 	}
-	texUniforms struct {
+	frag struct {
-		vert struct {
+		colorUniforms
-			blitUniforms
+	}
-			_ [8]byte // Padding to a multiple of 16.
+}
-		}
+
+type blitTexUniforms struct {
+	vert struct {
+		blitUniforms
+		_ [8]byte // Padding to a multiple of 16.
 	}
-	quadVerts backend.Buffer
 }
 
 type uniformBuffer struct {
@@ -431,6 +435,8 @@ func newBlitter(ctx backend.Device) *blitter {
 		ctx:       ctx,
 		quadVerts: quadVerts,
 	}
+	b.colUniforms = new(blitColUniforms)
+	b.texUniforms = new(blitTexUniforms)
 	prog, layout, err := createColorPrograms(ctx, shader_blit_vert, shader_blit_frag,
 		[2]interface{}{&b.colUniforms.vert, &b.texUniforms.vert}, [2]interface{}{&b.colUniforms.frag, nil})
 	if err != nil {

gpu/path.go

@@ -27,22 +27,26 @@ type pather struct {
 type coverer struct {
 	ctx         backend.Device
 	prog        [2]*program
-	texUniforms struct {
+	texUniforms *coverTexUniforms
-		vert struct {
+	colUniforms *coverColUniforms
-			coverUniforms
+	layout      backend.InputLayout
-			_ [8]byte // Padding to multiple of 16.
+}
-		}
+
+type coverTexUniforms struct {
+	vert struct {
+		coverUniforms
+		_ [8]byte // Padding to multiple of 16.
 	}
-	colUniforms struct {
+}
-		vert struct {
+
-			coverUniforms
+type coverColUniforms struct {
-			_ [8]byte // Padding to multiple of 16.
+	vert struct {
-		}
+		coverUniforms
-		frag struct {
+		_ [8]byte // Padding to multiple of 16.
-			colorUniforms
+	}
-		}
+	frag struct {
+		colorUniforms
 	}
-	layout backend.InputLayout
 }
 
 type coverUniforms struct {
@@ -60,31 +64,35 @@ type stenciler struct {
 	ctx  backend.Device
 	prog struct {
 		prog     *program
-		uniforms struct {
+		uniforms *stencilUniforms
-			vert struct {
+		layout   backend.InputLayout
-				scale      [2]float32
-				offset     [2]float32
-				pathOffset [2]float32
-				_          [8]byte // Padding to multiple of 16.
-			}
-		}
-		layout backend.InputLayout
 	}
 	iprog struct {
 		prog     *program
-		uniforms struct {
+		uniforms *intersectUniforms
-			vert struct {
+		layout   backend.InputLayout
-				uvScale  [2]float32
-				uvOffset [2]float32
-			}
-		}
-		layout backend.InputLayout
 	}
 	fbos          fboSet
 	intersections fboSet
 	indexBuf      backend.Buffer
 }
 
+type stencilUniforms struct {
+	vert struct {
+		scale      [2]float32
+		offset     [2]float32
+		pathOffset [2]float32
+		_          [8]byte // Padding to multiple of 16.
+	}
+}
+
+type intersectUniforms struct {
+	vert struct {
+		uvScale  [2]float32
+		uvOffset [2]float32
+	}
+}
+
 type fboSet struct {
 	fbos []stencilFBO
 }
@@ -125,6 +133,8 @@ func newCoverer(ctx backend.Device) *coverer {
 	c := &coverer{
 		ctx: ctx,
 	}
+	c.colUniforms = new(coverColUniforms)
+	c.texUniforms = new(coverTexUniforms)
 	prog, layout, err := createColorPrograms(ctx, shader_cover_vert, shader_cover_frag,
 		[2]interface{}{&c.colUniforms.vert, &c.texUniforms.vert},
 		[2]interface{}{&c.colUniforms.frag, nil},
@@ -178,6 +188,7 @@ func newStenciler(ctx backend.Device) *stenciler {
 	if err != nil {
 		panic(err)
 	}
+	st.prog.uniforms = new(stencilUniforms)
 	vertUniforms := newUniformBuffer(ctx, &st.prog.uniforms.vert)
 	st.prog.prog = newProgram(prog, vertUniforms, nil)
 	st.prog.layout = progLayout
@@ -185,6 +196,7 @@ func newStenciler(ctx backend.Device) *stenciler {
 	if err != nil {
 		panic(err)
 	}
+	st.iprog.uniforms = new(intersectUniforms)
 	vertUniforms = newUniformBuffer(ctx, &st.iprog.uniforms.vert)
 	st.iprog.prog = newProgram(iprog, vertUniforms, nil)
 	st.iprog.layout = iprogLayout