mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphicsdriver/opengl: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2018-11-17 22:40:21 +09:00
parent ef08e218c8
commit d8f337985d
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,8 @@ type openGLState struct {
programScreen program programScreen program
lastProgram program lastProgram program
lastViewportSize []float32 lastViewportWidth int
lastViewportHeight int
lastColorMatrix []float32 lastColorMatrix []float32
lastColorMatrixTranslation []float32 lastColorMatrixTranslation []float32
lastSourceWidth int lastSourceWidth int
@ -151,7 +152,8 @@ func (s *openGLState) reset(context *context) error {
} }
s.lastProgram = zeroProgram s.lastProgram = zeroProgram
s.lastViewportSize = nil s.lastViewportWidth = 0
s.lastViewportHeight = 0
s.lastColorMatrix = nil s.lastColorMatrix = nil
s.lastColorMatrixTranslation = nil s.lastColorMatrixTranslation = nil
s.lastSourceWidth = 0 s.lastSourceWidth = 0
@ -266,10 +268,6 @@ func (d *Driver) useProgram(mode graphics.CompositeMode, colorM *affine.ColorM,
if err := destination.setViewport(); err != nil { if err := destination.setViewport(); err != nil {
return err return err
} }
viewportSize := []float32{
float32(destination.framebuffer.width),
float32(destination.framebuffer.height),
}
dstW := destination.width dstW := destination.width
srcW, srcH := source.width, source.height srcW, srcH := source.width, source.height
@ -301,36 +299,31 @@ func (d *Driver) useProgram(mode graphics.CompositeMode, colorM *affine.ColorM,
} }
d.state.lastProgram = program d.state.lastProgram = program
d.state.lastViewportSize = nil d.state.lastViewportWidth = 0
d.state.lastViewportHeight = 0
d.state.lastColorMatrix = nil d.state.lastColorMatrix = nil
d.state.lastColorMatrixTranslation = nil d.state.lastColorMatrixTranslation = nil
d.state.lastSourceWidth = 0 d.state.lastSourceWidth = 0
d.state.lastSourceHeight = 0 d.state.lastSourceHeight = 0
} }
if !areSameFloat32Array(d.state.lastViewportSize, viewportSize) { vw := destination.framebuffer.width
d.context.uniformFloats(program, "viewport_size", viewportSize) vh := destination.framebuffer.height
if d.state.lastViewportSize == nil { if d.state.lastViewportWidth != vw || d.state.lastSourceHeight != vh {
d.state.lastViewportSize = make([]float32, 2) d.context.uniformFloats(program, "viewport_size", []float32{float32(vw), float32(vh)})
} d.state.lastViewportWidth = vw
d.state.lastViewportSize = viewportSize d.state.lastViewportHeight = vh
} }
esBody, esTranslate := colorM.UnsafeElements() esBody, esTranslate := colorM.UnsafeElements()
if !areSameFloat32Array(d.state.lastColorMatrix, esBody) { if !areSameFloat32Array(d.state.lastColorMatrix, esBody) {
d.context.uniformFloats(program, "color_matrix_body", esBody) d.context.uniformFloats(program, "color_matrix_body", esBody)
if d.state.lastColorMatrix == nil {
d.state.lastColorMatrix = make([]float32, 16)
}
// ColorM's elements are immutable. It's OK to hold the reference without copying. // ColorM's elements are immutable. It's OK to hold the reference without copying.
d.state.lastColorMatrix = esBody d.state.lastColorMatrix = esBody
} }
if !areSameFloat32Array(d.state.lastColorMatrixTranslation, esTranslate) { if !areSameFloat32Array(d.state.lastColorMatrixTranslation, esTranslate) {
d.context.uniformFloats(program, "color_matrix_translation", esTranslate) d.context.uniformFloats(program, "color_matrix_translation", esTranslate)
if d.state.lastColorMatrixTranslation == nil {
d.state.lastColorMatrixTranslation = make([]float32, 4)
}
// ColorM's elements are immutable. It's OK to hold the reference without copying. // ColorM's elements are immutable. It's OK to hold the reference without copying.
d.state.lastColorMatrixTranslation = esTranslate d.state.lastColorMatrixTranslation = esTranslate
} }