Merge branch 'union-type'

diff --combined specs/d3d10.py
index f1fc4de1b3cf64c92e1ccda3e578d2c4de4d04ef,2c1c44c9197710048e9405da8d68c3797c62c56d..167e4911407e92f3a1f49a22ddd52b5487b9e811
--- 1/specs/d3d10.py
--- 2/specs/d3d10.py
+++ b/specs/d3d10.py
@@@ -212,7 -212,6 +212,7 @@@ D3D10_FORMAT_SUPPORT = Flags(UINT, 
      "D3D10_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET",
      "D3D10_FORMAT_SUPPORT_MULTISAMPLE_LOAD",
      "D3D10_FORMAT_SUPPORT_SHADER_GATHER",
 +    "D3D10_FORMAT_SUPPORT_BACK_BUFFER_CAST",
  ])
  
  D3D10_COUNTER = Enum("D3D10_COUNTER", [
@@@ -387,12 -386,14 +387,14 @@@ D3D10_TEX2DMS_ARRAY_DSV = Struct("D3D10
  D3D10_DEPTH_STENCIL_VIEW_DESC = Struct("D3D10_DEPTH_STENCIL_VIEW_DESC", [
      (DXGI_FORMAT, "Format"),
      (D3D10_DSV_DIMENSION, "ViewDimension"),
-     (D3D10_TEX1D_DSV, "Texture1D"),
-     (D3D10_TEX1D_ARRAY_DSV, "Texture1DArray"),
-     (D3D10_TEX2D_DSV, "Texture2D"),
-     (D3D10_TEX2D_ARRAY_DSV, "Texture2DArray"),
-     (D3D10_TEX2DMS_DSV, "Texture2DMS"),
-     (D3D10_TEX2DMS_ARRAY_DSV, "Texture2DMSArray"),
+     (Union("{self}.ViewDimension", [
+         ("D3D10_DSV_DIMENSION_TEXTURE1D", D3D10_TEX1D_DSV, "Texture1D"),
+         ("D3D10_DSV_DIMENSION_TEXTURE1DARRAY", D3D10_TEX1D_ARRAY_DSV, "Texture1DArray"),
+         ("D3D10_DSV_DIMENSION_TEXTURE2D", D3D10_TEX2D_DSV, "Texture2D"),
+         ("D3D10_DSV_DIMENSION_TEXTURE2DARRAY", D3D10_TEX2D_ARRAY_DSV, "Texture2DArray"),
+         ("D3D10_DSV_DIMENSION_TEXTURE2DMS", D3D10_TEX2DMS_DSV, "Texture2DMS"),
+         ("D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY", D3D10_TEX2DMS_ARRAY_DSV, "Texture2DMSArray"),
+     ]), None),
  ])
  
  D3D10_RTV_DIMENSION = Enum("D3D10_RTV_DIMENSION", [
@@@ -450,14 -451,16 +452,16 @@@ D3D10_TEX3D_RTV = Struct("D3D10_TEX3D_R
  D3D10_RENDER_TARGET_VIEW_DESC = Struct("D3D10_RENDER_TARGET_VIEW_DESC", [
      (DXGI_FORMAT, "Format"),
      (D3D10_RTV_DIMENSION, "ViewDimension"),
-     (D3D10_BUFFER_RTV, "Buffer"),
-     (D3D10_TEX1D_RTV, "Texture1D"),
-     (D3D10_TEX1D_ARRAY_RTV, "Texture1DArray"),
-     (D3D10_TEX2D_RTV, "Texture2D"),
-     (D3D10_TEX2D_ARRAY_RTV, "Texture2DArray"),
-     (D3D10_TEX2DMS_RTV, "Texture2DMS"),
-     (D3D10_TEX2DMS_ARRAY_RTV, "Texture2DMSArray"),
-     (D3D10_TEX3D_RTV, "Texture3D"),
+     (Union("{self}.ViewDimension", [
+         ("D3D10_RTV_DIMENSION_BUFFER", D3D10_BUFFER_RTV, "Buffer"),
+         ("D3D10_RTV_DIMENSION_TEXTURE1D", D3D10_TEX1D_RTV, "Texture1D"),
+         ("D3D10_RTV_DIMENSION_TEXTURE1DARRAY", D3D10_TEX1D_ARRAY_RTV, "Texture1DArray"),
+         ("D3D10_RTV_DIMENSION_TEXTURE2D", D3D10_TEX2D_RTV, "Texture2D"),
+         ("D3D10_RTV_DIMENSION_TEXTURE2DARRAY", D3D10_TEX2D_ARRAY_RTV, "Texture2DArray"),
+         ("D3D10_RTV_DIMENSION_TEXTURE2DMS", D3D10_TEX2DMS_RTV, "Texture2DMS"),
+         ("D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY", D3D10_TEX2DMS_ARRAY_RTV, "Texture2DMSArray"),
+         ("D3D10_RTV_DIMENSION_TEXTURE3D", D3D10_TEX3D_RTV, "Texture3D"),
+     ]), None),
  ])
  
  D3D10_SRV_DIMENSION = Enum("D3D10_SRV_DIMENSION", [
@@@ -524,15 -527,17 +528,17 @@@ D3D10_TEXCUBE_SRV = Struct("D3D10_TEXCU
  D3D10_SHADER_RESOURCE_VIEW_DESC = Struct("D3D10_SHADER_RESOURCE_VIEW_DESC", [
      (DXGI_FORMAT, "Format"),
      (D3D10_SRV_DIMENSION, "ViewDimension"),
-     (D3D10_BUFFER_SRV, "Buffer"),
-     (D3D10_TEX1D_SRV, "Texture1D"),
-     (D3D10_TEX1D_ARRAY_SRV, "Texture1DArray"),
-     (D3D10_TEX2D_SRV, "Texture2D"),
-     (D3D10_TEX2D_ARRAY_SRV, "Texture2DArray"),
-     (D3D10_TEX2DMS_SRV, "Texture2DMS"),
-     (D3D10_TEX2DMS_ARRAY_SRV, "Texture2DMSArray"),
-     (D3D10_TEX3D_SRV, "Texture3D"),
-     (D3D10_TEXCUBE_SRV, "TextureCube"),
+     (Union("{self}.ViewDimension", [
+         ("D3D10_SRV_DIMENSION_BUFFER", D3D10_BUFFER_SRV, "Buffer"),
+         ("D3D10_SRV_DIMENSION_TEXTURE1D", D3D10_TEX1D_SRV, "Texture1D"),
+         ("D3D10_SRV_DIMENSION_TEXTURE1DARRAY", D3D10_TEX1D_ARRAY_SRV, "Texture1DArray"),
+         ("D3D10_SRV_DIMENSION_TEXTURE2D", D3D10_TEX2D_SRV, "Texture2D"), 
+         ("D3D10_SRV_DIMENSION_TEXTURE2DARRAY", D3D10_TEX2D_ARRAY_SRV, "Texture2DArray"),
+         ("D3D10_SRV_DIMENSION_TEXTURE2DMS", D3D10_TEX2DMS_SRV, "Texture2DMS"),
+         ("D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY", D3D10_TEX2DMS_ARRAY_SRV, "Texture2DMSArray"),
+         ("D3D10_SRV_DIMENSION_TEXTURE3D", D3D10_TEX3D_SRV, "Texture3D"),
+         ("D3D10_SRV_DIMENSION_TEXTURECUBE", D3D10_TEXCUBE_SRV, "TextureCube"),
+     ]), None),
  ])
  
  D3D10_BOX = Struct("D3D10_BOX", [
@@@ -678,10 -683,6 +684,10 @@@ D3D10_CREATE_DEVICE_FLAG = Flags(UINT, 
      "D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP",
      "D3D10_CREATE_DEVICE_BGRA_SUPPORT",
      "D3D10_CREATE_DEVICE_STRICT_VALIDATION",
 +    "D3D10_CREATE_DEVICE_BGRA_SUPPORT",
 +    "D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY",
 +    "D3D10_CREATE_DEVICE_STRICT_VALIDATION",
 +    "D3D10_CREATE_DEVICE_DEBUGGABLE",
  ])
  
  D3D10_RAISE_FLAG = Flags(UINT, [