commit 9752aae119dd6c036b2f7e39a2b557d34040b65c
author Petr Kraus <petr_kraus@email.cz> Fri Nov 24 03:05:50 2017 +0100
committer Mark Lobodzinski <mark@lunarg.com> Tue Nov 28 13:23:54 2017 -0700
tree 175ef35c3bcd37e68538ffbc8b3e1d3c8828ff81
parent 417d57071dad4770b1103f4d2cdb0883bec87c75

layers: Quick fix odd create PSO param checks

- param check did only check the first create info
- `cullMode` check should be redundant to the automated part

layers/parameter_validation_utils.cpp

diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
index e29d74f..1975299 100644
--- a/layers/parameter_validation_utils.cpp
+++ b/layers/parameter_validation_utils.cpp
@@ -1411,12 +1411,10 @@
                     }
                 }
             }
-        }
 
-        if (pCreateInfos != nullptr) {
-            if (pCreateInfos->flags & VK_PIPELINE_CREATE_DERIVATIVE_BIT) {
-                if (pCreateInfos->basePipelineIndex != -1) {
-                    if (pCreateInfos->basePipelineHandle != VK_NULL_HANDLE) {
+            if (pCreateInfos[i].flags & VK_PIPELINE_CREATE_DERIVATIVE_BIT) {
+                if (pCreateInfos[i].basePipelineIndex != -1) {
+                    if (pCreateInfos[i].basePipelineHandle != VK_NULL_HANDLE) {
                         skip |= log_msg(
                             report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__,
                             VALIDATION_ERROR_096005a8, LayerName,
@@ -1427,8 +1425,8 @@
                     }
                 }
 
-                if (pCreateInfos->basePipelineHandle != VK_NULL_HANDLE) {
-                    if (pCreateInfos->basePipelineIndex != -1) {
+                if (pCreateInfos[i].basePipelineHandle != VK_NULL_HANDLE) {
+                    if (pCreateInfos[i].basePipelineIndex != -1) {
                         skip |= log_msg(
                             report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__,
                             VALIDATION_ERROR_096005aa, LayerName,
@@ -1441,16 +1439,8 @@
                 }
             }
 
-            if (pCreateInfos->pRasterizationState != nullptr) {
-                if (pCreateInfos->pRasterizationState->cullMode & ~VK_CULL_MODE_FRONT_AND_BACK) {
-                    skip |= log_msg(
-                        report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__,
-                        UNRECOGNIZED_VALUE, LayerName,
-                        "vkCreateGraphicsPipelines parameter, VkCullMode pCreateInfos->pRasterizationState->cullMode, is an "
-                        "unrecognized enumerator");
-                }
-
-                if ((pCreateInfos->pRasterizationState->polygonMode != VK_POLYGON_MODE_FILL) &&
+            if (pCreateInfos[i].pRasterizationState) {
+                if ((pCreateInfos[i].pRasterizationState->polygonMode != VK_POLYGON_MODE_FILL) &&
                     (device_data->physical_device_features.fillModeNonSolid == false)) {
                     skip |= log_msg(
                         report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__,
@@ -1461,7 +1451,6 @@
                 }
             }
 
-            size_t i = 0;
             for (size_t j = 0; j < pCreateInfos[i].stageCount; j++) {
                 skip |= validate_string(device_data->report_data, "vkCreateGraphicsPipelines",
                                         ParameterName("pCreateInfos[%i].pStages[%i].pName", ParameterName::IndexVector{i, j}),