From a45b31914de64d9c37faec3fe5ff115ee8d4b13c Mon Sep 17 00:00:00 2001 From: Jeremy Hayes Date: Mon, 16 Nov 2015 17:23:59 -0700 Subject: layers: Check compareEnable. Don't validate compareOp if compareEnable is false. --- layers/param_checker.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'layers/param_checker.cpp') diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index f9cdddf1..4f0d3cc6 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -4156,12 +4156,15 @@ bool PreCreateSampler( "vkCreateSampler parameter, VkTexAddress pCreateInfo->addressModeW, is an unrecognized enumerator"); return false; } - if(pCreateInfo->compareOp < VK_COMPARE_OP_BEGIN_RANGE || - pCreateInfo->compareOp > VK_COMPARE_OP_END_RANGE) + if(pCreateInfo->compareEnable) { - log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", - "vkCreateSampler parameter, VkCompareOp pCreateInfo->compareOp, is an unrecognized enumerator"); - return false; + if(pCreateInfo->compareOp < VK_COMPARE_OP_BEGIN_RANGE || + pCreateInfo->compareOp > VK_COMPARE_OP_END_RANGE) + { + log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", + "vkCreateSampler parameter, VkCompareOp pCreateInfo->compareOp, is an unrecognized enumerator"); + return false; + } } if(pCreateInfo->borderColor < VK_BORDER_COLOR_BEGIN_RANGE || pCreateInfo->borderColor > VK_BORDER_COLOR_END_RANGE) -- cgit v1.2.3