Following directx runtime (18/22)

Following directx runtime