mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: Reduce calling glUseProgram

Browse Source
This commit is contained in:
Hajime Hoshi 2016-05-29 22:40:51 +09:00
parent 583fc07f3a
commit f6fd8f9c6d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
image.go
View File

@ -276,7 +276,6 @@ func (i *imageImpl) DrawImage(image *Image, options *DrawImageOptions) error {
if n == 0 { if n == 0 {
return nil return nil
} }
if i == image.impl { if i == image.impl {
return errors.New("ebiten: Image.DrawImage: image should be different from the receiver") return errors.New("ebiten: Image.DrawImage: image should be different from the receiver")
} }

20
internal/graphics/program.go
View File

@ -24,10 +24,11 @@ type openGLState struct {
indexBufferQuads opengl.Buffer indexBufferQuads opengl.Buffer
programTexture opengl.Program programTexture opengl.Program
lastProgram opengl.Program lastProgram opengl.Program
lastProjectionMatrix []float32 lastProjectionMatrix []float32
lastModelviewMatrix []float32 lastModelviewMatrix []float32
lastColorMatrix []float32 lastColorMatrix []float32
lastColorMatrixTranslation []float32
} }
var theOpenGLState openGLState var theOpenGLState openGLState
@ -57,6 +58,7 @@ func (s *openGLState) initialize(c *opengl.Context) error {
s.lastProjectionMatrix = nil s.lastProjectionMatrix = nil
s.lastModelviewMatrix = nil s.lastModelviewMatrix = nil
s.lastColorMatrix = nil s.lastColorMatrix = nil
s.lastColorMatrixTranslation = nil
shaderVertexModelviewNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertexModelview)) shaderVertexModelviewNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertexModelview))
if err != nil { if err != nil {
@ -101,6 +103,7 @@ func (s *openGLState) finalize(c *opengl.Context) error {
s.lastProjectionMatrix = nil s.lastProjectionMatrix = nil
s.lastModelviewMatrix = nil s.lastModelviewMatrix = nil
s.lastColorMatrix = nil s.lastColorMatrix = nil
s.lastColorMatrixTranslation = nil
c.DeleteBuffer(s.indexBufferQuads) c.DeleteBuffer(s.indexBufferQuads)
c.DeleteProgram(s.programTexture) c.DeleteProgram(s.programTexture)
return nil return nil
@ -136,6 +139,7 @@ func (p *programContext) begin() {
p.state.lastProjectionMatrix = nil p.state.lastProjectionMatrix = nil
p.state.lastModelviewMatrix = nil p.state.lastModelviewMatrix = nil
p.state.lastColorMatrix = nil p.state.lastColorMatrix = nil
p.state.lastColorMatrixTranslation = nil
} }
c.BindElementArrayBuffer(p.state.indexBufferQuads) c.BindElementArrayBuffer(p.state.indexBufferQuads)
@ -192,7 +196,13 @@ func (p *programContext) begin() {
colorMatrixTranslation := []float32{ colorMatrixTranslation := []float32{
e[0][4], e[1][4], e[2][4], e[3][4], e[0][4], e[1][4], e[2][4], e[3][4],
} }
c.UniformFloats(p.program, "color_matrix_translation", colorMatrixTranslation) if !areSameFloat32Array(p.state.lastColorMatrixTranslation, colorMatrixTranslation) {
c.UniformFloats(p.program, "color_matrix_translation", colorMatrixTranslation)
if p.state.lastColorMatrixTranslation == nil {
p.state.lastColorMatrixTranslation = make([]float32, 4)
}
copy(p.state.lastColorMatrixTranslation, colorMatrixTranslation)
}
// We don't have to call gl.ActiveTexture here: GL_TEXTURE0 is the default active texture // We don't have to call gl.ActiveTexture here: GL_TEXTURE0 is the default active texture
// See also: https://www.opengl.org/sdk/docs/man2/xhtml/glActiveTexture.xml // See also: https://www.opengl.org/sdk/docs/man2/xhtml/glActiveTexture.xml