joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpu/gl: remove unused methods and unexport internal

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-02-10 17:06:54 +01:00
parent adb950cbf3
commit 8b5e9af5f8
3 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpu/gl/types.go
+3 -11
View File
@@ -14,22 +14,14 @@ type (
Object struct{ V uint } Object struct{ V uint }
) )
func (u Uniform) Valid() bool { func (u Uniform) valid() bool {
return u.V != -1 return u.V != -1
} }
func (p Program) Valid() bool { func (p Program) valid() bool {
return p.V != 0 return p.V != 0
} }
func (s Shader) Valid() bool { func (s Shader) valid() bool {
return s.V != 0 return s.V != 0
} }
func (t Texture) Valid() bool {
return t.V != 0
}
func (t Texture) Equal(t2 Texture) bool {
return t == t2
}
gpu/gl/types_js.go
+3 -11
View File
@@ -16,22 +16,14 @@ type (
Object js.Value Object js.Value
) )
func (p Program) Valid() bool { func (p Program) valid() bool {
return !js.Value(p).IsUndefined() && !js.Value(p).IsNull() return !js.Value(p).IsUndefined() && !js.Value(p).IsNull()
} }
func (s Shader) Valid() bool { func (s Shader) valid() bool {
return !js.Value(s).IsUndefined() && !js.Value(s).IsNull() return !js.Value(s).IsUndefined() && !js.Value(s).IsNull()
} }
func (u Uniform) Valid() bool { func (u Uniform) valid() bool {
return !js.Value(u).IsUndefined() && !js.Value(u).IsNull() return !js.Value(u).IsUndefined() && !js.Value(u).IsNull()
} }
func (t Texture) Valid() bool {
return !js.Value(t).IsUndefined() && !js.Value(t).IsNull()
}
func (t Texture) Equal(t2 Texture) bool {
return js.Value(t).Equal(js.Value(t2))
}
gpu/gl/util.go
+3 -3
View File
@@ -20,7 +20,7 @@ func CreateProgram(ctx Functions, vsSrc, fsSrc string, attribs []string) (Progra
} }
defer ctx.DeleteShader(fs) defer ctx.DeleteShader(fs)
prog := ctx.CreateProgram() prog := ctx.CreateProgram()
if !prog.Valid() { if !prog.valid() {
return Program{}, errors.New("glCreateProgram failed") return Program{}, errors.New("glCreateProgram failed")
} }
ctx.AttachShader(prog, vs) ctx.AttachShader(prog, vs)
@@ -39,7 +39,7 @@ func CreateProgram(ctx Functions, vsSrc, fsSrc string, attribs []string) (Progra
func GetUniformLocation(ctx Functions, prog Program, name string) Uniform { func GetUniformLocation(ctx Functions, prog Program, name string) Uniform {
loc := ctx.GetUniformLocation(prog, name) loc := ctx.GetUniformLocation(prog, name)
if !loc.Valid() { if !loc.valid() {
panic(fmt.Errorf("uniform %s not found", name)) panic(fmt.Errorf("uniform %s not found", name))
} }
return loc return loc
@@ -47,7 +47,7 @@ func GetUniformLocation(ctx Functions, prog Program, name string) Uniform {
func createShader(ctx Functions, typ Enum, src string) (Shader, error) { func createShader(ctx Functions, typ Enum, src string) (Shader, error) {
sh := ctx.CreateShader(typ) sh := ctx.CreateShader(typ)
if !sh.Valid() { if !sh.valid() {
return Shader{}, errors.New("glCreateShader failed") return Shader{}, errors.New("glCreateShader failed")
} }
ctx.ShaderSource(sh, src) ctx.ShaderSource(sh, src)