diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 5d481a9da90343b57fe5353fcdab8f45962da566..374103bf9d18c8ee2b217dc1eea3d3f69f197e76 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -2541,6 +2541,12 @@ static bool validate_shader_capabilities(layer_data *dev_data, shader_module con
                                               VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME);
                     break;
 
+                case spv::CapabilityShaderViewportIndexLayerNV:
+                case spv::CapabilityShaderViewportMaskNV:
+                    pass &= require_extension(report_data, dev_data->device_extensions.nv_viewport_array2_enabled,
+                                              VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME);
+                    break;
+
                 default:
                     // Spirv-validator should catch these errors
                     break;
@@ -3854,6 +3860,8 @@ static void checkDeviceRegisterExtensions(const VkDeviceCreateInfo *pCreateInfo,
     dev_data->device_extensions.khr_maintenance1_enabled = false;
     dev_data->device_extensions.nv_geometry_shader_passthrough_enabled = false;
     dev_data->device_extensions.nv_sample_mask_override_coverage_enabled = false;
+    dev_data->device_extensions.nv_viewport_array2_enabled = false;
+
 
     for (i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
@@ -3880,6 +3888,9 @@ static void checkDeviceRegisterExtensions(const VkDeviceCreateInfo *pCreateInfo,
         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME) == 0) {
             dev_data->device_extensions.nv_sample_mask_override_coverage_enabled = true;
         }
+        if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME) == 0) {
+            dev_data->device_extensions.nv_viewport_array2_enabled = true;
+        }
     }
 }
 
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index b8f261b70101434e2dc56d7ee9b4afb56c833582..1ab611cc6d984b834bbac8aeca291a953f697a9c 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -793,6 +793,7 @@ struct devExts {
     bool khr_maintenance1_enabled;
     bool nv_geometry_shader_passthrough_enabled;
     bool nv_sample_mask_override_coverage_enabled;
+    bool nv_viewport_array2_enabled;
     std::unordered_map<VkSwapchainKHR, std::unique_ptr<SWAPCHAIN_NODE>> swapchainMap;
     std::unordered_map<VkImage, VkSwapchainKHR> imageToSwapchainMap;
 };