Merge "Fix ordering of texture->upload arguments"