diff options
| -rw-r--r-- | cube/cube.c | 6 | ||||
| -rw-r--r-- | cube/cube.cpp | 8 | ||||
| -rw-r--r-- | vulkaninfo/vulkaninfo.cpp | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/cube/cube.c b/cube/cube.c index 857056e3..6df37bf1 100644 --- a/cube/cube.c +++ b/cube/cube.c @@ -2841,11 +2841,9 @@ static void demo_run_directfb(struct demo *demo) { if (demo->pause) { demo->event_buffer->WaitForEvent(demo->event_buffer); - if (!demo->event_buffer->GetEvent(demo->event_buffer, DFB_EVENT(&event))) - demo_handle_directfb_event(demo, &event); + if (!demo->event_buffer->GetEvent(demo->event_buffer, DFB_EVENT(&event))) demo_handle_directfb_event(demo, &event); } else { - if (!demo->event_buffer->GetEvent(demo->event_buffer, DFB_EVENT(&event))) - demo_handle_directfb_event(demo, &event); + if (!demo->event_buffer->GetEvent(demo->event_buffer, DFB_EVENT(&event))) demo_handle_directfb_event(demo, &event); demo_draw(demo); demo->curFrame++; diff --git a/cube/cube.cpp b/cube/cube.cpp index a319b59a..e9f17757 100644 --- a/cube/cube.cpp +++ b/cube/cube.cpp @@ -2773,11 +2773,9 @@ void Demo::run_directfb() { if (pause) { event_buffer->WaitForEvent(event_buffer); - if (!event_buffer->GetEvent(event_buffer, DFB_EVENT(&event))) - handle_directfb_event(&event); + if (!event_buffer->GetEvent(event_buffer, DFB_EVENT(&event))) handle_directfb_event(&event); } else { - if (!event_buffer->GetEvent(event_buffer, DFB_EVENT(&event))) - handle_directfb_event(&event); + if (!event_buffer->GetEvent(event_buffer, DFB_EVENT(&event))) handle_directfb_event(&event); draw(); curFrame++; @@ -2808,7 +2806,7 @@ void Demo::create_directfb_window() { DFBSurfaceDescription desc; desc.flags = (DFBSurfaceDescriptionFlags)(DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT); desc.caps = DSCAPS_PRIMARY; - desc.width = -1; //width; + desc.width = width; desc.height = height; ret = dfb->CreateSurface(dfb, &desc, &window); if (ret) { diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index 2bed0694..56f12894 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -872,7 +872,7 @@ int main(int argc, char **argv) { auto phys_devices = instance.FindPhysicalDevices(); std::vector<std::unique_ptr<AppSurface>> surfaces; -#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ +#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ defined(VK_USE_PLATFORM_DIRECTFB_EXT) for (auto &surface_extension : instance.surface_extensions) { @@ -938,7 +938,7 @@ int main(int argc, char **argv) { DumpLayers(*p.get(), instance.global_layers, gpus); -#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ +#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ defined(VK_USE_PLATFORM_DIRECTFB_EXT) DumpPresentableSurfaces(*p.get(), instance, gpus, surfaces); @@ -955,7 +955,7 @@ int main(int argc, char **argv) { } } -#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ +#if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \ defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_WAYLAND_KHR) || \ defined(VK_USE_PLATFORM_DIRECTFB_EXT) |