From dce46f488808cf5b1cf8d687e4227163edae11e5 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 27 Oct 2015 18:58:00 +0800 Subject: [PATCH] bug 14940: Capitalization of Abbreviations/Acryonyms (WIP) s/shaderResourceMinLOD/shaderResourceMinLod/g s/vendorId/vendorID/g s/deviceId/deviceID/g s/imageMipTailStartLOD/imageMipTailStartLod/g s/constantId/constantID/g https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14940 --- demos/vulkaninfo.c | 6 +++--- icd/nulldrv/nulldrv.c | 4 ++-- include/vulkan.h | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 4b22f9e..6a40007 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -785,7 +785,7 @@ static void app_gpu_dump_features(const struct app_gpu *gpu) printf("\tshaderInt64 = %u\n", features->shaderInt64 ); printf("\tshaderInt16 = %u\n", features->shaderInt16 ); printf("\tshaderResourceResidency = %u\n", features->shaderResourceResidency ); - printf("\tshaderResourceMinLOD = %u\n", features->shaderResourceMinLOD ); + printf("\tshaderResourceMinLod = %u\n", features->shaderResourceMinLod ); printf("\talphaToOne = %u\n", features->alphaToOne ); printf("\tsparseBinding = %u\n", features->sparseBinding ); printf("\tsparseResidencyBuffer = %u\n", features->sparseResidencyBuffer ); @@ -932,8 +932,8 @@ static void app_gpu_dump_props(const struct app_gpu *gpu) printf("===========================\n"); printf("\tapiVersion = %u\n", props->apiVersion); printf("\tdriverVersion = %u\n", props->driverVersion); - printf("\tvendorId = 0x%04x\n", props->vendorId); - printf("\tdeviceId = 0x%04x\n", props->deviceId); + printf("\tvendorID = 0x%04x\n", props->vendorID); + printf("\tdeviceID = 0x%04x\n", props->deviceID); printf("\tdeviceType = %s\n", vk_physical_device_type_string(props->deviceType)); printf("\tdeviceName = %s\n", props->deviceName); diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index bc0204f..30c9b53 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1373,8 +1373,8 @@ ICD_EXPORT void VKAPI vkGetPhysicalDeviceProperties( pProperties->apiVersion = VK_API_VERSION; pProperties->driverVersion = 0; // Appropriate that the nulldrv have 0's - pProperties->vendorId = 0; - pProperties->deviceId = 0; + pProperties->vendorID = 0; + pProperties->deviceID = 0; pProperties->deviceType = VK_PHYSICAL_DEVICE_TYPE_OTHER; strncpy(pProperties->deviceName, "nulldrv", strlen("nulldrv")); diff --git a/include/vulkan.h b/include/vulkan.h index 0e16121..f8af14a 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1149,7 +1149,7 @@ typedef struct { VkBool32 shaderInt64; VkBool32 shaderInt16; VkBool32 shaderResourceResidency; - VkBool32 shaderResourceMinLOD; + VkBool32 shaderResourceMinLod; VkBool32 sparseBinding; VkBool32 sparseResidencyBuffer; VkBool32 sparseResidencyImage2D; @@ -1295,8 +1295,8 @@ typedef struct { typedef struct { uint32_t apiVersion; uint32_t driverVersion; - uint32_t vendorId; - uint32_t deviceId; + uint32_t vendorID; + uint32_t deviceID; VkPhysicalDeviceType deviceType; char deviceName[VK_MAX_PHYSICAL_DEVICE_NAME]; uint8_t pipelineCacheUUID[VK_UUID_LENGTH]; @@ -1401,7 +1401,7 @@ typedef struct { typedef struct { VkSparseImageFormatProperties formatProperties; - uint32_t imageMipTailStartLOD; + uint32_t imageMipTailStartLod; VkDeviceSize imageMipTailSize; VkDeviceSize imageMipTailOffset; VkDeviceSize imageMipTailStride; @@ -1594,7 +1594,7 @@ typedef struct { } VkPipelineCacheCreateInfo; typedef struct { - uint32_t constantId; + uint32_t constantID; uint32_t offset; size_t size; } VkSpecializationMapEntry; -- 2.7.4