bug 14918 part 2: some simple renames (WIP)
s/VK_QUEUE_SPARSE_MEMMGR_BIT/VK_QUEUE_SPARSE_BINDING_BIT/g
s/VK_SPARSE_IMAGE_FMT_/VK_SPARSE_IMAGE_FORMAT_/g
s/maxTexelBufferSize/maxTexelBufferElements/g
s/residencyStandard2DMSBlockShape/residencyStandard2DMultisampleBlockShape/g
s/formatProps/formatProperties/g
s/strideInBytes/stride/g
s/offsetInBytes/offset/g
s/blendConst\b/blendConstants/g
s/fillSize/size/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14918
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index eb21585..41b0b6f 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -576,7 +576,7 @@
VkCmdBuffer cmdBuffer,
VkBuffer destBuffer,
VkDeviceSize destOffset,
- VkDeviceSize fillSize,
+ VkDeviceSize size,
uint32_t data)
{
layer_data *dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -590,16 +590,16 @@
}
}
- // fillSize is the number of bytes to fill, which must be a multiple of 4.
- if (fillSize & 3) {
+ // size is the number of bytes to fill, which must be a multiple of 4.
+ if (size & 3) {
layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "DL",
- "vkCmdFillBuffer parameter, VkDeviceSize fillSize, is not a multiple of 4")) {
+ "vkCmdFillBuffer parameter, VkDeviceSize size, is not a multiple of 4")) {
return;
}
}
- dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
+ dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data);
}
VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback(
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index f1f08e2..154d285 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2471,7 +2471,7 @@
dev_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4])
+VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4])
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -2481,13 +2481,13 @@
updateCBTracking(pCB);
skipCall |= addCmd(dev_data, pCB, CMD_SETBLENDSTATE);
pCB->status |= CBSTATUS_BLEND_SET;
- memcpy(pCB->blendConst, blendConst, 4 * sizeof(float));
+ memcpy(pCB->blendConstants, blendConstants, 4 * sizeof(float));
} else {
skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetBlendConstants()");
}
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConst);
+ dev_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConstants);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds(
@@ -2966,7 +2966,7 @@
dev_data->device_dispatch_table->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData);
}
-VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize fillSize, uint32_t data)
+VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize size, uint32_t data)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -2981,7 +2981,7 @@
skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyFillBuffer");
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
+ dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data);
}
VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments(
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 20a1b2f..6ded670 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -324,7 +324,7 @@
float depthBiasConstantFactor;
float depthBiasClamp;
float depthBiasSlopeFactor;
- float blendConst[4];
+ float blendConstants[4];
float minDepthBounds;
float maxDepthBounds;
CBStencilData front;
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 914495e..258e7e5 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1813,7 +1813,7 @@
VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(
VkCmdBuffer cmdBuffer,
- const float blendConst[4])
+ const float blendConstants[4])
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
VkBool32 skipCall = VK_FALSE;
@@ -1825,7 +1825,7 @@
}
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- my_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConst);
+ my_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConstants);
}
}
@@ -2176,7 +2176,7 @@
VkCmdBuffer cmdBuffer,
VkBuffer destBuffer,
VkDeviceSize destOffset,
- VkDeviceSize fillSize,
+ VkDeviceSize size,
uint32_t data)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -2189,7 +2189,7 @@
skipCall |= validate_buffer_usage_flags(my_data, cmdBuffer, destBuffer, VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT, true, "vkCmdFillBuffer()", "VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT");
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- my_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
+ my_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data);
}
}
diff --git a/layers/object_track.h b/layers/object_track.h
index a1e4a44..f3a1252 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -335,12 +335,12 @@
pQueueInfo = pQueueInfo->pNextQI;
}
if (pQueueInfo != NULL) {
- if ((queueInfo != NULL) && (queueInfo[pQueueInfo->queueNodeIndex].queueFlags & VK_QUEUE_SPARSE_MEMMGR_BIT) == 0) {
+ if ((queueInfo != NULL) && (queueInfo[pQueueInfo->queueNodeIndex].queueFlags & VK_QUEUE_SPARSE_BINDING_BIT) == 0) {
log_msg(mdd(queue), VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_QUEUE, reinterpret_cast<uint64_t>(queue), 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",
- "Attempting %s on a non-memory-management capable queue -- VK_QUEUE_SPARSE_MEMMGR_BIT not set", function);
+ "Attempting %s on a non-memory-management capable queue -- VK_QUEUE_SPARSE_BINDING_BIT not set", function);
} else {
log_msg(mdd(queue), VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_QUEUE, reinterpret_cast<uint64_t>(queue), 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",
- "Attempting %s on a possibly non-memory-management capable queue -- VK_QUEUE_SPARSE_MEMMGR_BIT not known", function);
+ "Attempting %s on a possibly non-memory-management capable queue -- VK_QUEUE_SPARSE_BINDING_BIT not known", function);
}
}
}
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 84093a7..fa304f3 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -450,7 +450,7 @@
VkQueueFlagBits allFlags = (VkQueueFlagBits)(
VK_QUEUE_DMA_BIT |
VK_QUEUE_COMPUTE_BIT |
- VK_QUEUE_SPARSE_MEMMGR_BIT |
+ VK_QUEUE_SPARSE_BINDING_BIT |
VK_QUEUE_GRAPHICS_BIT);
if(enumerator & (~allFlags))
{
@@ -477,9 +477,9 @@
{
strings.push_back("VK_QUEUE_COMPUTE_BIT");
}
- if(enumerator & VK_QUEUE_SPARSE_MEMMGR_BIT)
+ if(enumerator & VK_QUEUE_SPARSE_BINDING_BIT)
{
- strings.push_back("VK_QUEUE_SPARSE_MEMMGR_BIT");
+ strings.push_back("VK_QUEUE_SPARSE_BINDING_BIT");
}
if(enumerator & VK_QUEUE_GRAPHICS_BIT)
{
@@ -603,9 +603,9 @@
static
bool ValidateEnumerator(VkSparseImageFormatFlagBits const& enumerator)
{
- VkSparseImageFormatFlagBits allFlags = (VkSparseImageFormatFlagBits)(VK_SPARSE_IMAGE_FMT_NONSTD_BLOCK_SIZE_BIT |
- VK_SPARSE_IMAGE_FMT_ALIGNED_MIP_SIZE_BIT |
- VK_SPARSE_IMAGE_FMT_SINGLE_MIPTAIL_BIT);
+ VkSparseImageFormatFlagBits allFlags = (VkSparseImageFormatFlagBits)(VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT |
+ VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT |
+ VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT);
if(enumerator & (~allFlags))
{
return false;
@@ -623,17 +623,17 @@
}
std::vector<std::string> strings;
- if(enumerator & VK_SPARSE_IMAGE_FMT_NONSTD_BLOCK_SIZE_BIT)
+ if(enumerator & VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT)
{
- strings.push_back("VK_SPARSE_IMAGE_FMT_NONSTD_BLOCK_SIZE_BIT");
+ strings.push_back("VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT");
}
- if(enumerator & VK_SPARSE_IMAGE_FMT_ALIGNED_MIP_SIZE_BIT)
+ if(enumerator & VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT)
{
- strings.push_back("VK_SPARSE_IMAGE_FMT_ALIGNED_MIP_SIZE_BIT");
+ strings.push_back("VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT");
}
- if(enumerator & VK_SPARSE_IMAGE_FMT_SINGLE_MIPTAIL_BIT)
+ if(enumerator & VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT)
{
- strings.push_back("VK_SPARSE_IMAGE_FMT_SINGLE_MIPTAIL_BIT");
+ strings.push_back("VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT");
}
std::string enumeratorString;
@@ -2555,11 +2555,11 @@
if(pSparseMemoryRequirements != nullptr)
{
- if ((pSparseMemoryRequirements->formatProps.aspect &
+ if ((pSparseMemoryRequirements->formatProperties.aspect &
(VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkGetImageSparseMemoryRequirements parameter, VkImageAspect pSparseMemoryRequirements->formatProps.aspect, is an unrecognized enumerator");
+ "vkGetImageSparseMemoryRequirements parameter, VkImageAspect pSparseMemoryRequirements->formatProperties.aspect, is an unrecognized enumerator");
return false;
}
}
@@ -3619,7 +3619,7 @@
"vkCreatePipelineCache parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator");
return false;
}
- if(pCreateInfo->initialData != nullptr)
+ if(pCreateInfo->pInitialData != nullptr)
{
}
}
@@ -5162,9 +5162,9 @@
get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4])
+VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConstants[4])
{
- get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetBlendConstants(cmdBuffer, blendConst);
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetBlendConstants(cmdBuffer, blendConstants);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds)
@@ -5816,7 +5816,7 @@
VkCmdBuffer cmdBuffer,
VkBuffer destBuffer,
VkDeviceSize destOffset,
- VkDeviceSize fillSize,
+ VkDeviceSize size,
uint32_t data)
{
@@ -5831,12 +5831,12 @@
VkCmdBuffer cmdBuffer,
VkBuffer destBuffer,
VkDeviceSize destOffset,
- VkDeviceSize fillSize,
+ VkDeviceSize size,
uint32_t data)
{
- get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data);
- PostCmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
+ PostCmdFillBuffer(cmdBuffer, destBuffer, destOffset, size, data);
}
bool PreCmdClearColorImage(