bug 14918 part 3: sed renames
s/VK_MAX_PHYSICAL_DEVICE_NAME\b/VK_MAX_PHYSICAL_DEVICE_NAME_SIZE/g
s/VK_UUID_LENGTH/VK_UUID_SIZE/g
s/VK_MAX_EXTENSION_NAME\b/VK_MAX_EXTENSION_NAME_SIZE/g
s/VK_MAX_DESCRIPTION\b/VK_MAX_DESCRIPTION_SIZE/g
s/VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO/VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO/g
s/VK_CHANNEL_SWIZZLE/VK_COMPONENT_SWIZZLE/g
s/VkChannelSwizzle/VkComponentSwizzle/g
s/VK_VERTEX_INPUT_STEP_RATE/VK_VERTEX_INPUT_RATE/g
s/VkVertexInputStepRate/VkVertexInputRate/g
s/VK_FILL_MODE_SOLID/VK_POLYGON_MODE_FILL/g
s/VK_FILL_MODE_WIREFRAME/VK_POLYGON_MODE_LINE/g
s/VK_FILL_MODE_POINTS/VK_POLYGON_MODE_POINT/g
s/VkFillMode/VkPolygonMode/g
s/fillMode/polygonMode/g
s/VkBlend\b/VkBlendFactor/g
s/VK_BLEND_ZERO/VK_BLEND_FACTOR_ZERO/g
s/VK_BLEND_ONE/VK_BLEND_FACTOR_ONE/g
s/VK_BLEND_SRC/VK_BLEND_FACTOR_SRC/g
s/VK_BLEND_DST/VK_BLEND_FACTOR_DST/g
s/VK_BLEND_CONSTANT/VK_BLEND_FACTOR_CONSTANT/g
s/VK_RENDER_PASS_CONTENTS/VK_SUBPASS_CONTENTS/g
s/VkRenderPassContents/VkSubpassContents/g
s/VK_QUEUE_DMA_BIT/VK_QUEUE_TRANSFER_BIT/g
s/VK_CHANNEL_/VK_COLOR_COMPONENT_/g
s/VkChannelFlagBits/VkColorComponentFlagBits/g
s/VK_QUERY_CONTROL_CONSERVATIVE_BIT/VK_QUERY_CONTROL_PRECISE_BIT/g
s/occlusionQueryNonConservative/occlusionQueryPrecise/g
s/recommendedBufferCopyOffsetAlignment/optimalBufferCopyOffsetAlignment/g
s/recommendedBufferCopyRowPitchAlignment/optimalBufferCopyRowPitchAlignment/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/VkImageSubresourceCopy/VkImageSubresourceLayers/g
s/typeCount/poolSizeCount/g
s/pTypeCounts/pPoolSizes/g
s/VkDescriptorTypeCount/VkDescriptorPoolSize/g
s/srcBlendColor/srcColorBlendFactor/g
s/dstBlendColor/dstColorBlendFactor/g
s/blendOpColor/colorBlendOp/g
s/srcBlendAlpha/srcAlphaBlendFactor/g
s/dstBlendAlpha/dstAlphaBlendFactor/g
s/blendOpAlpha/alphaBlendOp/g
s/channelWriteMask/colorWriteMask/g
s/stencilFailOp/failOp/g
s/stencilPassOp/passOp/g
s/stencilDepthFailOp/depthFailOp/g
s/stencilCompareOp/compareOp/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/originX/x/g
s/originY/y/g
s/stepRate/inputRate/g
s/VkChannelMapping/VkComponentMapping/g
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index d170830..46f0ba6 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1133,16 +1133,16 @@
skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS",
"Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pSetLayouts[i]);
} else {
- uint32_t typeIndex = 0, typeCount = 0;
+ uint32_t typeIndex = 0, poolSizeCount = 0;
for (j=0; j<pLayout->createInfo.bindingCount; ++j) {
typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBindings[j].descriptorType);
- typeCount = pLayout->createInfo.pBindings[j].arraySize;
- if (typeCount > pPoolNode->availableDescriptorTypeCount[typeIndex]) {
+ poolSizeCount = pLayout->createInfo.pBindings[j].arraySize;
+ if (poolSizeCount > pPoolNode->availableDescriptorTypeCount[typeIndex]) {
skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pLayout->layout, 0, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS",
"Unable to allocate %u descriptors of type %s from pool %#" PRIxLEAST64 ". This pool only has %u descriptors of this type remaining.",
- typeCount, string_VkDescriptorType(pLayout->createInfo.pBindings[j].descriptorType), (uint64_t) pPoolNode->pool, pPoolNode->availableDescriptorTypeCount[typeIndex]);
+ poolSizeCount, string_VkDescriptorType(pLayout->createInfo.pBindings[j].descriptorType), (uint64_t) pPoolNode->pool, pPoolNode->availableDescriptorTypeCount[typeIndex]);
} else { // Decrement available descriptors of this type
- pPoolNode->availableDescriptorTypeCount[typeIndex] -= typeCount;
+ pPoolNode->availableDescriptorTypeCount[typeIndex] -= poolSizeCount;
}
}
}
@@ -1357,7 +1357,7 @@
static void set_cb_pso_status(GLOBAL_CB_NODE* pCB, const PIPELINE_NODE* pPipe)
{
for (uint32_t i = 0; i < pPipe->cbStateCI.attachmentCount; i++) {
- if (0 != pPipe->pAttachments[i].channelWriteMask) {
+ if (0 != pPipe->pAttachments[i].colorWriteMask) {
pCB->status |= CBSTATUS_COLOR_BLEND_WRITE_ENABLE;
}
}
@@ -2216,11 +2216,11 @@
for (uint32_t i=0; i<count; ++i) {
SET_NODE* pSet = dev_data->setMap[pDescriptorSets[i]]; // getSetNode() without locking
LAYOUT_NODE* pLayout = pSet->pLayout;
- uint32_t typeIndex = 0, typeCount = 0;
+ uint32_t typeIndex = 0, poolSizeCount = 0;
for (uint32_t j=0; j<pLayout->createInfo.bindingCount; ++j) {
typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBindings[j].descriptorType);
- typeCount = pLayout->createInfo.pBindings[j].arraySize;
- pPoolNode->availableDescriptorTypeCount[typeIndex] += typeCount;
+ poolSizeCount = pLayout->createInfo.pBindings[j].arraySize;
+ pPoolNode->availableDescriptorTypeCount[typeIndex] += poolSizeCount;
}
}
}
@@ -2516,7 +2516,7 @@
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilCompareMask)
+ uint32_t compareMask)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
@@ -2526,10 +2526,10 @@
updateCBTracking(pCB);
skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREADMASKSTATE);
if (faceMask & VK_STENCIL_FACE_FRONT_BIT) {
- pCB->front.stencilCompareMask = stencilCompareMask;
+ pCB->front.compareMask = compareMask;
}
if (faceMask & VK_STENCIL_FACE_BACK_BIT) {
- pCB->back.stencilCompareMask = stencilCompareMask;
+ pCB->back.compareMask = compareMask;
}
/* TODO: Do we need to track front and back separately? */
/* TODO: We aren't capturing the faceMask, do we need to? */
@@ -2539,13 +2539,13 @@
}
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask);
+ dev_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, compareMask);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilWriteMask)
+ uint32_t writeMask)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
@@ -2555,10 +2555,10 @@
updateCBTracking(pCB);
skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILWRITEMASKSTATE);
if (faceMask & VK_STENCIL_FACE_FRONT_BIT) {
- pCB->front.stencilWriteMask = stencilWriteMask;
+ pCB->front.writeMask = writeMask;
}
if (faceMask & VK_STENCIL_FACE_BACK_BIT) {
- pCB->back.stencilWriteMask = stencilWriteMask;
+ pCB->back.writeMask = writeMask;
}
pCB->status |= CBSTATUS_STENCIL_WRITE_MASK_SET;
} else {
@@ -2566,13 +2566,13 @@
}
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask);
+ dev_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, writeMask);
}
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilReference)
+ uint32_t reference)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
@@ -2582,10 +2582,10 @@
updateCBTracking(pCB);
skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREFERENCESTATE);
if (faceMask & VK_STENCIL_FACE_FRONT_BIT) {
- pCB->front.stencilReference = stencilReference;
+ pCB->front.reference = reference;
}
if (faceMask & VK_STENCIL_FACE_BACK_BIT) {
- pCB->back.stencilReference = stencilReference;
+ pCB->back.reference = reference;
}
pCB->status |= CBSTATUS_STENCIL_REFERENCE_SET;
} else {
@@ -2593,7 +2593,7 @@
}
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, stencilReference);
+ dev_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, reference);
}
VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets)
@@ -3536,7 +3536,7 @@
}
my_data->renderPassMap.clear();
}
-VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkRenderPassContents contents)
+VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
@@ -3561,7 +3561,7 @@
dev_data->device_dispatch_table->CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents);
}
-VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkRenderPassContents contents)
+VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
diff --git a/layers/draw_state.h b/layers/draw_state.h
index a5833fd..3aa9494 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -179,16 +179,16 @@
pool(pool), createInfo(*pCreateInfo), maxSets(pCreateInfo->maxSets), pSets(NULL),
maxDescriptorTypeCount(VK_DESCRIPTOR_TYPE_END_RANGE), availableDescriptorTypeCount(VK_DESCRIPTOR_TYPE_END_RANGE)
{
- if (createInfo.typeCount) { // Shadow type struct from ptr into local struct
- size_t typeCountSize = createInfo.typeCount * sizeof(VkDescriptorTypeCount);
- createInfo.pTypeCounts = new VkDescriptorTypeCount[typeCountSize];
- memcpy((void*)createInfo.pTypeCounts, pCreateInfo->pTypeCounts, typeCountSize);
+ if (createInfo.poolSizeCount) { // Shadow type struct from ptr into local struct
+ size_t poolSizeCountSize = createInfo.poolSizeCount * sizeof(VkDescriptorPoolSize);
+ createInfo.pPoolSizes = new VkDescriptorPoolSize[poolSizeCountSize];
+ memcpy((void*)createInfo.pPoolSizes, pCreateInfo->pPoolSizes, poolSizeCountSize);
// Now set max counts for each descriptor type based on count of that type times maxSets
int32_t i=0;
- for (i=0; i<createInfo.typeCount; ++i) {
- uint32_t typeIndex = static_cast<uint32_t>(createInfo.pTypeCounts[i].type);
- uint32_t typeCount = createInfo.pTypeCounts[i].descriptorCount;
- maxDescriptorTypeCount[typeIndex] += typeCount;
+ for (i=0; i<createInfo.poolSizeCount; ++i) {
+ uint32_t typeIndex = static_cast<uint32_t>(createInfo.pPoolSizes[i].type);
+ uint32_t poolSizeCount = createInfo.pPoolSizes[i].descriptorCount;
+ maxDescriptorTypeCount[typeIndex] += poolSizeCount;
}
for (i=0; i<maxDescriptorTypeCount.size(); ++i) {
maxDescriptorTypeCount[i] *= createInfo.maxSets;
@@ -196,12 +196,12 @@
availableDescriptorTypeCount[i] = maxDescriptorTypeCount[i];
}
} else {
- createInfo.pTypeCounts = NULL; // Make sure this is NULL so we don't try to clean it up
+ createInfo.pPoolSizes = NULL; // Make sure this is NULL so we don't try to clean it up
}
}
~_POOL_NODE() {
- if (createInfo.pTypeCounts) {
- delete[] createInfo.pTypeCounts;
+ if (createInfo.pPoolSizes) {
+ delete[] createInfo.pPoolSizes;
}
// TODO : pSets are currently freed in deletePools function which uses freeShadowUpdateTree function
// need to migrate that struct to smart ptrs for auto-cleanup
@@ -296,9 +296,9 @@
} CBStatusFlagBits;
typedef struct stencil_data {
- uint32_t stencilCompareMask;
- uint32_t stencilWriteMask;
- uint32_t stencilReference;
+ uint32_t compareMask;
+ uint32_t writeMask;
+ uint32_t reference;
} CBStencilData;
// Cmd Buffer Wrapper Struct
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 3744bd5..f4f62c9 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1713,7 +1713,7 @@
// TODO : For any vkCmdBind* calls that include an object which has mem bound to it,
// need to account for that mem now having binding to given commandBuffer
VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipeline pipeline)
{
@@ -1738,7 +1738,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetViewport(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
uint32_t viewportCount,
const VkViewport* pViewports)
{
@@ -1757,7 +1757,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetScissor(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
uint32_t scissorCount,
const VkRect2D* pScissors)
{
@@ -1792,7 +1792,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
float depthBiasConstantFactor,
float depthBiasClamp,
float depthBiasSlopeFactor)
@@ -1812,7 +1812,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
const float blendConstants[4])
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
@@ -1830,7 +1830,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
float minDepthBounds,
float maxDepthBounds)
{
@@ -1849,9 +1849,9 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilCompareMask)
+ uint32_t compareMask)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
VkBool32 skipCall = VK_FALSE;
@@ -1863,14 +1863,14 @@
}
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- my_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask);
+ my_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, compareMask);
}
}
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilWriteMask)
+ uint32_t writeMask)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
VkBool32 skipCall = VK_FALSE;
@@ -1882,14 +1882,14 @@
}
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- my_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask);
+ my_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, writeMask);
}
}
VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
- uint32_t stencilReference)
+ uint32_t reference)
{
layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map);
VkBool32 skipCall = VK_FALSE;
@@ -1901,12 +1901,12 @@
}
loader_platform_thread_unlock_mutex(&globalLock);
if (VK_FALSE == skipCall) {
- my_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, stencilReference);
+ my_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, reference);
}
}
VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipelineLayout layout,
uint32_t firstSet,
@@ -1922,7 +1922,7 @@
}
VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers(
- VkCommandBuffer commandBuffer,
+ VkCommandBuffer commandBuffer,
uint32_t startBinding,
uint32_t bindingCount,
const VkBuffer *pBuffers,
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 736128d..f166d91 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -448,7 +448,7 @@
bool ValidateEnumerator(VkQueueFlagBits const& enumerator)
{
VkQueueFlagBits allFlags = (VkQueueFlagBits)(
- VK_QUEUE_DMA_BIT |
+ VK_QUEUE_TRANSFER_BIT |
VK_QUEUE_COMPUTE_BIT |
VK_QUEUE_SPARSE_BINDING_BIT |
VK_QUEUE_GRAPHICS_BIT);
@@ -469,9 +469,9 @@
}
std::vector<std::string> strings;
- if(enumerator & VK_QUEUE_DMA_BIT)
+ if(enumerator & VK_QUEUE_TRANSFER_BIT)
{
- strings.push_back("VK_QUEUE_DMA_BIT");
+ strings.push_back("VK_QUEUE_TRANSFER_BIT");
}
if(enumerator & VK_QUEUE_COMPUTE_BIT)
{
@@ -1031,12 +1031,12 @@
}
static
-bool ValidateEnumerator(VkChannelFlagBits const& enumerator)
+bool ValidateEnumerator(VkColorComponentFlagBits const& enumerator)
{
- VkChannelFlagBits allFlags = (VkChannelFlagBits)(VK_CHANNEL_A_BIT |
- VK_CHANNEL_B_BIT |
- VK_CHANNEL_G_BIT |
- VK_CHANNEL_R_BIT);
+ VkColorComponentFlagBits allFlags = (VkColorComponentFlagBits)(VK_COLOR_COMPONENT_A_BIT |
+ VK_COLOR_COMPONENT_B_BIT |
+ VK_COLOR_COMPONENT_G_BIT |
+ VK_COLOR_COMPONENT_R_BIT);
if(enumerator & (~allFlags))
{
return false;
@@ -1046,7 +1046,7 @@
}
static
-std::string EnumeratorString(VkChannelFlagBits const& enumerator)
+std::string EnumeratorString(VkColorComponentFlagBits const& enumerator)
{
if(!ValidateEnumerator(enumerator))
{
@@ -1054,21 +1054,21 @@
}
std::vector<std::string> strings;
- if(enumerator & VK_CHANNEL_A_BIT)
+ if(enumerator & VK_COLOR_COMPONENT_A_BIT)
{
- strings.push_back("VK_CHANNEL_A_BIT");
+ strings.push_back("VK_COLOR_COMPONENT_A_BIT");
}
- if(enumerator & VK_CHANNEL_B_BIT)
+ if(enumerator & VK_COLOR_COMPONENT_B_BIT)
{
- strings.push_back("VK_CHANNEL_B_BIT");
+ strings.push_back("VK_COLOR_COMPONENT_B_BIT");
}
- if(enumerator & VK_CHANNEL_G_BIT)
+ if(enumerator & VK_COLOR_COMPONENT_G_BIT)
{
- strings.push_back("VK_CHANNEL_G_BIT");
+ strings.push_back("VK_COLOR_COMPONENT_G_BIT");
}
- if(enumerator & VK_CHANNEL_R_BIT)
+ if(enumerator & VK_COLOR_COMPONENT_R_BIT)
{
- strings.push_back("VK_CHANNEL_R_BIT");
+ strings.push_back("VK_COLOR_COMPONENT_R_BIT");
}
std::string enumeratorString;
@@ -1698,7 +1698,7 @@
static
bool ValidateEnumerator(VkQueryControlFlagBits const& enumerator)
{
- VkQueryControlFlagBits allFlags = (VkQueryControlFlagBits)(VK_QUERY_CONTROL_CONSERVATIVE_BIT);
+ VkQueryControlFlagBits allFlags = (VkQueryControlFlagBits)(VK_QUERY_CONTROL_PRECISE_BIT);
if(enumerator & (~allFlags))
{
return false;
@@ -1716,9 +1716,9 @@
}
std::vector<std::string> strings;
- if(enumerator & VK_QUERY_CONTROL_CONSERVATIVE_BIT)
+ if(enumerator & VK_QUERY_CONTROL_PRECISE_BIT)
{
- strings.push_back("VK_QUERY_CONTROL_CONSERVATIVE_BIT");
+ strings.push_back("VK_QUERY_CONTROL_PRECISE_BIT");
}
std::string enumeratorString;
@@ -3394,32 +3394,32 @@
"vkCreateImageView parameter, VkFormat pCreateInfo->format, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->channels.r < VK_CHANNEL_SWIZZLE_BEGIN_RANGE ||
- pCreateInfo->channels.r > VK_CHANNEL_SWIZZLE_END_RANGE)
+ if(pCreateInfo->channels.r < VK_COMPONENT_SWIZZLE_BEGIN_RANGE ||
+ pCreateInfo->channels.r > VK_COMPONENT_SWIZZLE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateImageView parameter, VkChannelSwizzle pCreateInfo->channels.r, is an unrecognized enumerator");
+ "vkCreateImageView parameter, VkComponentSwizzle pCreateInfo->channels.r, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->channels.g < VK_CHANNEL_SWIZZLE_BEGIN_RANGE ||
- pCreateInfo->channels.g > VK_CHANNEL_SWIZZLE_END_RANGE)
+ if(pCreateInfo->channels.g < VK_COMPONENT_SWIZZLE_BEGIN_RANGE ||
+ pCreateInfo->channels.g > VK_COMPONENT_SWIZZLE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateImageView parameter, VkChannelSwizzle pCreateInfo->channels.g, is an unrecognized enumerator");
+ "vkCreateImageView parameter, VkComponentSwizzle pCreateInfo->channels.g, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->channels.b < VK_CHANNEL_SWIZZLE_BEGIN_RANGE ||
- pCreateInfo->channels.b > VK_CHANNEL_SWIZZLE_END_RANGE)
+ if(pCreateInfo->channels.b < VK_COMPONENT_SWIZZLE_BEGIN_RANGE ||
+ pCreateInfo->channels.b > VK_COMPONENT_SWIZZLE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateImageView parameter, VkChannelSwizzle pCreateInfo->channels.b, is an unrecognized enumerator");
+ "vkCreateImageView parameter, VkComponentSwizzle pCreateInfo->channels.b, is an unrecognized enumerator");
return false;
}
- if(pCreateInfo->channels.a < VK_CHANNEL_SWIZZLE_BEGIN_RANGE ||
- pCreateInfo->channels.a > VK_CHANNEL_SWIZZLE_END_RANGE)
+ if(pCreateInfo->channels.a < VK_COMPONENT_SWIZZLE_BEGIN_RANGE ||
+ pCreateInfo->channels.a > VK_COMPONENT_SWIZZLE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateImageView parameter, VkChannelSwizzle pCreateInfo->channels.a, is an unrecognized enumerator");
+ "vkCreateImageView parameter, VkComponentSwizzle pCreateInfo->channels.a, is an unrecognized enumerator");
return false;
}
}
@@ -3747,11 +3747,11 @@
}
if(pCreateInfos->pVertexInputState->pVertexBindingDescriptions != nullptr)
{
- if(pCreateInfos->pVertexInputState->pVertexBindingDescriptions->stepRate < VK_VERTEX_INPUT_STEP_RATE_BEGIN_RANGE ||
- pCreateInfos->pVertexInputState->pVertexBindingDescriptions->stepRate > VK_VERTEX_INPUT_STEP_RATE_END_RANGE)
+ if(pCreateInfos->pVertexInputState->pVertexBindingDescriptions->inputRate < VK_VERTEX_INPUT_RATE_BEGIN_RANGE ||
+ pCreateInfos->pVertexInputState->pVertexBindingDescriptions->inputRate > VK_VERTEX_INPUT_RATE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkVertexInputStepRate pCreateInfos->pVertexInputState->pVertexBindingDescriptions->stepRate, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkVertexInputRate pCreateInfos->pVertexInputState->pVertexBindingDescriptions->inputRate, is an unrecognized enumerator");
return false;
}
}
@@ -3802,17 +3802,17 @@
}
if(pCreateInfos->pRasterizationState != nullptr)
{
- if(pCreateInfos->pRasterizationState->sType != VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO)
+ if(pCreateInfos->pRasterizationState->sType != VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipelines parameter, VkStructureType pCreateInfos->pRasterizationState->sType, is an invalid enumerator");
return false;
}
- if(pCreateInfos->pRasterizationState->fillMode < VK_FILL_MODE_BEGIN_RANGE ||
- pCreateInfos->pRasterizationState->fillMode > VK_FILL_MODE_END_RANGE)
+ if(pCreateInfos->pRasterizationState->polygonMode < VK_FILL_MODE_BEGIN_RANGE ||
+ pCreateInfos->pRasterizationState->polygonMode > VK_FILL_MODE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkFillMode pCreateInfos->pRasterizationState->fillMode, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkPolygonMode pCreateInfos->pRasterizationState->polygonMode, is an unrecognized enumerator");
return false;
}
if(pCreateInfos->pRasterizationState->cullMode & ~VK_CULL_MODE_FRONT_AND_BACK)
@@ -3853,60 +3853,60 @@
"vkCreateGraphicsPipelines parameter, VkCompareOp pCreateInfos->pDepthStencilState->depthCompareOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->front.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->front.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->front.failOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->front.failOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.stencilFailOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.failOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->front.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->front.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->front.passOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->front.passOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.stencilPassOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.passOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->front.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->front.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->front.depthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->front.depthFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.stencilDepthFailOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->front.depthFailOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->front.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->front.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->front.compareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->front.compareOp > VK_COMPARE_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkCompareOp pCreateInfos->pDepthStencilState->front.stencilCompareOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkCompareOp pCreateInfos->pDepthStencilState->front.compareOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->back.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->back.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->back.failOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->back.failOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.stencilFailOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.failOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->back.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->back.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->back.passOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->back.passOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.stencilPassOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.passOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->back.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->back.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->back.depthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->back.depthFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.stencilDepthFailOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkStencilOp pCreateInfos->pDepthStencilState->back.depthFailOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pDepthStencilState->back.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
- pCreateInfos->pDepthStencilState->back.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ if(pCreateInfos->pDepthStencilState->back.compareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfos->pDepthStencilState->back.compareOp > VK_COMPARE_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkCompareOp pCreateInfos->pDepthStencilState->back.stencilCompareOp, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkCompareOp pCreateInfos->pDepthStencilState->back.compareOp, is an unrecognized enumerator");
return false;
}
}
@@ -3928,46 +3928,46 @@
}
if(pCreateInfos->pColorBlendState->pAttachments != nullptr && pCreateInfos->pColorBlendState->pAttachments->blendEnable == VK_TRUE)
{
- if(pCreateInfos->pColorBlendState->pAttachments->srcBlendColor < VK_BLEND_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->srcBlendColor > VK_BLEND_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->srcColorBlendFactor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->srcColorBlendFactor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->srcBlendColor, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendFactor pCreateInfos->pColorBlendState->pAttachments->srcColorBlendFactor, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pColorBlendState->pAttachments->dstBlendColor < VK_BLEND_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->dstBlendColor > VK_BLEND_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->dstColorBlendFactor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->dstColorBlendFactor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->dstBlendColor, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendFactor pCreateInfos->pColorBlendState->pAttachments->dstColorBlendFactor, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pColorBlendState->pAttachments->blendOpColor < VK_BLEND_OP_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->blendOpColor > VK_BLEND_OP_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->colorBlendOp < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->colorBlendOp > VK_BLEND_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlendOp pCreateInfos->pColorBlendState->pAttachments->blendOpColor, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendOp pCreateInfos->pColorBlendState->pAttachments->colorBlendOp, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pColorBlendState->pAttachments->srcBlendAlpha < VK_BLEND_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->srcBlendAlpha > VK_BLEND_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->srcAlphaBlendFactor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->srcAlphaBlendFactor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->srcBlendAlpha, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendFactor pCreateInfos->pColorBlendState->pAttachments->srcAlphaBlendFactor, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha < VK_BLEND_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha > VK_BLEND_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->dstAlphaBlendFactor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->dstAlphaBlendFactor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlend pCreateInfos->pColorBlendState->pAttachments->dstBlendAlpha, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendFactor pCreateInfos->pColorBlendState->pAttachments->dstAlphaBlendFactor, is an unrecognized enumerator");
return false;
}
- if(pCreateInfos->pColorBlendState->pAttachments->blendOpAlpha < VK_BLEND_OP_BEGIN_RANGE ||
- pCreateInfos->pColorBlendState->pAttachments->blendOpAlpha > VK_BLEND_OP_END_RANGE)
+ if(pCreateInfos->pColorBlendState->pAttachments->alphaBlendOp < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfos->pColorBlendState->pAttachments->alphaBlendOp > VK_BLEND_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCreateGraphicsPipelines parameter, VkBlendOp pCreateInfos->pColorBlendState->pAttachments->blendOpAlpha, is an unrecognized enumerator");
+ "vkCreateGraphicsPipelines parameter, VkBlendOp pCreateInfos->pColorBlendState->pAttachments->alphaBlendOp, is an unrecognized enumerator");
return false;
}
}
@@ -4339,10 +4339,10 @@
"vkCreateDescriptorPool parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator");
return false;
}
- if(pCreateInfo->pTypeCounts != nullptr)
+ if(pCreateInfo->pPoolSizes != nullptr)
{
- if(pCreateInfo->pTypeCounts->type < VK_DESCRIPTOR_TYPE_BEGIN_RANGE ||
- pCreateInfo->pTypeCounts->type > VK_DESCRIPTOR_TYPE_END_RANGE)
+ if(pCreateInfo->pPoolSizes->type < VK_DESCRIPTOR_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pPoolSizes->type > VK_DESCRIPTOR_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateDescriptorPool parameter, VkDescriptorType pCreateInfo->pTypeCount->type, is an unrecognized enumerator");
@@ -5114,19 +5114,19 @@
get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask)
+VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask)
{
- get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilCompareMask(commandBuffer, faceMask, stencilCompareMask);
+ get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilCompareMask(commandBuffer, faceMask, compareMask);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilWriteMask)
+VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask)
{
- get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilWriteMask(commandBuffer, faceMask, stencilWriteMask);
+ get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilWriteMask(commandBuffer, faceMask, writeMask);
}
-VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t stencilReference)
+VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference)
{
- get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilReference(commandBuffer, faceMask, stencilReference);
+ get_dispatch_table(pc_device_table_map, commandBuffer)->CmdSetStencilReference(commandBuffer, faceMask, reference);
}
bool PreCmdBindDescriptorSets(
@@ -6310,14 +6310,14 @@
bool PostCmdBeginRenderPass(
VkCommandBuffer commandBuffer,
- VkRenderPassContents contents)
+ VkSubpassContents contents)
{
- if(contents < VK_RENDER_PASS_CONTENTS_BEGIN_RANGE ||
- contents > VK_RENDER_PASS_CONTENTS_END_RANGE)
+ if(contents < VK_SUBPASS_CONTENTS_BEGIN_RANGE ||
+ contents > VK_SUBPASS_CONTENTS_END_RANGE)
{
log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCmdBeginRenderPass parameter, VkRenderPassContents contents, is an unrecognized enumerator");
+ "vkCmdBeginRenderPass parameter, VkSubpassContents contents, is an unrecognized enumerator");
return false;
}
@@ -6327,7 +6327,7 @@
VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(
VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBegin,
- VkRenderPassContents contents)
+ VkSubpassContents contents)
{
PreCmdBeginRenderPass(commandBuffer, pRenderPassBegin);
@@ -6338,14 +6338,14 @@
bool PostCmdNextSubpass(
VkCommandBuffer commandBuffer,
- VkRenderPassContents contents)
+ VkSubpassContents contents)
{
- if(contents < VK_RENDER_PASS_CONTENTS_BEGIN_RANGE ||
- contents > VK_RENDER_PASS_CONTENTS_END_RANGE)
+ if(contents < VK_SUBPASS_CONTENTS_BEGIN_RANGE ||
+ contents > VK_SUBPASS_CONTENTS_END_RANGE)
{
log_msg(mdd(commandBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
- "vkCmdNextSubpass parameter, VkRenderPassContents contents, is an unrecognized enumerator");
+ "vkCmdNextSubpass parameter, VkSubpassContents contents, is an unrecognized enumerator");
return false;
}
@@ -6354,7 +6354,7 @@
VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(
VkCommandBuffer commandBuffer,
- VkRenderPassContents contents)
+ VkSubpassContents contents)
{
get_dispatch_table(pc_device_table_map, commandBuffer)->CmdNextSubpass(commandBuffer, contents);
diff --git a/layers/vk_validation_layer_details.md b/layers/vk_validation_layer_details.md
index f13c2b0..faadaa0 100644
--- a/layers/vk_validation_layer_details.md
+++ b/layers/vk_validation_layer_details.md
@@ -107,7 +107,7 @@
Additional work to be done
1. Source2 was creating a VK_FORMAT_R8_SRGB texture (and image view) which was not supported by the underlying implementation (rendersystemtest imageformat test). Checking that formats are supported by the implementation is something the validation layer could do using the VK_FORMAT_INFO_TYPE_PROPERTIES query. There are probably a bunch of checks here you could be doing around vkCreateImage formats along with whether image/color/depth attachment views are valid. I’m not sure how much of this is already there.
- 2. From AMD: we were using an image view with a swizzle of VK_CHANNEL_FORMAT_A with a BC1_RGB texture, which is not valid because the texture does not have an alpha channel. In general, should validate that the swizzles do not reference components not in the texture format.
+ 2. From AMD: we were using an image view with a swizzle of VK_COLOR_COMPONENT_FORMAT_A with a BC1_RGB texture, which is not valid because the texture does not have an alpha channel. In general, should validate that the swizzles do not reference components not in the texture format.
3. When querying VK_PHYSICAL_DEVICE_INFO_TYPE_QUEUE_PROPERTIES must provide enough memory for a all the queues on the device (not just 1 when device has multiple queues).
4. INT & FLOAT bordercolors. Border color int/float selection must match associated texture format.
5. Flag error on VkBufferCreateInfo if buffer size is 0