Merge "Fix addFunctionCase() functions." into vulkan