interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix and improve code in NewShader

This commit is contained in:
faiface 2016-12-03 00:52:23 +01:00
parent 1fcf42263a
commit ea63453f9f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pixelgl/shader.go
View File

@ -58,6 +58,8 @@ func NewShader(parent Doer, vertexFormat VertexFormat, uniformFormat UniformForm
gl.GetShaderInfoLog(vshader, int32(len(infoLog)), nil, &infoLog[0]) gl.GetShaderInfoLog(vshader, int32(len(infoLog)), nil, &infoLog[0])
return fmt.Errorf("error compiling vertex shader: %s", string(infoLog)) return fmt.Errorf("error compiling vertex shader: %s", string(infoLog))
} }
defer gl.DeleteShader(vshader)
} }
// fragment shader // fragment shader
@ -78,6 +80,8 @@ func NewShader(parent Doer, vertexFormat VertexFormat, uniformFormat UniformForm
gl.GetShaderInfoLog(fshader, int32(len(infoLog)), nil, &infoLog[0]) gl.GetShaderInfoLog(fshader, int32(len(infoLog)), nil, &infoLog[0])
return fmt.Errorf("error compiling fragment shader: %s", string(infoLog)) return fmt.Errorf("error compiling fragment shader: %s", string(infoLog))
} }
defer gl.DeleteShader(fshader)
} }
// shader program // shader program
@ -98,15 +102,17 @@ func NewShader(parent Doer, vertexFormat VertexFormat, uniformFormat UniformForm
} }
} }
gl.DeleteShader(vshader)
gl.DeleteShader(fshader)
// uniforms // uniforms
for uname, utype := range uniformFormat { for uname, utype := range uniformFormat {
ulocation := gl.GetUniformLocation(shader.program, gl.Str(uname+"\x00")) ulocation := gl.GetUniformLocation(shader.program, gl.Str(uname+"\x00"))
if ulocation == -1 { if ulocation == -1 {
gl.DeleteProgram(shader.program)
return fmt.Errorf("shader does not contain uniform '%s'", uname) return fmt.Errorf("shader does not contain uniform '%s'", uname)
} }
if _, ok := shader.uniforms[utype]; ok {
gl.DeleteProgram(shader.program)
return fmt.Errorf("failed to create shader: invalid uniform format: duplicate uniform attribute")
}
shader.uniforms[utype] = ulocation shader.uniforms[utype] = ulocation
} }