ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Vk: print also driver info in Device creation log. 

Just the device alone isn't enough if we can have multiple drivers for
it.
pull/539/head
Vladimír Vondruš 4 years ago
parent
9318331b32
commit
c366874c56
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Magnum/Vk/Device.cpp
  2. 30
      src/Magnum/Vk/Test/DeviceVkTest.cpp

4
src/Magnum/Vk/Device.cpp
Unescape View File

@ -749,8 +749,8 @@ Result Device::tryCreateInternal(Instance& instance, const DeviceCreateInfo& inf
devices that *don't* advertise the extension) are not listed here but
are added to Device::enabledFeatures() below. */
if(!info._state->quietLog) {
Debug{} << "Device:" << _properties->name();
Debug{} << "Device version:" << version;
Debug{} << "Device:" << _properties->name() << Debug::nospace << "," << version;
Debug{} << "Device driver:" << _properties->driverName() << Debug::nospace << "," << _properties->driverInfo();
if(info->enabledExtensionCount) {
Debug{} << "Enabled device extensions:";

30
src/Magnum/Vk/Test/DeviceVkTest.cpp
Unescape View File

@ -117,8 +117,8 @@ struct {
Containers::array({"",
"--magnum-enable-extensions", "VK_EXT_debug_marker VK_KHR_maintenance1"}),
true, true, true,
"Device: {}\n"
"Device version: Vulkan {}.{}{}\n"
"Device: {}, Vulkan {}.{}{}\n"
"Device driver: {}, {}\n"
"Enabled device extensions:\n"
" VK_EXT_debug_marker\n"
" VK_KHR_maintenance1\n"},
@ -129,8 +129,8 @@ struct {
"--magnum-vulkan-version", "1.0",
"--magnum-enable-extensions", "VK_EXT_debug_marker VK_KHR_maintenance1"}),
false, true, true,
"Device: {}\n"
"Device version: Vulkan 1.0\n"
"Device: {}, Vulkan 1.0\n"
"Device driver: {4}, {5}\n"
"Enabled device extensions:\n"
" VK_EXT_debug_marker\n"
" VK_KHR_maintenance1\n"},
@ -140,8 +140,8 @@ struct {
Containers::array({"",
"--magnum-enable-extensions", "VK_KHR_maintenance1"}),
true, false, true,
"Device: {}\n"
"Device version: Vulkan {}.{}{}\n"
"Device: {}, Vulkan {}.{}{}\n"
"Device driver: {}, {}\n"
"Enabled device extensions:\n"
" VK_KHR_maintenance1\n"},
{"disabled extensions", "",
@ -149,8 +149,8 @@ struct {
"--magnum-disable-extensions", "VK_EXT_debug_marker VK_KHR_maintenance1"}),
nullptr,
true, false, false,
"Device: {}\n"
"Device version: Vulkan {}.{}{}\n"},
"Device: {}, Vulkan {}.{}{}\n"
"Device driver: {}, {}\n"},
};
struct {
@ -160,8 +160,8 @@ struct {
const char* log;
} ConstructWorkaroundsCommandLineData[] {
{"default", false, nullptr,
"Device: {}\n"
"Device version: Vulkan {}.{}{}\n"
"Device: {}, Vulkan {}.{}{}\n"
"Device driver: {}, {}\n"
"Using device driver workarounds:\n"
" swiftshader-image-copy-extent-instead-of-layers\n"
" swiftshader-spirv-multi-entrypoint-conflicting-locations\n"},
@ -173,8 +173,8 @@ struct {
{"disabled workarounds", true,
Containers::array({"",
"--magnum-disable-workarounds", "swiftshader-image-copy-extent-instead-of-layers swiftshader-spirv-multi-entrypoint-conflicting-locations"}),
"Device: {}\n"
"Device version: Vulkan {}.{}{}\n"}
"Device: {}, Vulkan {}.{}{}\n"
"Device driver: {}, {}\n"}
};
DeviceVkTest::DeviceVkTest(): VulkanTester{NoCreate} {
@ -781,7 +781,7 @@ void DeviceVkTest::constructExtensionsCommandLineDisable() {
UnsignedInt minor = versionMinor(deviceProperties.version());
UnsignedInt patch = versionPatch(deviceProperties.version());
/* SwiftShader reports just 1.1 with no patch version, special-case that */
std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "");
std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo());
/* The output might contain a device workaround list, cut that away.
That's tested thoroughly in constructWorkaroundsCommandLineDisable(). */
CORRADE_COMPARE(out.str().substr(0, expected.size()), expected);
@ -838,7 +838,7 @@ void DeviceVkTest::constructExtensionsCommandLineEnable() {
UnsignedInt minor = versionMinor(deviceProperties.version());
UnsignedInt patch = versionPatch(deviceProperties.version());
/* SwiftShader reports just 1.1 with no patch version, special-case that */
std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "");
std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo());
/* The output might contain a device workaround list, cut that away.
That's tested thoroughly in constructWorkaroundsCommandLineDisable(). */
CORRADE_COMPARE(out.str().substr(0, expected.size()), expected);
@ -878,7 +878,7 @@ void DeviceVkTest::constructWorkaroundsCommandLineDisable() {
UnsignedInt minor = versionMinor(deviceProperties.version());
UnsignedInt patch = versionPatch(deviceProperties.version());
/* SwiftShader reports just 1.1 with no patch version, special-case that */
CORRADE_COMPARE(out.str(), Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : ""));
CORRADE_COMPARE(out.str(), Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo()));
}
void DeviceVkTest::constructMultipleQueues() {

Write Preview
Loading…
Cancel
Save