mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-13 04:22:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

opengl: Use the safer way to pass Go string to C

Browse Source
This commit is contained in:
Hajime Hoshi 2018-08-04 05:22:40 +09:00
parent 18d77d3f6e
commit 063edfcc4a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/opengl/context_desktop.go
View File

@ -366,7 +366,9 @@ func (c *Context) DeleteProgram(p Program) {
} }
func (c *Context) getUniformLocationImpl(p Program, location string) uniformLocation { func (c *Context) getUniformLocationImpl(p Program, location string) uniformLocation {
uniform := uniformLocation(gl.GetUniformLocation(uint32(p), gl.Str(location+"\x00"))) l, free := gl.Strs(location + "\x00")
uniform := uniformLocation(gl.GetUniformLocation(uint32(p), *l))
free()
if uniform == -1 { if uniform == -1 {
panic("opengl: invalid uniform location: " + location) panic("opengl: invalid uniform location: " + location)
} }
@ -407,7 +409,9 @@ func (c *Context) UniformFloats(p Program, location string, v []float32) {
} }
func (c *Context) getAttribLocationImpl(p Program, location string) attribLocation { func (c *Context) getAttribLocationImpl(p Program, location string) attribLocation {
attrib := attribLocation(gl.GetAttribLocation(uint32(p), gl.Str(location+"\x00"))) l, free := gl.Strs(location + "\x00")
attrib := attribLocation(gl.GetAttribLocation(uint32(p), *l))
free()
if attrib == -1 { if attrib == -1 {
panic("opengl: invalid attrib location: " + location) panic("opengl: invalid attrib location: " + location)
} }