diff --git a/app/internal/srgb/srgb.go b/app/internal/srgb/srgb.go index c148b04f..22db556d 100644 --- a/app/internal/srgb/srgb.go +++ b/app/internal/srgb/srgb.go @@ -65,7 +65,7 @@ func (s *FBO) Blit() { } s.prog = prog s.c.UseProgram(prog) - s.c.Uniform1i(gl.GetUniformLocation(s.c, prog, "tex"), 0) + s.c.Uniform1i(s.c.GetUniformLocation(prog, "tex"), 0) s.quad = s.c.CreateBuffer() s.c.BindBuffer(gl.ARRAY_BUFFER, s.quad) s.c.BufferData(gl.ARRAY_BUFFER, diff --git a/gpu/gl/backend.go b/gpu/gl/backend.go index 02037c34..cfa5a9a7 100644 --- a/gpu/gl/backend.go +++ b/gpu/gl/backend.go @@ -488,7 +488,7 @@ func (b *Backend) NewProgram(vertShader, fragShader backend.ShaderSources) (back } func lookupUniform(funcs Functions, p Program, loc backend.UniformLocation) uniformLocation { - u := GetUniformLocation(funcs, p, loc.Name) + u := funcs.GetUniformLocation(p, loc.Name) return uniformLocation{uniform: u, offset: loc.Offset, typ: loc.Type, size: loc.Size} } diff --git a/gpu/gl/util.go b/gpu/gl/util.go index 65b21557..6ee6034b 100644 --- a/gpu/gl/util.go +++ b/gpu/gl/util.go @@ -37,14 +37,6 @@ func CreateProgram(ctx Functions, vsSrc, fsSrc string, attribs []string) (Progra return prog, nil } -func GetUniformLocation(ctx Functions, prog Program, name string) Uniform { - loc := ctx.GetUniformLocation(prog, name) - if !loc.valid() { - panic(fmt.Errorf("uniform %s not found", name)) - } - return loc -} - func createShader(ctx Functions, typ Enum, src string) (Shader, error) { sh := ctx.CreateShader(typ) if !sh.valid() {