vulkan: beautification changes

TODO: verify vk-layer-generate.py

TODO: need to rename object tracker generator

v2: fix "python3 vulkan.py"
    fix dead cod in tri introduced by rebase
    beautify wsi_null.c (olv)
diff --git a/icd/intel/shader.c b/icd/intel/shader.c
index c8070c3..ce3f048 100644
--- a/icd/intel/shader.c
+++ b/icd/intel/shader.c
@@ -39,8 +39,8 @@
     intel_base_destroy(&sh->obj.base);
 }
 
-static VK_RESULT shader_create(struct intel_dev *dev,
-                                const VK_SHADER_CREATE_INFO *info,
+static VkResult shader_create(struct intel_dev *dev,
+                                const VkShaderCreateInfo *info,
                                 struct intel_shader **sh_ret)
 {
     const struct icd_spv_header *spv =
@@ -70,10 +70,10 @@
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VK_RESULT VKAPI vkCreateShader(
-        VK_DEVICE                                  device,
-        const VK_SHADER_CREATE_INFO*               pCreateInfo,
-        VK_SHADER*                                 pShader)
+ICD_EXPORT VkResult VKAPI vkCreateShader(
+        VkDevice                                  device,
+        const VkShaderCreateInfo*               pCreateInfo,
+        VkShader*                                 pShader)
 {
     struct intel_dev *dev = intel_dev(device);