gpu,gpu/internal: move vertex buffer stride to pipeline state

Metal needs the vertex stride at pipeline creation.

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

gpu/internal/d3d11/d3d11_windows.go

@@ -26,6 +26,10 @@ type Backend struct {
 	viewport   d3d11.VIEWPORT
 
 	pipeline *Pipeline
+	vert     struct {
+		buffer *Buffer
+		offset int
+	}
 
 	caps driver.Caps
 
@@ -40,6 +44,7 @@ type Pipeline struct {
 	frag   *d3d11.PixelShader
 	layout *d3d11.InputLayout
 	blend  *d3d11.BlendState
+	stride int
 }
 
 type Texture struct {
@@ -375,9 +380,9 @@ func (b *Backend) NewPipeline(desc driver.PipelineDesc) (driver.Pipeline, error)
 		return nil, err
 	}
 	var layout *d3d11.InputLayout
-	if l := desc.VertexLayout; l != nil {
+	if l := desc.VertexLayout; l.Stride > 0 {
 		var err error
-		layout, err = b.newInputLayout(vsh.src, l)
+		layout, err = b.newInputLayout(vsh.src, l.Inputs)
 		if err != nil {
 			d3d11.IUnknownRelease(unsafe.Pointer(blend), blend.Vtbl.AddRef)
 			return nil, err
@@ -394,6 +399,7 @@ func (b *Backend) NewPipeline(desc driver.PipelineDesc) (driver.Pipeline, error)
 		vert:   vshRef,
 		frag:   fshRef,
 		layout: layout,
+		stride: desc.VertexLayout.Stride,
 		blend:  blend,
 	}, nil
 }
@@ -460,6 +466,9 @@ func (b *Backend) prepareDraw(mode driver.DrawMode) {
 		b.ctx.PSSetShader(p.frag)
 		b.ctx.IASetInputLayout(p.layout)
 		b.ctx.OMSetBlendState(p.blend, nil, 0xffffffff)
+		if b.vert.buffer != nil {
+			b.ctx.IASetVertexBuffers(b.vert.buffer.buf, uint32(p.stride), uint32(b.vert.offset))
+		}
 	}
 	var topology uint32
 	switch mode {
@@ -562,8 +571,9 @@ func (b *Backend) BindFragmentUniforms(buffer driver.Buffer) {
 	b.ctx.PSSetConstantBuffers(buf.buf)
 }
 
-func (b *Backend) BindVertexBuffer(buf driver.Buffer, stride, offset int) {
-	b.ctx.IASetVertexBuffers(buf.(*Buffer).buf, uint32(stride), uint32(offset))
+func (b *Backend) BindVertexBuffer(buf driver.Buffer, offset int) {
+	b.vert.buffer = buf.(*Buffer)
+	b.vert.offset = offset
 }
 
 func (b *Backend) BindIndexBuffer(buf driver.Buffer) {

gpu/internal/driver/driver.go

@@ -38,7 +38,7 @@ type Device interface {
 	BindPipeline(p Pipeline)
 	BindFramebuffer(f Framebuffer, a LoadDesc)
 	BindTexture(unit int, t Texture)
-	BindVertexBuffer(b Buffer, stride, offset int)
+	BindVertexBuffer(b Buffer, offset int)
 	BindIndexBuffer(b Buffer)
 	BindImageTexture(unit int, texture Texture, access AccessBits, format TextureFormat)
 	BindVertexUniforms(buf Buffer)
@@ -69,11 +69,16 @@ type Pipeline interface {
 type PipelineDesc struct {
 	VertexShader   VertexShader
 	FragmentShader FragmentShader
-	VertexLayout   []InputDesc
+	VertexLayout   VertexLayout
 	BlendDesc      BlendDesc
 	PixelFormat    TextureFormat
 }
 
+type VertexLayout struct {
+	Inputs []InputDesc
+	Stride int
+}
+
 // InputDesc describes a vertex attribute as laid out in a Buffer.
 type InputDesc struct {
 	Type shader.DataType

gpu/internal/opengl/opengl.go

@@ -90,7 +90,6 @@ type state struct {
 type bufferBinding struct {
 	obj    gl.Buffer
 	offset int
-	stride int
 }
 
 type timer struct {
@@ -115,7 +114,7 @@ type framebuffer struct {
 type pipeline struct {
 	prog   *program
 	inputs []shader.InputLocation
-	layout []driver.InputDesc
+	layout driver.VertexLayout
 	blend  driver.BlendDesc
 }
 
@@ -900,11 +899,11 @@ func (b *Backend) NewPipeline(desc driver.PipelineDesc) (driver.Pipeline, error)
 	}
 	layout := desc.VertexLayout
 	vsrc := desc.VertexShader.(*glshader).src
-	if len(vsrc.Inputs) != len(layout) {
-		return nil, fmt.Errorf("opengl: got %d inputs, expected %d", len(layout), len(vsrc.Inputs))
+	if len(vsrc.Inputs) != len(layout.Inputs) {
+		return nil, fmt.Errorf("opengl: got %d inputs, expected %d", len(layout.Inputs), len(vsrc.Inputs))
 	}
 	for i, inp := range vsrc.Inputs {
-		if exp, got := inp.Size, layout[i].Size; exp != got {
+		if exp, got := inp.Size, layout.Inputs[i].Size; exp != got {
 			return nil, fmt.Errorf("opengl: data size mismatch for %q: got %d expected %d", inp.Name, got, exp)
 		}
 	}
@@ -1122,12 +1121,12 @@ func (b *buffer) Release() {
 	}
 }
 
-func (b *Backend) BindVertexBuffer(buf driver.Buffer, stride, offset int) {
+func (b *Backend) BindVertexBuffer(buf driver.Buffer, offset int) {
 	gbuf := buf.(*buffer)
 	if gbuf.typ&driver.BufferBindingVertices == 0 {
 		panic("not a vertex buffer")
 	}
-	b.state.buffer = bufferBinding{obj: gbuf.obj, stride: stride, offset: offset}
+	b.state.buffer = bufferBinding{obj: gbuf.obj, offset: offset}
 }
 
 func (b *Backend) setupVertexArrays() {
@@ -1141,7 +1140,7 @@ func (b *Backend) setupVertexArrays() {
 	var enabled [max]bool
 	buf := b.state.buffer
 	for i, inp := range inputs {
-		l := layout[i]
+		l := layout.Inputs[i]
 		var gltyp gl.Enum
 		switch l.Type {
 		case shader.DataTypeFloat:
@@ -1152,7 +1151,7 @@ func (b *Backend) setupVertexArrays() {
 			panic("unsupported data type")
 		}
 		enabled[inp.Location] = true
-		b.glstate.vertexAttribPointer(b.funcs, buf.obj, inp.Location, l.Size, gltyp, false, buf.stride, buf.offset+l.Offset)
+		b.glstate.vertexAttribPointer(b.funcs, buf.obj, inp.Location, l.Size, gltyp, false, p.layout.Stride, buf.offset+l.Offset)
 	}
 	for i := 0; i < max; i++ {
 		b.glstate.setVertexAttribArray(b.funcs, i, enabled[i])