diff --git a/dawn.json b/dawn.json
index a93d404..a2102b3 100644
--- a/dawn.json
+++ b/dawn.json
@@ -1191,68 +1191,59 @@
             {"value": 2, "name": "R8 uint"},
             {"value": 3, "name": "R8 sint"},
 
-            {"value": 4, "name": "R16 unorm"},
-            {"value": 5, "name": "R16 snorm"},
-            {"value": 6, "name": "R16 uint"},
-            {"value": 7, "name": "R16 sint"},
-            {"value": 8, "name": "R16 float"},
-            {"value": 9, "name": "RG8 unorm"},
-            {"value": 10, "name": "RG8 snorm"},
-            {"value": 11, "name": "RG8 uint"},
-            {"value": 12, "name": "RG8 sint"},
+            {"value": 4, "name": "R16 uint"},
+            {"value": 5, "name": "R16 sint"},
+            {"value": 6, "name": "R16 float"},
+            {"value": 7, "name": "RG8 unorm"},
+            {"value": 8, "name": "RG8 snorm"},
+            {"value": 9, "name": "RG8 uint"},
+            {"value": 10, "name": "RG8 sint"},
 
-            {"value": 13, "name": "R32 float"},
-            {"value": 14, "name": "R32 uint"},
-            {"value": 15, "name": "R32 sint"},
-            {"value": 16, "name": "RG16 unorm"},
-            {"value": 17, "name": "RG16 snorm"},
-            {"value": 18, "name": "RG16 uint"},
-            {"value": 19, "name": "RG16 sint"},
-            {"value": 20, "name": "RG16 float"},
-            {"value": 21, "name": "RGBA8 unorm"},
-            {"value": 22, "name": "RGBA8 unorm srgb"},
-            {"value": 23, "name": "RGBA8 snorm"},
-            {"value": 24, "name": "RGBA8 uint"},
-            {"value": 25, "name": "RGBA8 sint"},
-            {"value": 26, "name": "BGRA8 unorm"},
-            {"value": 27, "name": "BGRA8 unorm srgb"},
-            {"value": 28, "name": "RGB10 A2 unorm"},
-            {"value": 29, "name": "RG11 B10 float"},
+            {"value": 11, "name": "R32 float"},
+            {"value": 12, "name": "R32 uint"},
+            {"value": 13, "name": "R32 sint"},
+            {"value": 14, "name": "RG16 uint"},
+            {"value": 15, "name": "RG16 sint"},
+            {"value": 16, "name": "RG16 float"},
+            {"value": 17, "name": "RGBA8 unorm"},
+            {"value": 18, "name": "RGBA8 unorm srgb"},
+            {"value": 19, "name": "RGBA8 snorm"},
+            {"value": 20, "name": "RGBA8 uint"},
+            {"value": 21, "name": "RGBA8 sint"},
+            {"value": 22, "name": "BGRA8 unorm"},
+            {"value": 23, "name": "BGRA8 unorm srgb"},
+            {"value": 24, "name": "RGB10 A2 unorm"},
+            {"value": 25, "name": "RG11 B10 float"},
 
-            {"value": 30, "name": "RG32 float"},
-            {"value": 31, "name": "RG32 uint"},
-            {"value": 32, "name": "RG32 sint"},
-            {"value": 33, "name": "RGBA16 unorm"},
-            {"value": 34, "name": "RGBA16 snorm"},
-            {"value": 35, "name": "RGBA16 uint"},
-            {"value": 36, "name": "RGBA16 sint"},
-            {"value": 37, "name": "RGBA16 float"},
+            {"value": 26, "name": "RG32 float"},
+            {"value": 27, "name": "RG32 uint"},
+            {"value": 28, "name": "RG32 sint"},
+            {"value": 29, "name": "RGBA16 uint"},
+            {"value": 30, "name": "RGBA16 sint"},
+            {"value": 31, "name": "RGBA16 float"},
 
-            {"value": 38, "name": "RGBA32 float"},
-            {"value": 39, "name": "RGBA32 uint"},
-            {"value": 40, "name": "RGBA32 sint"},
+            {"value": 32, "name": "RGBA32 float"},
+            {"value": 33, "name": "RGBA32 uint"},
+            {"value": 34, "name": "RGBA32 sint"},
 
-            {"value": 41, "name": "depth32 float"},
-            {"value": 42, "name": "depth24 plus"},
-            {"value": 43, "name": "depth24 plus stencil8"},
+            {"value": 35, "name": "depth32 float"},
+            {"value": 36, "name": "depth24 plus"},
+            {"value": 37, "name": "depth24 plus stencil8"},
 
-            {"value": 44, "name": "BC1 RGBA unorm"},
-            {"value": 45, "name": "BC1 RGBA unorm srgb"},
-            {"value": 46, "name": "BC2 RGBA unorm"},
-            {"value": 47, "name": "BC2 RGBA unorm srgb"},
-            {"value": 48, "name": "BC3 RGBA unorm"},
-            {"value": 49, "name": "BC3 RGBA unorm srgb"},
-            {"value": 50, "name": "BC4 R unorm"},
-            {"value": 51, "name": "BC4 R snorm"},
-            {"value": 52, "name": "BC5 RG unorm"},
-            {"value": 53, "name": "BC5 RG snorm"},
-            {"value": 54, "name": "BC6H RGB ufloat"},
-            {"value": 55, "name": "BC6H RGB sfloat"},
-            {"value": 56, "name": "BC7 RGBA unorm"},
-            {"value": 57, "name": "BC7 RGBA unorm srgb"}
-        ],
-        "TODO": [
-            "jiawei.shao@intel.com: support BC formats as extension"
+            {"value": 38, "name": "BC1 RGBA unorm"},
+            {"value": 39, "name": "BC1 RGBA unorm srgb"},
+            {"value": 40, "name": "BC2 RGBA unorm"},
+            {"value": 41, "name": "BC2 RGBA unorm srgb"},
+            {"value": 42, "name": "BC3 RGBA unorm"},
+            {"value": 43, "name": "BC3 RGBA unorm srgb"},
+            {"value": 44, "name": "BC4 R unorm"},
+            {"value": 45, "name": "BC4 R snorm"},
+            {"value": 46, "name": "BC5 RG unorm"},
+            {"value": 47, "name": "BC5 RG snorm"},
+            {"value": 48, "name": "BC6H RGB ufloat"},
+            {"value": 49, "name": "BC6H RGB sfloat"},
+            {"value": 50, "name": "BC7 RGBA unorm"},
+            {"value": 51, "name": "BC7 RGBA unorm srgb"}
         ]
     },
     "texture usage bit": {