mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/opengl: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-03-20 13:22:51 +09:00
parent 8b267265ed
commit 23e90b7e39
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/graphicsdriver/opengl/context.go
View File

@ -18,7 +18,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"sync" "sync"
"unsafe"
"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver" "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl" "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl"
@ -503,13 +502,3 @@ func (c *context) newElementArrayBuffer(size int) buffer {
c.ctx.BufferInit(gl.ELEMENT_ARRAY_BUFFER, size, gl.DYNAMIC_DRAW) c.ctx.BufferInit(gl.ELEMENT_ARRAY_BUFFER, size, gl.DYNAMIC_DRAW)
return buffer(b) return buffer(b)
} }
func (c *context) arrayBufferSubData(data []float32) {
s := unsafe.Slice((*byte)(unsafe.Pointer(&data[0])), len(data)*4)
c.ctx.BufferSubData(gl.ARRAY_BUFFER, 0, s)
}
func (c *context) elementArrayBufferSubData(data []uint16) {
s := unsafe.Slice((*byte)(unsafe.Pointer(&data[0])), len(data)*2)
c.ctx.BufferSubData(gl.ELEMENT_ARRAY_BUFFER, 0, s)
}

4
internal/graphicsdriver/opengl/graphics.go
View File

@ -155,9 +155,7 @@ func (g *Graphics) Reset() error {
} }
func (g *Graphics) SetVertices(vertices []float32, indices []uint16) error { func (g *Graphics) SetVertices(vertices []float32, indices []uint16) error {
// Note that the vertices and the indices passed to BufferSubData is not under GC management in the gl package. g.state.setVertices(&g.context, vertices, indices)
g.context.arrayBufferSubData(vertices)
g.context.elementArrayBufferSubData(indices)
return nil return nil
} }

30
internal/graphicsdriver/opengl/program.go
View File

@ -63,11 +63,6 @@ func (a *arrayBufferLayout) totalBytes() int {
return a.total return a.total
} }
// newArrayBuffer creates OpenGL's buffer object for the array buffer.
func (a *arrayBufferLayout) newArrayBuffer(context *context) buffer {
return context.newArrayBuffer(a.totalBytes() * graphics.IndicesCount)
}
// enable starts using the array buffer. // enable starts using the array buffer.
func (a *arrayBufferLayout) enable(context *context) { func (a *arrayBufferLayout) enable(context *context) {
for i := range a.parts { for i := range a.parts {
@ -115,7 +110,6 @@ func init() {
} }
} }
// openGLState is a state for
type openGLState struct { type openGLState struct {
// arrayBuffer is OpenGL's array buffer (vertices data). // arrayBuffer is OpenGL's array buffer (vertices data).
arrayBuffer buffer arrayBuffer buffer
@ -150,13 +144,29 @@ func (s *openGLState) reset(context *context) error {
context.ctx.DeleteBuffer(uint32(s.elementArrayBuffer)) context.ctx.DeleteBuffer(uint32(s.elementArrayBuffer))
} }
} }
s.arrayBuffer = 0
s.arrayBuffer = theArrayBufferLayout.newArrayBuffer(context) s.elementArrayBuffer = 0
s.elementArrayBuffer = context.newElementArrayBuffer(graphics.IndicesCount * 2)
return nil return nil
} }
func (s *openGLState) setVertices(context *context, vertices []float32, indices []uint16) {
if s.arrayBuffer == 0 {
s.arrayBuffer = context.newArrayBuffer(graphics.IndicesCount * graphics.VertexFloatCount * floatSizeInBytes)
context.ctx.BindBuffer(gl.ARRAY_BUFFER, uint32(s.arrayBuffer))
}
if s.elementArrayBuffer == 0 {
s.elementArrayBuffer = context.newElementArrayBuffer(graphics.IndicesCount * 2)
context.ctx.BindBuffer(gl.ELEMENT_ARRAY_BUFFER, uint32(s.elementArrayBuffer))
}
// Note that the vertices and the indices passed to BufferSubData is not under GC management in the gl package.
vs := unsafe.Slice((*byte)(unsafe.Pointer(&vertices[0])), len(vertices)*4)
context.ctx.BufferSubData(gl.ARRAY_BUFFER, 0, vs)
is := unsafe.Slice((*byte)(unsafe.Pointer(&indices[0])), len(indices)*2)
context.ctx.BufferSubData(gl.ELEMENT_ARRAY_BUFFER, 0, is)
}
func (s *openGLState) resetLastUniforms() { func (s *openGLState) resetLastUniforms() {
for k := range s.lastUniforms { for k := range s.lastUniforms {
delete(s.lastUniforms, k) delete(s.lastUniforms, k)
@ -205,8 +215,6 @@ func (g *Graphics) useProgram(program program, uniforms []uniformVariable, textu
g.context.ctx.UseProgram(uint32(program)) g.context.ctx.UseProgram(uint32(program))
if g.state.lastProgram == 0 { if g.state.lastProgram == 0 {
theArrayBufferLayout.enable(&g.context) theArrayBufferLayout.enable(&g.context)
g.context.ctx.BindBuffer(gl.ARRAY_BUFFER, uint32(g.state.arrayBuffer))
g.context.ctx.BindBuffer(gl.ELEMENT_ARRAY_BUFFER, uint32(g.state.elementArrayBuffer))
} }
g.state.lastProgram = program g.state.lastProgram = program