claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged #729

Browse source
This commit is contained in:
Sascha Willems 2020-08-23 18:05:39 +02:00
parent 8f88155a72
commit d32663d569
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
base/vulkanexamplebase.cpp
View file

@ -617,7 +617,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
std::string msg = "Could not locate asset path in \"" + getAssetPath() + "\" !";
MessageBox(NULL, msg.c_str(), "Fatal error", MB_OK | MB_ICONERROR);
#else
std::cerr << "Error: Could not find asset path in " << getAssetPath() << std::endl;
std::cerr << "Error: Could not find asset path in " << getAssetPath() << "\n";
#endif
exit(-1);
}
@ -671,7 +671,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
if (numConvPtr != args[i + 1]) {
benchmark.warmup = num;
} else {
std::cerr << "Warmup time for benchmark mode must be specified as a number!" << std::endl;
std::cerr << "Warmup time for benchmark mode must be specified as a number!" << "\n";
}
}
}
@ -683,7 +683,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
benchmark.duration = num;
}
else {
std::cerr << "Benchmark run duration must be specified as a number!" << std::endl;
std::cerr << "Benchmark run duration must be specified as a number!" << "\n";
}
}
}
@ -691,7 +691,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
if ((args[i] == std::string("-bf")) || (args[i] == std::string("--benchfilename"))) {
if (args.size() > i + 1) {
if (args[i + 1][0] == '-') {
std::cerr << "Filename for benchmark results must not start with a hyphen!" << std::endl;
std::cerr << "Filename for benchmark results must not start with a hyphen!" << "\n";
} else {
benchmark.filename = args[i + 1];
}
@ -852,11 +852,11 @@ bool VulkanExampleBase::initVulkan()
{
if (index > gpuCount - 1)
{
std::cerr << "Selected device index " << index << " is out of range, reverting to device 0 (use -listgpus to show available Vulkan devices)" << std::endl;
std::cerr << "Selected device index " << index << " is out of range, reverting to device 0 (use -listgpus to show available Vulkan devices)" << "\n";
}
else
{
std::cout << "Selected Vulkan device " << index << std::endl;
std::cout << "Selected Vulkan device " << index << "\n";
selectedDevice = index;
}
};
@ -869,20 +869,20 @@ bool VulkanExampleBase::initVulkan()
VK_CHECK_RESULT(vkEnumeratePhysicalDevices(instance, &gpuCount, nullptr));
if (gpuCount == 0)
{
std::cerr << "No Vulkan devices found!" << std::endl;
std::cerr << "No Vulkan devices found!" << "\n";
}
else
{
// Enumerate devices
std::cout << "Available Vulkan devices" << std::endl;
std::cout << "Available Vulkan devices" << "\n";
std::vector<VkPhysicalDevice> devices(gpuCount);
VK_CHECK_RESULT(vkEnumeratePhysicalDevices(instance, &gpuCount, devices.data()));
for (uint32_t j = 0; j < gpuCount; j++) {
VkPhysicalDeviceProperties deviceProperties;
vkGetPhysicalDeviceProperties(devices[j], &deviceProperties);
std::cout << "Device [" << j << "] : " << deviceProperties.deviceName << std::endl;
std::cout << " Type: " << vks::tools::physicalDeviceTypeString(deviceProperties.deviceType) << std::endl;
std::cout << " API: " << (deviceProperties.apiVersion >> 22) << "." << ((deviceProperties.apiVersion >> 12) & 0x3ff) << "." << (deviceProperties.apiVersion & 0xfff) << std::endl;
std::cout << " Type: " << vks::tools::physicalDeviceTypeString(deviceProperties.deviceType) << "\n";
std::cout << " API: " << (deviceProperties.apiVersion >> 22) << "." << ((deviceProperties.apiVersion >> 12) & 0x3ff) << "." << (deviceProperties.apiVersion & 0xfff) << "\n";
}
}
}