Bug 14224: Remove abbreviations on some API symbols
diff --git a/include/vulkan.h b/include/vulkan.h
index 1b04387..78b0152 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -764,13 +764,13 @@
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 20,
VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 21,
VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 22,
- VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO = 23,
- VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO = 24,
- VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO = 25,
- VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO = 26,
- VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO = 27,
- VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO = 28,
- VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO = 29,
+ VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 23,
+ VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO = 24,
+ VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO = 25,
+ VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO = 26,
+ VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 27,
+ VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 28,
+ VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 29,
VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 30,
VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 31,
VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 32,
@@ -1883,7 +1883,7 @@
const VkVertexInputAttributeDescription* pVertexAttributeDescriptions;
} VkPipelineVertexInputStateCreateInfo;
-typedef struct VkPipelineIaStateCreateInfo_
+typedef struct VkPipelineInputAssemblyStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -1891,25 +1891,25 @@
VkBool32 disableVertexReuse; // optional
VkBool32 primitiveRestartEnable;
uint32_t primitiveRestartIndex; // optional (GL45)
-} VkPipelineIaStateCreateInfo;
+} VkPipelineInputAssemblyStateCreateInfo;
-typedef struct VkPipelineTessStateCreateInfo_
+typedef struct VkPipelineTessellationStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
uint32_t patchControlPoints;
-} VkPipelineTessStateCreateInfo;
+} VkPipelineTessellationStateCreateInfo;
-typedef struct VkPipelineVpStateCreateInfo_
+typedef struct VkPipelineViewportStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
uint32_t viewportCount;
VkCoordinateOrigin clipOrigin; // optional (GL45)
VkDepthMode depthMode; // optional (GL45)
-} VkPipelineVpStateCreateInfo;
+} VkPipelineViewportStateCreateInfo;
-typedef struct VkPipelineRsStateCreateInfo_
+typedef struct VkPipelineRasterStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -1920,9 +1920,9 @@
VkFillMode fillMode; // optional (GL45)
VkCullMode cullMode;
VkFrontFace frontFace;
-} VkPipelineRsStateCreateInfo;
+} VkPipelineRasterStateCreateInfo;
-typedef struct VkPipelineMsStateCreateInfo_
+typedef struct VkPipelineMultisampleStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -1931,9 +1931,9 @@
VkBool32 sampleShadingEnable; // optional (GL45)
float minSampleShading; // optional (GL45)
VkSampleMask sampleMask;
-} VkPipelineMsStateCreateInfo;
+} VkPipelineMultisampleStateCreateInfo;
-typedef struct VkPipelineCbAttachmentState_
+typedef struct VkPipelineColorBlendAttachmentState_
{
VkBool32 blendEnable;
VkFormat format;
@@ -1944,9 +1944,9 @@
VkBlend destBlendAlpha;
VkBlendOp blendOpAlpha;
VkChannelFlags channelWriteMask;
-} VkPipelineCbAttachmentState;
+} VkPipelineColorBlendAttachmentState;
-typedef struct VkPipelineCbStateCreateInfo_
+typedef struct VkPipelineColorBlendStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -1954,8 +1954,8 @@
VkBool32 logicOpEnable;
VkLogicOp logicOp;
uint32_t attachmentCount; // # of pAttachments
- const VkPipelineCbAttachmentState* pAttachments;
-} VkPipelineCbStateCreateInfo;
+ const VkPipelineColorBlendAttachmentState* pAttachments;
+} VkPipelineColorBlendStateCreateInfo;
typedef struct VkStencilOpState_
{
@@ -1965,7 +1965,7 @@
VkCompareOp stencilCompareOp;
} VkStencilOpState;
-typedef struct VkPipelineDsStateCreateInfo_
+typedef struct VkPipelineDepthStencilStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -1976,7 +1976,7 @@
VkBool32 stencilTestEnable;
VkStencilOpState front;
VkStencilOpState back;
-} VkPipelineDsStateCreateInfo;
+} VkPipelineDepthStencilStateCreateInfo;
typedef struct VkGraphicsPipelineCreateInfo_
{
@@ -1985,13 +1985,13 @@
uint32_t stageCount;
const VkPipelineShaderStageCreateInfo* pStages; // One entry for each active shader stage
const VkPipelineVertexInputStateCreateInfo* pVertexInputState;
- const VkPipelineIaStateCreateInfo* pIaState;
- const VkPipelineTessStateCreateInfo* pTessState;
- const VkPipelineVpStateCreateInfo* pVpState;
- const VkPipelineRsStateCreateInfo* pRsState;
- const VkPipelineMsStateCreateInfo* pMsState;
- const VkPipelineDsStateCreateInfo* pDsState;
- const VkPipelineCbStateCreateInfo* pCbState;
+ const VkPipelineInputAssemblyStateCreateInfo* pInputAssemblyState;
+ const VkPipelineTessellationStateCreateInfo* pTessellationState;
+ const VkPipelineViewportStateCreateInfo* pViewportState;
+ const VkPipelineRasterStateCreateInfo* pRasterState;
+ const VkPipelineMultisampleStateCreateInfo* pMultisampleState;
+ const VkPipelineDepthStencilStateCreateInfo* pDepthStencilState;
+ const VkPipelineColorBlendStateCreateInfo* pColorBlendState;
VkPipelineCreateFlags flags; // Pipeline creation flags
VkPipelineLayout layout; // Interface layout of the pipeline
VkRenderPass renderPass;
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 084bc7a..98b3fc6 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -137,7 +137,8 @@
add_vk_layer(MemTracker mem_tracker.cpp vk_layer_table.cpp)
add_vk_layer(ShaderChecker shader_checker.cpp vk_layer_table.cpp)
add_vk_layer(Image image.cpp vk_layer_table.cpp)
-add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
+# TODO: Re-enable after ParamChecker updated
+#add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
#add_vk_layer(ScreenShot screenshot.cpp vk_layer_table.cpp)
# generated
add_vk_layer(Generic generic_layer.cpp vk_layer_table.cpp)
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 60f65aa..df05a65 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -497,7 +497,7 @@
size_t bufferSize = 0;
const VkPipelineVertexInputStateCreateInfo* pVICI = NULL;
- const VkPipelineCbStateCreateInfo* pCBCI = NULL;
+ const VkPipelineColorBlendStateCreateInfo* pCBCI = NULL;
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
const VkPipelineShaderStageCreateInfo *pPSSCI = &pCreateInfo->pStages[i];
@@ -551,41 +551,41 @@
}
pPipeline->graphicsPipelineCI.pVertexInputState = &pPipeline->vertexInputCI;
}
- if (pCreateInfo->pIaState != NULL) {
- memcpy((void*)&pPipeline->iaStateCI, pCreateInfo->pIaState, sizeof(VkPipelineIaStateCreateInfo));
- pPipeline->graphicsPipelineCI.pIaState = &pPipeline->iaStateCI;
+ if (pCreateInfo->pInputAssemblyState != NULL) {
+ memcpy((void*)&pPipeline->iaStateCI, pCreateInfo->pInputAssemblyState, sizeof(VkPipelineInputAssemblyStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pInputAssemblyState = &pPipeline->iaStateCI;
}
- if (pCreateInfo->pTessState != NULL) {
- memcpy((void*)&pPipeline->tessStateCI, pCreateInfo->pTessState, sizeof(VkPipelineTessStateCreateInfo));
- pPipeline->graphicsPipelineCI.pTessState = &pPipeline->tessStateCI;
+ if (pCreateInfo->pTessellationState != NULL) {
+ memcpy((void*)&pPipeline->tessStateCI, pCreateInfo->pTessellationState, sizeof(VkPipelineTessellationStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pTessellationState = &pPipeline->tessStateCI;
}
- if (pCreateInfo->pVpState != NULL) {
- memcpy((void*)&pPipeline->vpStateCI, pCreateInfo->pVpState, sizeof(VkPipelineVpStateCreateInfo));
- pPipeline->graphicsPipelineCI.pVpState = &pPipeline->vpStateCI;
+ if (pCreateInfo->pViewportState != NULL) {
+ memcpy((void*)&pPipeline->vpStateCI, pCreateInfo->pViewportState, sizeof(VkPipelineViewportStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pViewportState = &pPipeline->vpStateCI;
}
- if (pCreateInfo->pRsState != NULL) {
- memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRsState, sizeof(VkPipelineRsStateCreateInfo));
- pPipeline->graphicsPipelineCI.pRsState = &pPipeline->rsStateCI;
+ if (pCreateInfo->pRasterState != NULL) {
+ memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRasterState, sizeof(VkPipelineRasterStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pRasterState = &pPipeline->rsStateCI;
}
- if (pCreateInfo->pMsState != NULL) {
- memcpy((void*)&pPipeline->msStateCI, pCreateInfo->pMsState, sizeof(VkPipelineMsStateCreateInfo));
- pPipeline->graphicsPipelineCI.pMsState = &pPipeline->msStateCI;
+ if (pCreateInfo->pMultisampleState != NULL) {
+ memcpy((void*)&pPipeline->msStateCI, pCreateInfo->pMultisampleState, sizeof(VkPipelineMultisampleStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pMultisampleState = &pPipeline->msStateCI;
}
- if (pCreateInfo->pCbState != NULL) {
- memcpy((void*)&pPipeline->cbStateCI, pCreateInfo->pCbState, sizeof(VkPipelineCbStateCreateInfo));
+ if (pCreateInfo->pColorBlendState != NULL) {
+ memcpy((void*)&pPipeline->cbStateCI, pCreateInfo->pColorBlendState, sizeof(VkPipelineColorBlendStateCreateInfo));
// Copy embedded ptrs
- pCBCI = pCreateInfo->pCbState;
+ pCBCI = pCreateInfo->pColorBlendState;
pPipeline->attachmentCount = pCBCI->attachmentCount;
if (pPipeline->attachmentCount) {
- pPipeline->pAttachments = new VkPipelineCbAttachmentState[pPipeline->attachmentCount];
- bufferSize = pPipeline->attachmentCount * sizeof(VkPipelineCbAttachmentState);
+ pPipeline->pAttachments = new VkPipelineColorBlendAttachmentState[pPipeline->attachmentCount];
+ bufferSize = pPipeline->attachmentCount * sizeof(VkPipelineColorBlendAttachmentState);
memcpy((void*)pPipeline->pAttachments, pCBCI->pAttachments, bufferSize);
}
- pPipeline->graphicsPipelineCI.pCbState = &pPipeline->cbStateCI;
+ pPipeline->graphicsPipelineCI.pColorBlendState = &pPipeline->cbStateCI;
}
- if (pCreateInfo->pDsState != NULL) {
- memcpy((void*)&pPipeline->dsStateCI, pCreateInfo->pDsState, sizeof(VkPipelineDsStateCreateInfo));
- pPipeline->graphicsPipelineCI.pDsState = &pPipeline->dsStateCI;
+ if (pCreateInfo->pDepthStencilState != NULL) {
+ memcpy((void*)&pPipeline->dsStateCI, pCreateInfo->pDepthStencilState, sizeof(VkPipelineDepthStencilStateCreateInfo));
+ pPipeline->graphicsPipelineCI.pDepthStencilState = &pPipeline->dsStateCI;
}
// Copy over GraphicsPipelineCreateInfo structure embedded pointers
@@ -624,7 +624,7 @@
static uint32_t getNumSamples(const VkPipeline pipeline)
{
PIPELINE_NODE* pPipe = pipelineMap[pipeline.handle];
- if (VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO == pPipe->msStateCI.sType) {
+ if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) {
if (pPipe->msStateCI.multisampleEnable)
return pPipe->msStateCI.rasterSamples;
}
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 8b4f6c1..e4fbec3 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -86,21 +86,21 @@
} GENERIC_HEADER;
typedef struct _PIPELINE_NODE {
- VkPipeline pipeline;
- VkGraphicsPipelineCreateInfo graphicsPipelineCI;
- VkPipelineVertexInputStateCreateInfo vertexInputCI;
- VkPipelineIaStateCreateInfo iaStateCI;
- VkPipelineTessStateCreateInfo tessStateCI;
- VkPipelineVpStateCreateInfo vpStateCI;
- VkPipelineRsStateCreateInfo rsStateCI;
- VkPipelineMsStateCreateInfo msStateCI;
- VkPipelineCbStateCreateInfo cbStateCI;
- VkPipelineDsStateCreateInfo dsStateCI;
- VkPipelineShaderStageCreateInfo vsCI;
- VkPipelineShaderStageCreateInfo tcsCI;
- VkPipelineShaderStageCreateInfo tesCI;
- VkPipelineShaderStageCreateInfo gsCI;
- VkPipelineShaderStageCreateInfo fsCI;
+ VkPipeline pipeline;
+ VkGraphicsPipelineCreateInfo graphicsPipelineCI;
+ VkPipelineVertexInputStateCreateInfo vertexInputCI;
+ VkPipelineInputAssemblyStateCreateInfo iaStateCI;
+ VkPipelineTessellationStateCreateInfo tessStateCI;
+ VkPipelineViewportStateCreateInfo vpStateCI;
+ VkPipelineRasterStateCreateInfo rsStateCI;
+ VkPipelineMultisampleStateCreateInfo msStateCI;
+ VkPipelineColorBlendStateCreateInfo cbStateCI;
+ VkPipelineDepthStencilStateCreateInfo dsStateCI;
+ VkPipelineShaderStageCreateInfo vsCI;
+ VkPipelineShaderStageCreateInfo tcsCI;
+ VkPipelineShaderStageCreateInfo tesCI;
+ VkPipelineShaderStageCreateInfo gsCI;
+ VkPipelineShaderStageCreateInfo fsCI;
// Compute shader is include in VkComputePipelineCreateInfo
VkComputePipelineCreateInfo computePipelineCI;
// Flag of which shader stages are active for this pipeline
@@ -112,7 +112,7 @@
uint32_t vtxAttributeCount; // number of attributes
VkVertexInputAttributeDescription* pVertexAttributeDescriptions;
uint32_t attachmentCount; // number of CB attachments
- VkPipelineCbAttachmentState* pAttachments;
+ VkPipelineColorBlendAttachmentState* pAttachments;
} PIPELINE_NODE;
typedef struct _SAMPLER_NODE {
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 12c1f42..49c1bea 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -4521,291 +4521,885 @@
"vkCreateGraphicsPipeline parameter, VkFormat pCreateInfo->pVertexInputState->pVertexAttributeDescriptions->format, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pIaState == nullptr)
+ if(pCreateInfo->pInputAssemblyState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineIaStateCreateInfo* pCreateInfo->pIaState, is null pointer");
return false;
}
- if(pCreateInfo->pIaState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pIaState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pInputAssemblyState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pInputAssemblyState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pIaState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pIaState->topology < VK_PRIMITIVE_TOPOLOGY_BEGIN_RANGE ||
- pCreateInfo->pIaState->topology > VK_PRIMITIVE_TOPOLOGY_END_RANGE)
+ if(pCreateInfo->pInputAssemblyState->topology < VK_PRIMITIVE_TOPOLOGY_BEGIN_RANGE ||
+ pCreateInfo->pInputAssemblyState->topology > VK_PRIMITIVE_TOPOLOGY_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkPrimitiveTopology pCreateInfo->pIaState->topology, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pTessState == nullptr)
+ if(pCreateInfo->pTessellationState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineTessStateCreateInfo* pCreateInfo->pTessState, is null pointer");
return false;
}
- if(pCreateInfo->pTessState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pTessState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pTessellationState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pTessellationState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pTessState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pVpState == nullptr)
+ if(pCreateInfo->pViewportState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineVpStateCreateInfo* pCreateInfo->pVpState, is null pointer");
return false;
}
- if(pCreateInfo->pVpState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pVpState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pViewportState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pVpState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pVpState->clipOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
- pCreateInfo->pVpState->clipOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
+ if(pCreateInfo->pViewportState->clipOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->clipOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCoordinateOrigin pCreateInfo->pVpState->clipOrigin, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pVpState->depthMode < VK_DEPTH_MODE_BEGIN_RANGE ||
- pCreateInfo->pVpState->depthMode > VK_DEPTH_MODE_END_RANGE)
+ if(pCreateInfo->pViewportState->depthMode < VK_DEPTH_MODE_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->depthMode > VK_DEPTH_MODE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkDepthMode pCreateInfo->pVpState->depthMode, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState == nullptr)
+ if(pCreateInfo->pRasterState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineRsStateCreateInfo* pCreateInfo->pRsState, is null pointer");
return false;
}
- if(pCreateInfo->pRsState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pRsState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pRasterState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pRsState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState->pointOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
- pCreateInfo->pRsState->pointOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
+ if(pCreateInfo->pRasterState->pointOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->pointOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCoordinateOrigin pCreateInfo->pRsState->pointOrigin, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState->provokingVertex < VK_PROVOKING_VERTEX_BEGIN_RANGE ||
- pCreateInfo->pRsState->provokingVertex > VK_PROVOKING_VERTEX_END_RANGE)
+ if(pCreateInfo->pRasterState->provokingVertex < VK_PROVOKING_VERTEX_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->provokingVertex > VK_PROVOKING_VERTEX_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkProvokingVertex pCreateInfo->pRsState->provokingVertex, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState->fillMode < VK_FILL_MODE_BEGIN_RANGE ||
- pCreateInfo->pRsState->fillMode > VK_FILL_MODE_END_RANGE)
+ if(pCreateInfo->pRasterState->fillMode < VK_FILL_MODE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->fillMode > VK_FILL_MODE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkFillMode pCreateInfo->pRsState->fillMode, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState->cullMode < VK_CULL_MODE_BEGIN_RANGE ||
- pCreateInfo->pRsState->cullMode > VK_CULL_MODE_END_RANGE)
+ if(pCreateInfo->pRasterState->cullMode < VK_CULL_MODE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->cullMode > VK_CULL_MODE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCullMode pCreateInfo->pRsState->cullMode, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pRsState->frontFace < VK_FRONT_FACE_BEGIN_RANGE ||
- pCreateInfo->pRsState->frontFace > VK_FRONT_FACE_END_RANGE)
+ if(pCreateInfo->pRasterState->frontFace < VK_FRONT_FACE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->frontFace > VK_FRONT_FACE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkFrontFace pCreateInfo->pRsState->frontFace, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pMsState == nullptr)
+ if(pCreateInfo->pMultisampleState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineMsStateCreateInfo* pCreateInfo->pMsState, is null pointer");
return false;
}
- if(pCreateInfo->pMsState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pMsState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pMultisampleState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pMultisampleState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pMsState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState == nullptr)
+ if(pCreateInfo->pDepthStencilState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineDsStateCreateInfo* pCreateInfo->pDsState, is null pointer");
return false;
}
- if(pCreateInfo->pDsState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pDsState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pDsState->sType, is unrecognized enumerator");
return false;
}
+<<<<<<< HEAD
if(pCreateInfo->pDsState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
pCreateInfo->pDsState->depthCompareOp > VK_COMPARE_OP_END_RANGE)
+=======
+ if(pCreateInfo->pDepthStencilState->format < VK_FORMAT_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->format > VK_FORMAT_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipeline parameter, VkFormat pCreateInfo->pDsState->format, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->depthCompareOp > VK_COMPARE_OP_END_RANGE)
+>>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCompareOp pCreateInfo->pDsState->depthCompareOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->front.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->front.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->front.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->front.stencilFailOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->front.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->front.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->front.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilPassOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->front.stencilPassOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->front.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->front.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->front.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->front.stencilDepthFailOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->front.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->front.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->front.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCompareOp pCreateInfo->pDsState->front.stencilCompareOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->back.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->back.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->back.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->back.stencilFailOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->back.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->back.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->back.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilPassOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->back.stencilPassOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->back.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->back.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->back.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStencilOp pCreateInfo->pDsState->back.stencilDepthFailOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pDsState->back.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
- pCreateInfo->pDsState->back.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ if(pCreateInfo->pDepthStencilState->back.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkCompareOp pCreateInfo->pDsState->back.stencilCompareOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState == nullptr)
+ if(pCreateInfo->pColorBlendState == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineCbStateCreateInfo* pCreateInfo->pCbState, is null pointer");
return false;
}
- if(pCreateInfo->pCbState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
- pCreateInfo->pCbState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ if(pCreateInfo->pColorBlendState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->sType > VK_STRUCTURE_TYPE_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkStructureType pCreateInfo->pCbState->sType, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->logicOp < VK_LOGIC_OP_BEGIN_RANGE ||
- pCreateInfo->pCbState->logicOp > VK_LOGIC_OP_END_RANGE)
+ if(pCreateInfo->pColorBlendState->logicOp < VK_LOGIC_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->logicOp > VK_LOGIC_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkLogicOp pCreateInfo->pCbState->logicOp, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments == nullptr)
+ if(pCreateInfo->pColorBlendState->pAttachments == nullptr)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, const VkPipelineCbAttachmentState* pCreateInfo->pCbState->pAttachments, is null pointer");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->format < VK_FORMAT_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->format > VK_FORMAT_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->format < VK_FORMAT_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->format > VK_FORMAT_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkFormat pCreateInfo->pCbState->pAttachments->format, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->srcBlendColor < VK_BLEND_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->srcBlendColor > VK_BLEND_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->srcBlendColor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->srcBlendColor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlend pCreateInfo->pCbState->pAttachments->srcBlendColor, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->destBlendColor < VK_BLEND_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->destBlendColor > VK_BLEND_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->destBlendColor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->destBlendColor > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlend pCreateInfo->pCbState->pAttachments->destBlendColor, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->blendOpColor < VK_BLEND_OP_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->blendOpColor > VK_BLEND_OP_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->blendOpColor < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->blendOpColor > VK_BLEND_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlendOp pCreateInfo->pCbState->pAttachments->blendOpColor, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->srcBlendAlpha < VK_BLEND_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->srcBlendAlpha > VK_BLEND_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->srcBlendAlpha < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->srcBlendAlpha > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlend pCreateInfo->pCbState->pAttachments->srcBlendAlpha, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->destBlendAlpha < VK_BLEND_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->destBlendAlpha > VK_BLEND_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->destBlendAlpha < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->destBlendAlpha > VK_BLEND_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlend pCreateInfo->pCbState->pAttachments->destBlendAlpha, is unrecognized enumerator");
return false;
}
- if(pCreateInfo->pCbState->pAttachments->blendOpAlpha < VK_BLEND_OP_BEGIN_RANGE ||
- pCreateInfo->pCbState->pAttachments->blendOpAlpha > VK_BLEND_OP_END_RANGE)
+ if(pCreateInfo->pColorBlendState->pAttachments->blendOpAlpha < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->blendOpAlpha > VK_BLEND_OP_END_RANGE)
{
log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkBlendOp pCreateInfo->pCbState->pAttachments->blendOpAlpha, is unrecognized enumerator");
return false;
}
- if(!ValidateEnumerator((VkChannelFlagBits)pCreateInfo->pCbState->pAttachments->channelWriteMask))
+ if(!ValidateEnumerator((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask))
{
+<<<<<<< HEAD
std::string reason = "vkCreateGraphicsPipeline parameter, VkChannelFlags pCreateInfo->pCbState->pAttachments->channelWriteMask, is " + EnumeratorString((VkChannelFlagBits)pCreateInfo->pCbState->pAttachments->channelWriteMask);
log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+=======
+ std::string reason = "vkCreateGraphicsPipeline parameter, VkChannelFlags pCreateInfo->pCbState->pAttachments->channelWriteMask, is " + EnumeratorString((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+>>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols
return false;
}
if(!ValidateEnumerator((VkPipelineCreateFlagBits)pCreateInfo->flags))
{
std::string reason = "vkCreateGraphicsPipeline parameter, VkPipelineCreateFlags pCreateInfo->flags, is " + EnumeratorString((VkPipelineCreateFlagBits)pCreateInfo->flags);
+<<<<<<< HEAD
log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
return false;
}
if(pCreateInfo->layout.handle == 0)
+=======
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+bool PostCreateGraphicsPipeline(
+ VkDevice device,
+ VkPipeline* pPipeline,
+ VkResult result)
+{
+
+ if(pPipeline == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipeline parameter, VkPipeline* pPipeline, is null pointer");
+ return false;
+ }
+
+ if(result != VK_SUCCESS)
+ {
+ std::string reason = "vkCreateGraphicsPipeline parameter, VkResult result, is " + EnumeratorString(result);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipeline(
+ VkDevice device,
+ const VkGraphicsPipelineCreateInfo* pCreateInfo,
+ VkPipeline* pPipeline)
+{
+ PreCreateGraphicsPipeline(device, pCreateInfo);
+
+ VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateGraphicsPipeline(device, pCreateInfo, pPipeline);
+
+ PostCreateGraphicsPipeline(device, pPipeline, result);
+
+ return result;
+}
+
+bool PostDestroyPipeline(
+ VkDevice device,
+ VkPipeline pipeline,
+ VkResult result)
+{
+
+
+ if(result != VK_SUCCESS)
+ {
+ std::string reason = "vkDestroyPipeline parameter, VkResult result, is " + EnumeratorString(result);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+VK_LAYER_EXPORT VkResult VKAPI vkDestroyPipeline(
+ VkDevice device,
+ VkPipeline pipeline)
+{
+ VkResult result = get_dispatch_table(pc_device_table_map, device)->DestroyPipeline(device, pipeline);
+
+ PostDestroyPipeline(device, pipeline, result);
+
+ return result;
+}
+
+bool PreCreateGraphicsPipelineDerivative(
+ VkDevice device,
+ const VkGraphicsPipelineCreateInfo* pCreateInfo)
+{
+ if(pCreateInfo == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkGraphicsPipelineCreateInfo* pCreateInfo, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pStages == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineShaderStageCreateInfo* pCreateInfo->pStages, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pStages->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pStages->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pStages->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pStages->stage < VK_SHADER_STAGE_BEGIN_RANGE ||
+ pCreateInfo->pStages->stage > VK_SHADER_STAGE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkShaderStage pCreateInfo->pStages->stage, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pStages->pSpecializationInfo == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkSpecializationInfo* pCreateInfo->pStages->pSpecializationInfo, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pStages->pSpecializationInfo->pMap == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkSpecializationMapEntry* pCreateInfo->pStages->pSpecializationInfo->pMap, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pStages->pSpecializationInfo->pData == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const void* pCreateInfo->pStages->pSpecializationInfo->pData, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineVertexInputStateCreateInfo* pCreateInfo->pVertexInputState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pVertexInputState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pVertexInputState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState->pVertexBindingDescriptions == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkVertexInputBindingDescription* pCreateInfo->pVertexInputState->pVertexBindingDescriptions, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState->pVertexBindingDescriptions->stepRate < VK_VERTEX_INPUT_STEP_RATE_BEGIN_RANGE ||
+ pCreateInfo->pVertexInputState->pVertexBindingDescriptions->stepRate > VK_VERTEX_INPUT_STEP_RATE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkVertexInputStepRate pCreateInfo->pVertexInputState->pVertexBindingDescriptions->stepRate, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState->pVertexAttributeDescriptions == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkVertexInputAttributeDescription* pCreateInfo->pVertexInputState->pVertexAttributeDescriptions, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pVertexInputState->pVertexAttributeDescriptions->format < VK_FORMAT_BEGIN_RANGE ||
+ pCreateInfo->pVertexInputState->pVertexAttributeDescriptions->format > VK_FORMAT_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkFormat pCreateInfo->pVertexInputState->pVertexAttributeDescriptions->format, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pInputAssemblyState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineIaStateCreateInfo* pCreateInfo->pIaState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pInputAssemblyState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pInputAssemblyState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pIaState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pInputAssemblyState->topology < VK_PRIMITIVE_TOPOLOGY_BEGIN_RANGE ||
+ pCreateInfo->pInputAssemblyState->topology > VK_PRIMITIVE_TOPOLOGY_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkPrimitiveTopology pCreateInfo->pIaState->topology, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pTessellationState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineTessStateCreateInfo* pCreateInfo->pTessState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pTessellationState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pTessellationState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pTessState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pViewportState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineVpStateCreateInfo* pCreateInfo->pVpState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pViewportState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pVpState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pViewportState->clipOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->clipOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCoordinateOrigin pCreateInfo->pVpState->clipOrigin, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pViewportState->depthMode < VK_DEPTH_MODE_BEGIN_RANGE ||
+ pCreateInfo->pViewportState->depthMode > VK_DEPTH_MODE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkDepthMode pCreateInfo->pVpState->depthMode, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineRsStateCreateInfo* pCreateInfo->pRsState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pRsState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->pointOrigin < VK_COORDINATE_ORIGIN_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->pointOrigin > VK_COORDINATE_ORIGIN_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCoordinateOrigin pCreateInfo->pRsState->pointOrigin, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->provokingVertex < VK_PROVOKING_VERTEX_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->provokingVertex > VK_PROVOKING_VERTEX_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkProvokingVertex pCreateInfo->pRsState->provokingVertex, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->fillMode < VK_FILL_MODE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->fillMode > VK_FILL_MODE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkFillMode pCreateInfo->pRsState->fillMode, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->cullMode < VK_CULL_MODE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->cullMode > VK_CULL_MODE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCullMode pCreateInfo->pRsState->cullMode, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pRasterState->frontFace < VK_FRONT_FACE_BEGIN_RANGE ||
+ pCreateInfo->pRasterState->frontFace > VK_FRONT_FACE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkFrontFace pCreateInfo->pRsState->frontFace, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pMultisampleState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineMsStateCreateInfo* pCreateInfo->pMsState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pMultisampleState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pMultisampleState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pMsState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineDsStateCreateInfo* pCreateInfo->pDsState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pDsState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->format < VK_FORMAT_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->format > VK_FORMAT_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkFormat pCreateInfo->pDsState->format, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->depthCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->depthCompareOp > VK_COMPARE_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCompareOp pCreateInfo->pDsState->depthCompareOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->front.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->front.stencilFailOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->front.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->front.stencilPassOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->front.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->front.stencilDepthFailOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->front.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->front.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCompareOp pCreateInfo->pDsState->front.stencilCompareOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->back.stencilFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilFailOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->back.stencilFailOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->back.stencilPassOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilPassOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->back.stencilPassOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->back.stencilDepthFailOp < VK_STENCIL_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilDepthFailOp > VK_STENCIL_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStencilOp pCreateInfo->pDsState->back.stencilDepthFailOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pDepthStencilState->back.stencilCompareOp < VK_COMPARE_OP_BEGIN_RANGE ||
+ pCreateInfo->pDepthStencilState->back.stencilCompareOp > VK_COMPARE_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkCompareOp pCreateInfo->pDsState->back.stencilCompareOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineCbStateCreateInfo* pCreateInfo->pCbState, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkStructureType pCreateInfo->pCbState->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->logicOp < VK_LOGIC_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->logicOp > VK_LOGIC_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkLogicOp pCreateInfo->pCbState->logicOp, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, const VkPipelineCbAttachmentState* pCreateInfo->pCbState->pAttachments, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->format < VK_FORMAT_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->format > VK_FORMAT_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkFormat pCreateInfo->pCbState->pAttachments->format, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->srcBlendColor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->srcBlendColor > VK_BLEND_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlend pCreateInfo->pCbState->pAttachments->srcBlendColor, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->destBlendColor < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->destBlendColor > VK_BLEND_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlend pCreateInfo->pCbState->pAttachments->destBlendColor, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->blendOpColor < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->blendOpColor > VK_BLEND_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlendOp pCreateInfo->pCbState->pAttachments->blendOpColor, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->srcBlendAlpha < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->srcBlendAlpha > VK_BLEND_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlend pCreateInfo->pCbState->pAttachments->srcBlendAlpha, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->destBlendAlpha < VK_BLEND_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->destBlendAlpha > VK_BLEND_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlend pCreateInfo->pCbState->pAttachments->destBlendAlpha, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->pColorBlendState->pAttachments->blendOpAlpha < VK_BLEND_OP_BEGIN_RANGE ||
+ pCreateInfo->pColorBlendState->pAttachments->blendOpAlpha > VK_BLEND_OP_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkBlendOp pCreateInfo->pCbState->pAttachments->blendOpAlpha, is unrecognized enumerator");
+ return false;
+ }
+ if(!ValidateEnumerator((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask))
+ {
+ std::string reason = "vkCreateGraphicsPipelineDerivative parameter, VkChannelFlags pCreateInfo->pCbState->pAttachments->channelWriteMask, is " + EnumeratorString((VkChannelFlagBits)pCreateInfo->pColorBlendState->pAttachments->channelWriteMask);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+ if(!ValidateEnumerator((VkPipelineCreateFlagBits)pCreateInfo->flags))
+ {
+ std::string reason = "vkCreateGraphicsPipelineDerivative parameter, VkPipelineCreateFlags pCreateInfo->flags, is " + EnumeratorString((VkPipelineCreateFlagBits)pCreateInfo->flags);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+bool PostCreateGraphicsPipelineDerivative(
+ VkDevice device,
+ VkPipeline basePipeline,
+ VkPipeline* pPipeline,
+ VkResult result)
+{
+
+
+ if(pPipeline == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateGraphicsPipelineDerivative parameter, VkPipeline* pPipeline, is null pointer");
+ return false;
+ }
+
+ if(result != VK_SUCCESS)
+ {
+ std::string reason = "vkCreateGraphicsPipelineDerivative parameter, VkResult result, is " + EnumeratorString(result);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelineDerivative(
+ VkDevice device,
+ const VkGraphicsPipelineCreateInfo* pCreateInfo,
+ VkPipeline basePipeline,
+ VkPipeline* pPipeline)
+{
+ PreCreateGraphicsPipelineDerivative(device, pCreateInfo);
+
+ VkResult result = get_dispatch_table(pc_device_table_map, device)->CreateGraphicsPipelineDerivative(device, pCreateInfo, basePipeline, pPipeline);
+
+ PostCreateGraphicsPipelineDerivative(device, basePipeline, pPipeline, result);
+
+ return result;
+}
+
+bool PreCreateComputePipeline(
+ VkDevice device,
+ const VkComputePipelineCreateInfo* pCreateInfo)
+{
+ if(pCreateInfo == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, const VkComputePipelineCreateInfo* pCreateInfo, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, VkStructureType pCreateInfo->sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->cs.sType < VK_STRUCTURE_TYPE_BEGIN_RANGE ||
+ pCreateInfo->cs.sType > VK_STRUCTURE_TYPE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, VkStructureType pCreateInfo->cs.sType, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->cs.stage < VK_SHADER_STAGE_BEGIN_RANGE ||
+ pCreateInfo->cs.stage > VK_SHADER_STAGE_END_RANGE)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, VkShaderStage pCreateInfo->cs.stage, is unrecognized enumerator");
+ return false;
+ }
+ if(pCreateInfo->cs.pSpecializationInfo == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, const VkSpecializationInfo* pCreateInfo->cs.pSpecializationInfo, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->cs.pSpecializationInfo->pMap == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, const VkSpecializationMapEntry* pCreateInfo->cs.pSpecializationInfo->pMap, is null pointer");
+ return false;
+ }
+ if(pCreateInfo->cs.pSpecializationInfo->pData == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, const void* pCreateInfo->cs.pSpecializationInfo->pData, is null pointer");
+ return false;
+ }
+ if(!ValidateEnumerator((VkPipelineCreateFlagBits)pCreateInfo->flags))
+ {
+ std::string reason = "vkCreateComputePipeline parameter, VkPipelineCreateFlags pCreateInfo->flags, is " + EnumeratorString((VkPipelineCreateFlagBits)pCreateInfo->flags);
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
+ return false;
+ }
+
+ return true;
+}
+
+bool PostCreateComputePipeline(
+ VkDevice device,
+ VkPipeline* pPipeline,
+ VkResult result)
+{
+
+ if(pPipeline == nullptr)
+ {
+ log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
+ "vkCreateComputePipeline parameter, VkPipeline* pPipeline, is null pointer");
+ return false;
+ }
+
+ if(result != VK_SUCCESS)
+>>>>>>> fd61c93... Bug 14224: Remove abbreviations on some API symbols
{
log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
"vkCreateGraphicsPipeline parameter, VkPipelineLayout pCreateInfo->layout, is null pointer");
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 14d4a51..425042c 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -316,8 +316,8 @@
.stencilDepthFailOp = VK_STENCIL_OP_KEEP,
.stencilCompareOp = VK_COMPARE_OP_NEVER
};
- VkPipelineDsStateCreateInfo ds_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO,
+ VkPipelineDepthStencilStateCreateInfo ds_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
.pNext = NULL,
.depthTestEnable = VK_FALSE,
.depthWriteEnable = VK_TRUE,
@@ -1087,20 +1087,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 1,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1207,20 +1207,20 @@
ASSERT_VK_SUCCESS(err);
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 0,
- .pStages = NULL, // Creating Gfx Pipeline w/o VS is a violation
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = NULL, // Creating Gfx Pipeline w/o VS is a violation
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1373,20 +1373,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1815,8 +1815,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 4,
.multisampleEnable = 1,
@@ -1848,20 +1848,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -2009,8 +2009,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 4,
.multisampleEnable = 1,
@@ -2071,20 +2071,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -2169,8 +2169,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 1,
.multisampleEnable = 1,
@@ -2202,20 +2202,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
VkPipelineCacheCreateInfo pipelineCache;
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 7d0749d..082280f 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -829,7 +829,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget(2));
- VkPipelineCbAttachmentState att = {};
+ VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
att.channelWriteMask = 0xf;
pipelineobj.AddColorAttachment(1, &att);
@@ -1859,7 +1859,7 @@
pipelineobj.AddShader(&vs);
pipelineobj.AddShader(&ps);
- VkPipelineDsStateCreateInfo ds_state;
+ VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
@@ -2802,7 +2802,7 @@
pipelineobj.AddVertexInputBindings(&vi_binding,1);
pipelineobj.AddVertexDataBuffer(&meshBuffer, MESH_BIND_ID);
- VkPipelineDsStateCreateInfo ds_state;
+ VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 4b45f10..3af63b4 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1100,14 +1100,14 @@
m_vertexBufferCount = 0;
- m_ia_state.sType = VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO;
+ m_ia_state.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
m_ia_state.pNext = VK_NULL_HANDLE;
m_ia_state.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
m_ia_state.disableVertexReuse = VK_FALSE;
m_ia_state.primitiveRestartEnable = VK_FALSE;
m_ia_state.primitiveRestartIndex = 0;
- m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO;
+ m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
m_rs_state.pNext = VK_NULL_HANDLE;
m_rs_state.depthClipEnable = VK_FALSE;
m_rs_state.rasterizerDiscardEnable = VK_FALSE;
@@ -1118,26 +1118,26 @@
m_rs_state.frontFace = VK_FRONT_FACE_CW;
memset(&m_cb_state,0,sizeof(m_cb_state));
- m_cb_state.sType = VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO;
+ m_cb_state.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
m_cb_state.pNext = VK_NULL_HANDLE;
m_cb_state.alphaToCoverageEnable = VK_FALSE;
m_cb_state.logicOp = VK_LOGIC_OP_COPY;
m_ms_state.pNext = VK_NULL_HANDLE;
- m_ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO;
+ m_ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
m_ms_state.multisampleEnable = VK_FALSE;
m_ms_state.sampleMask = 1; // Do we have to specify MSAA even just to disable it?
m_ms_state.rasterSamples = 1;
m_ms_state.minSampleShading = 0;
m_ms_state.sampleShadingEnable = 0;
- m_vp_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO;
+ m_vp_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
m_vp_state.pNext = VK_NULL_HANDLE;
m_vp_state.viewportCount = 1;
m_vp_state.depthMode = VK_DEPTH_MODE_ZERO_TO_ONE;
m_vp_state.clipOrigin = VK_COORDINATE_ORIGIN_UPPER_LEFT;
- m_ds_state.sType = VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO;
+ m_ds_state.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
m_ds_state.pNext = VK_NULL_HANDLE,
m_ds_state.depthTestEnable = VK_FALSE;
m_ds_state.depthWriteEnable = VK_FALSE;
@@ -1175,7 +1175,7 @@
m_vertexBufferCount++;
}
-void VkPipelineObj::AddColorAttachment(uint32_t binding, const VkPipelineCbAttachmentState *att)
+void VkPipelineObj::AddColorAttachment(uint32_t binding, const VkPipelineColorBlendAttachmentState *att)
{
if (binding+1 > m_colorAttachments.size())
{
@@ -1184,7 +1184,7 @@
m_colorAttachments[binding] = *att;
}
-void VkPipelineObj::SetDepthStencil(VkPipelineDsStateCreateInfo *ds_state)
+void VkPipelineObj::SetDepthStencil(VkPipelineDepthStencilStateCreateInfo *ds_state)
{
m_ds_state.depthTestEnable = ds_state->depthTestEnable;
m_ds_state.depthWriteEnable = ds_state->depthWriteEnable;
@@ -1223,16 +1223,16 @@
m_cb_state.attachmentCount = m_colorAttachments.size();
m_cb_state.pAttachments = &m_colorAttachments[0];
- info.pTessState = NULL;
- info.pVertexInputState = &m_vi_state;
- info.pIaState = &m_ia_state;
- info.pVpState = &m_vp_state;
- info.pRsState = &m_rs_state;
- info.pMsState = &m_ms_state;
- info.pDsState = &m_ds_state;
- info.pCbState = &m_cb_state;
info.renderPass = render_pass;
info.subpass = 0;
+ info.pTessellationState = NULL;
+ info.pVertexInputState = &m_vi_state;
+ info.pInputAssemblyState = &m_ia_state;
+ info.pViewportState = &m_vp_state;
+ info.pRasterState = &m_rs_state;
+ info.pMultisampleState = &m_ms_state;
+ info.pDepthStencilState = &m_ds_state;
+ info.pColorBlendState = &m_cb_state;
return init_try(*m_device, info);
}
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index bdf508e..34ef824 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -399,33 +399,33 @@
void AddVertexInputAttribs(VkVertexInputAttributeDescription* vi_attrib, int count);
void AddVertexInputBindings(VkVertexInputBindingDescription* vi_binding, int count);
void AddVertexDataBuffer(VkConstantBufferObj* vertexDataBuffer, int binding);
- void AddColorAttachment(uint32_t binding, const VkPipelineCbAttachmentState *att);
+ void AddColorAttachment(uint32_t binding, const VkPipelineColorBlendAttachmentState *att);
void AddColorAttachment()
{
- VkPipelineCbAttachmentState att = {};
+ VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
att.channelWriteMask = 0xf;
AddColorAttachment(0, &att);
}
- void SetDepthStencil(VkPipelineDsStateCreateInfo *);
+ void SetDepthStencil(VkPipelineDepthStencilStateCreateInfo *);
VkResult CreateVKPipeline(VkDescriptorSetObj &descriptorSet, VkRenderPass render_pass);
protected:
- VkPipelineVertexInputStateCreateInfo m_vi_state;
- VkPipelineIaStateCreateInfo m_ia_state;
- VkPipelineRsStateCreateInfo m_rs_state;
- VkPipelineCbStateCreateInfo m_cb_state;
- VkPipelineDsStateCreateInfo m_ds_state;
- VkPipelineVpStateCreateInfo m_vp_state;
- VkPipelineMsStateCreateInfo m_ms_state;
- VkDeviceObj *m_device;
- vector<VkShaderObj*> m_shaderObjs;
- vector<VkConstantBufferObj*> m_vertexBufferObjs;
- vector<int> m_vertexBufferBindings;
- vector<VkPipelineCbAttachmentState> m_colorAttachments;
- int m_vertexBufferCount;
+ VkPipelineVertexInputStateCreateInfo m_vi_state;
+ VkPipelineInputAssemblyStateCreateInfo m_ia_state;
+ VkPipelineRasterStateCreateInfo m_rs_state;
+ VkPipelineColorBlendStateCreateInfo m_cb_state;
+ VkPipelineDepthStencilStateCreateInfo m_ds_state;
+ VkPipelineViewportStateCreateInfo m_vp_state;
+ VkPipelineMultisampleStateCreateInfo m_ms_state;
+ VkDeviceObj *m_device;
+ vector<VkShaderObj*> m_shaderObjs;
+ vector<VkConstantBufferObj*> m_vertexBufferObjs;
+ vector<int> m_vertexBufferBindings;
+ vector<VkPipelineColorBlendAttachmentState> m_colorAttachments;
+ int m_vertexBufferCount;
};
#endif // VKRENDERFRAMEWORK_H