refactoring uniform handles for shader structs