AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/overay: fix violation of VUID-VkDeviceCreateInfo-pNext-00373

Browse Source 
We can't use VkDeviceCreateInfo::pEnabledFeatures when
VkPhysicalDeviceFeatures2 is present in pNext chain.

Fixes: ea7a6fa980 ("vulkan/overlay: add pipeline statistic & timestamps support")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8208>
This commit is contained in:
Pavel Asyutchenko
2020-12-23 00:05:54 +03:00
committed by Marge Bot
parent 14e6f541b1
commit 2085381432
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/overlay-layer/overlay.cpp
+21 -8
View File
@@ -2470,18 +2470,31 @@ static VkResult overlay_CreateDevice(
chain_info->u.pLayerInfo = chain_info->u.pLayerInfo->pNext;
VkPhysicalDeviceFeatures device_features = {};
VkDeviceCreateInfo device_info = *pCreateInfo;
VkPhysicalDeviceFeatures *device_features_ptr = NULL;
if (pCreateInfo->pEnabledFeatures)
device_features = *(pCreateInfo->pEnabledFeatures);
if (instance_data->pipeline_statistics_enabled) {
device_features.inheritedQueries = true;
device_features.pipelineStatisticsQuery = true;
VkDeviceCreateInfo *device_info = (VkDeviceCreateInfo *)
clone_chain((const struct VkBaseInStructure *)pCreateInfo);
VkPhysicalDeviceFeatures2 *device_features2 = (VkPhysicalDeviceFeatures2 *)
vk_find_struct(device_info, PHYSICAL_DEVICE_FEATURES_2);
if (device_features2) {
/* Can't use device_info->pEnabledFeatures when VkPhysicalDeviceFeatures2 is present */
device_features_ptr = &device_features2->features;
} else {
if (device_info->pEnabledFeatures)
device_features = *(device_info->pEnabledFeatures);
device_features_ptr = &device_features;
device_info->pEnabledFeatures = &device_features;
}
if (instance_data->pipeline_statistics_enabled) {
device_features_ptr->inheritedQueries = true;
device_features_ptr->pipelineStatisticsQuery = true;
}
device_info.pEnabledFeatures = &device_features;
VkResult result = fpCreateDevice(physicalDevice, &device_info, pAllocator, pDevice);
VkResult result = fpCreateDevice(physicalDevice, device_info, pAllocator, pDevice);
free_chain((struct VkBaseOutStructure *)device_info);
if (result != VK_SUCCESS) return result;
struct device_data *device_data = new_device_data(*pDevice, instance_data);
src/vulkan/util/gen_enum_to_str.py
+3
View File
@@ -60,6 +60,7 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
#include <string.h>
#include <vulkan/vulkan.h>
#include <vulkan/vk_android_native_buffer.h>
#include <vulkan/vk_layer.h>
#include "util/macros.h"
#include "vk_enum_to_str.h"
@@ -98,6 +99,8 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
case ${struct.stype}: return sizeof(${struct.name});
% endif
%endfor
case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: return sizeof(VkLayerInstanceCreateInfo);
case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: return sizeof(VkLayerDeviceCreateInfo);
default:
unreachable("Undefined struct type.");
}