Skip to content

S
swiftshader
Commit c9b56017 by Sean Risser Committed by swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com
Options

Expose Vulkan 1.2 support

Also update the unittests to expect version 1.2. Bug: b/147825369 Tests: dEQP-VK.* Change-Id: Ib3bb07662140fa976ec2532124ab2d7337f34c55 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/47348Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarSean Risser <srisser@google.com> Commit-Queue: Sean Risser <srisser@google.com>
parent a2fe8e1b
Showing with 4 additions and 4 deletions
src/Vulkan/VkConfig.hpp
......@@ -31,7 +31,7 @@ const spv_target_env SPIRV_VERSION = SPV_ENV_VULKAN_1_2;
enum
{
API_VERSION = VK_API_VERSION_1_1,
API_VERSION = VK_API_VERSION_1_2,
DRIVER_VERSION = VK_MAKE_VERSION(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION),
VENDOR_ID = 0x1AE0, // Google, Inc.: https://pcisig.com/google-inc-1
DEVICE_ID = 0xC0DE, // SwiftShader (placeholder)
......
tests/VulkanUnitTests/BasicTests.cpp
......@@ -62,8 +62,9 @@ TEST_F(BasicTest, ICD_Check)
TEST_F(BasicTest, Version)
{
uint32_t apiVersion = 0;
uint32_t expectedVersion = static_cast<uint32_t>(VK_API_VERSION_1_2);
VkResult result = driver.vkEnumerateInstanceVersion(&apiVersion);
EXPECT_EQ(apiVersion, (uint32_t)VK_API_VERSION_1_1);
EXPECT_EQ(apiVersion, expectedVersion);
const VkInstanceCreateInfo createInfo = {
VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, // sType
......@@ -93,7 +94,7 @@ TEST_F(BasicTest, Version)
VkPhysicalDeviceProperties physicalDeviceProperties;
driver.vkGetPhysicalDeviceProperties(pPhysicalDevice, &physicalDeviceProperties);
EXPECT_EQ(physicalDeviceProperties.apiVersion, (uint32_t)VK_API_VERSION_1_1);
EXPECT_EQ(physicalDeviceProperties.apiVersion, expectedVersion);
EXPECT_EQ(physicalDeviceProperties.deviceID, 0xC0DEU);
EXPECT_EQ(physicalDeviceProperties.deviceType, VK_PHYSICAL_DEVICE_TYPE_CPU);
......@@ -116,7 +117,6 @@ TEST_F(BasicTest, UnsupportedDeviceExtension_DISABLED)
{
uint32_t apiVersion = 0;
VkResult result = driver.vkEnumerateInstanceVersion(&apiVersion);
EXPECT_EQ(apiVersion, (uint32_t)VK_API_VERSION_1_1);
const VkInstanceCreateInfo createInfo = {
VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, // sType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment