From 4da101e9745de2a822934de4fb54224b57b2de16 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Wed, 6 Dec 2017 13:31:29 -0700 Subject: layers: VS2013 compatibility Remove all usages of constexpr to restore compatibility with Visual Studio 2013. Also make a handful of other minor edits where the VS2013 compiler was reporting errors. Change-Id: I3c426bea460a4a902ab306b01deb1d76d60f5fa2 --- layers/parameter_validation_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layers/parameter_validation_utils.cpp') diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp index 1efb0c80..b299b02e 100644 --- a/layers/parameter_validation_utils.cpp +++ b/layers/parameter_validation_utils.cpp @@ -1170,11 +1170,11 @@ bool pv_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache "is VK_FALSE, pCreateInfos[%d].pMultisampleState must not be NULL. %s", i, i, validation_error_map[VALIDATION_ERROR_096005de]); } else { - constexpr const VkStructureType valid_next_stypes[] = { + const VkStructureType valid_next_stypes[] = { LvlTypeMap::kSType, LvlTypeMap::kSType, LvlTypeMap::kSType}; - constexpr const char *valid_struct_names = + const char *valid_struct_names = "VkPipelineCoverageModulationStateCreateInfoNV, " "VkPipelineCoverageToColorStateCreateInfoNV, " "VkPipelineSampleLocationsStateCreateInfoEXT"; -- cgit v1.2.3