Skip to content

Require Vulkan 1.1 or newer when using subgroup size control #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulthomson merged 2 commits into from
Aug 18, 2020
Merged

Require Vulkan 1.1 or newer when using subgroup size control #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2b7e0
Require Vulkan 1.1 or newer when using subgroup size control
Aug 17, 2020
b160580
Removed unused parameter.
Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions src/vulkan/device.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ Result Device::Initialize(
PFN_vkGetInstanceProcAddr getInstanceProcAddr,
Delegate* delegate,
const std::vector<std::string>& required_features,
const std::vector<std::string>& required_instance_extensions,
const std::vector<std::string>& required_device_extensions,
const VkPhysicalDeviceFeatures& available_features,
const VkPhysicalDeviceFeatures2KHR& available_features2,
Expand Down Expand Up @@ -645,37 +644,18 @@ Result Device::Initialize(
kSubgroupSizeControl) != required_features.end();

if (needs_subgroup_size_control) {
VkPhysicalDeviceProperties2KHR properties2 = {};
properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
VkPhysicalDeviceProperties2 properties2 = {};
properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
properties2.pNext = &subgroup_size_control_properties_;
subgroup_size_control_properties_.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT;

if (SupportsApiVersion(1, 1, 0)) {
// Use vkGetPhysicalDeviceProperties2 available starting Vulkan
// version 1.1.
ptrs_.vkGetPhysicalDeviceProperties2(physical_device_, &properties2);
} else {
// Vulkan 1.0: search for the VK_KHR_get_physical_device_properties2
// extension and use that for filling the properties2 structure.
bool extension_found = false;
for (auto& ext : required_instance_extensions) {
if (ext == "VK_KHR_get_physical_device_properties2")
extension_found = true;
}
if (!extension_found) {
return Result(
"Vulkan: Device::Initialize subgroup size control feature also "
"requires VK_KHR_get_physical_device_properties2 or an API version "
"of 1.1 or higher");
}
PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR =
reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2KHR>(
getInstanceProcAddr(instance_,
"vkGetPhysicalDeviceProperties2KHR"));

vkGetPhysicalDeviceProperties2KHR(physical_device_, &properties2);
if (!SupportsApiVersion(1, 1, 0)) {
return Result(
"Vulkan: Device::Initialize subgroup size control feature also "
"requires an API version of 1.1 or higher");
}
ptrs_.vkGetPhysicalDeviceProperties2(physical_device_, &properties2);
}

return {};
Expand Down
16 changes: 7 additions & 9 deletions src/vulkan/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ class Device {
VkQueue queue);
virtual ~Device();

Result Initialize(
PFN_vkGetInstanceProcAddr getInstanceProcAddr,
Delegate* delegate,
const std::vector<std::string>& required_features,
const std::vector<std::string>& required_instance_extensions,
const std::vector<std::string>& required_device_extensions,
const VkPhysicalDeviceFeatures& available_features,
const VkPhysicalDeviceFeatures2KHR& available_features2,
const std::vector<std::string>& available_extensions);
Result Initialize(PFN_vkGetInstanceProcAddr getInstanceProcAddr,
Delegate* delegate,
const std::vector<std::string>& required_features,
const std::vector<std::string>& required_device_extensions,
const VkPhysicalDeviceFeatures& available_features,
const VkPhysicalDeviceFeatures2KHR& available_features2,
const std::vector<std::string>& available_extensions);

/// Returns true if |format| and the |buffer|s buffer type combination is
/// supported by the physical device.
Expand Down
6 changes: 3 additions & 3 deletions src/vulkan/engine_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ Result EngineVulkan::Initialize(
vk_config->queue);

Result r = device_->Initialize(
vk_config->vkGetInstanceProcAddr, delegate, features, instance_extensions,
device_extensions, vk_config->available_features,
vk_config->available_features2, vk_config->available_device_extensions);
vk_config->vkGetInstanceProcAddr, delegate, features, device_extensions,
vk_config->available_features, vk_config->available_features2,
vk_config->available_device_extensions);
if (!r.IsSuccess())
return r;

Expand Down