Fixed some compiler warnings and obvious errors
This commit is contained in:
parent
583e61ac35
commit
b0376aea5e
1 changed files with 5 additions and 6 deletions
|
|
@ -877,10 +877,10 @@ bool VulkanExampleBase::initVulkan()
|
||||||
std::cout << "Available Vulkan devices" << std::endl;
|
std::cout << "Available Vulkan devices" << std::endl;
|
||||||
std::vector<VkPhysicalDevice> devices(gpuCount);
|
std::vector<VkPhysicalDevice> devices(gpuCount);
|
||||||
VK_CHECK_RESULT(vkEnumeratePhysicalDevices(instance, &gpuCount, devices.data()));
|
VK_CHECK_RESULT(vkEnumeratePhysicalDevices(instance, &gpuCount, devices.data()));
|
||||||
for (uint32_t i = 0; i < gpuCount; i++) {
|
for (uint32_t j = 0; j < gpuCount; j++) {
|
||||||
VkPhysicalDeviceProperties deviceProperties;
|
VkPhysicalDeviceProperties deviceProperties;
|
||||||
vkGetPhysicalDeviceProperties(devices[i], &deviceProperties);
|
vkGetPhysicalDeviceProperties(devices[j], &deviceProperties);
|
||||||
std::cout << "Device [" << i << "] : " << deviceProperties.deviceName << std::endl;
|
std::cout << "Device [" << j << "] : " << deviceProperties.deviceName << std::endl;
|
||||||
std::cout << " Type: " << vks::tools::physicalDeviceTypeString(deviceProperties.deviceType) << 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 << " API: " << (deviceProperties.apiVersion >> 22) << "." << ((deviceProperties.apiVersion >> 12) & 0x3ff) << "." << (deviceProperties.apiVersion & 0xfff) << std::endl;
|
||||||
}
|
}
|
||||||
|
|
@ -1077,7 +1077,6 @@ HWND VulkanExampleBase::setupWindow(HINSTANCE hinstance, WNDPROC wndproc)
|
||||||
printf("Could not create window!\n");
|
printf("Could not create window!\n");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
exit(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowWindow(window, SW_SHOW);
|
ShowWindow(window, SW_SHOW);
|
||||||
|
|
@ -1115,7 +1114,7 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (camera.firstperson)
|
if (camera.type == Camera::firstperson)
|
||||||
{
|
{
|
||||||
switch (wParam)
|
switch (wParam)
|
||||||
{
|
{
|
||||||
|
|
@ -1137,7 +1136,7 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||||
keyPressed((uint32_t)wParam);
|
keyPressed((uint32_t)wParam);
|
||||||
break;
|
break;
|
||||||
case WM_KEYUP:
|
case WM_KEYUP:
|
||||||
if (camera.firstperson)
|
if (camera.type == Camera::firstperson)
|
||||||
{
|
{
|
||||||
switch (wParam)
|
switch (wParam)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue