internal/graphicscommand: cache uniform name locations and types

internal/graphicscommand/shader.go

@@ -164,6 +164,8 @@ type Shader struct {
 
 	uniformNames       []string
 	uniformTypes       []shaderir.Type
+	uniformNameToIndex map[string]int
+	uniformNameToType  map[string]shaderir.Type
 }
 
 func NewShader(src []byte) *Shader {
@@ -188,40 +190,36 @@ func (s *Shader) convertUniforms(uniforms map[string]interface{}) [][]float32 {
 		panic("graphicscommand: shader is not compiled yet")
 	}
 
-	type index struct {
+	if s.uniformNameToIndex == nil {
-		resultIndex        int
+		s.uniformNameToIndex = map[string]int{}
-		shaderUniformIndex int
+		s.uniformNameToType = map[string]shaderir.Type{}
-	}
 
-	names := map[string]index{}
 		var idx int
 		for i, n := range s.uniformNames {
 			if strings.HasPrefix(n, "__") {
 				continue
 			}
-		names[n] = index{
+			s.uniformNameToIndex[n] = idx
-			resultIndex:        idx,
+			s.uniformNameToType[n] = s.uniformTypes[i]
-			shaderUniformIndex: i,
-		}
 			idx++
 		}
+	}
 
-	us := make([][]float32, len(names))
+	us := make([][]float32, len(s.uniformNameToIndex))
-	for name, idx := range names {
+	for name, idx := range s.uniformNameToIndex {
 		if v, ok := uniforms[name]; ok {
 			switch v := v.(type) {
 			case float32:
-				us[idx.resultIndex] = []float32{v}
+				us[idx] = []float32{v}
 			case []float32:
-				us[idx.resultIndex] = v
+				us[idx] = v
 			default:
 				panic(fmt.Sprintf("graphicscommand: unexpected uniform value type: %s, %T", name, v))
 			}
 			continue
 		}
-
+		t := s.uniformNameToType[name]
-		t := s.uniformTypes[idx.shaderUniformIndex]
+		us[idx] = make([]float32, t.FloatNum())
-		us[idx.resultIndex] = make([]float32, t.FloatNum())
 	}
 
 	// TODO: Panic if uniforms include an invalid name