From 2afd521e6c35a5ef245935980f5c4222ae70ee2d Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 3 Oct 2016 15:28:49 +1300 Subject: [PATCH] layers: Get rid of duplication of logic op test between PV and CV Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 8 -------- layers/core_validation_error_enums.h | 2 -- layers/vk_validation_layer_details.md | 1 - 3 files changed, 11 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index abb5e2b..755e2cd 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3367,14 +3367,6 @@ static bool verifyPipelineCreateState(layer_data *my_data, const VkDevice device DRAWSTATE_DISABLED_LOGIC_OP, "DS", "Invalid Pipeline CreateInfo: If logic operations feature not enabled, logicOpEnable must be VK_FALSE"); } - if ((pPipeline->graphicsPipelineCI.pColorBlendState->logicOpEnable == VK_TRUE) && - ((pPipeline->graphicsPipelineCI.pColorBlendState->logicOp < VK_LOGIC_OP_CLEAR) || - (pPipeline->graphicsPipelineCI.pColorBlendState->logicOp > VK_LOGIC_OP_SET))) { - skip_call |= - log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, - DRAWSTATE_INVALID_LOGIC_OP, "DS", - "Invalid Pipeline CreateInfo: If logicOpEnable is VK_TRUE, logicOp must be a valid VkLogicOp value"); - } } // Ensure the subpass index is valid. If not, then validate_and_capture_pipeline_shader_state diff --git a/layers/core_validation_error_enums.h b/layers/core_validation_error_enums.h index 8193ea6..6e11893 100644 --- a/layers/core_validation_error_enums.h +++ b/layers/core_validation_error_enums.h @@ -225,8 +225,6 @@ enum DRAW_STATE_ERROR { // elements of pAttachmentsMustBeIdentical DRAWSTATE_DISABLED_LOGIC_OP, // If logic operations is not enabled, logicOpEnable // must be VK_FALSE - DRAWSTATE_INVALID_LOGIC_OP, // If logicOpEnable is VK_TRUE, logicOp must - // must be a valid VkLogicOp value DRAWSTATE_INVALID_QUEUE_INDEX, // Specified queue index exceeds number // of queried queue families DRAWSTATE_INVALID_QUEUE_FAMILY, // Command buffer submitted on queue is from diff --git a/layers/vk_validation_layer_details.md b/layers/vk_validation_layer_details.md index 171af48..bebb3e7 100644 --- a/layers/vk_validation_layer_details.md +++ b/layers/vk_validation_layer_details.md @@ -109,7 +109,6 @@ The Draw State portion of the core validation layer tracks state leading into Dr | Uniform Buffer Alignment | Uniform Buffer offsets in BindBufferMemory, BindDescriptorSets must agree with offset alignment device limit | INVALID_UNIFORM_BUFFER_OFFSET | vkBindBufferMemory vkCmdBindDescriptorSets | VertexBufferInvalid | None | | Independent Blending | If independent blending is not enabled, all elements of pAttachments must be identical | INDEPENDENT_BLEND | vkCreateGraphicsPipelines | DisabledIndependentBlend | Create test | | Enabled Logic Operations | If logic operations is not enabled, logicOpEnable must be VK_FALSE | DISABLED_LOGIC_OP | vkCreateGraphicsPipelines | ColorBlendLogicOpTests | NA | -| Valid Logic Operations | If logicOpEnable is VK_TRUE, logicOp must be a valid VkLogicOp value | INVALID_LOGIC_OP | vkCreateGraphicsPipelines | ColorBlendLogicOpTests | NA | | QueueFamilyIndex is Valid | Validates that QueueFamilyIndices are less an the number of QueueFamilies | INVALID_QUEUE_INDEX | vkCmdWaitEvents vkCmdPipelineBarrier vkCreateBuffer vkCreateImage | InvalidQueueIndexInvalidQuery | NA | | Invalid Queue Family Consistency | Validates that items created in one Queue Family are not submitted using a different one | INVALID_QUEUE_FAMILY | vkCmdExecuteCommands vkQueueSubmit | MismatchedQueueFamiliesOnSubmit | | Push Constants | Validate that the size of push constant ranges and updates does not exceed maxPushConstantSize | PUSH_CONSTANTS_ERROR | vkCreatePipelineLayout vkCmdPushConstants | InvalidPushConstants | NA | -- 2.7.4