From c29aaaf66c1f4c11e8b3e4decbe129626b5553f3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 26 Nov 2020 15:56:44 +0100 Subject: Add pugl::World constructor overload that takes a flag Eventually we'll need an actual smart flags type here, but for now there's only one flag anyway, so simply define an overload that takes one. --- bindings/cxx/include/pugl/pugl.hpp | 11 +++++++++-- examples/pugl_vulkan_cxx_demo.cpp | 3 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bindings/cxx/include/pugl/pugl.hpp b/bindings/cxx/include/pugl/pugl.hpp index dd7389e..9e391fa 100644 --- a/bindings/cxx/include/pugl/pugl.hpp +++ b/bindings/cxx/include/pugl/pugl.hpp @@ -281,14 +281,21 @@ public: ~World() = default; - explicit World(WorldType type, WorldFlags flags) + World(WorldType type, WorldFlag flag) + : Wrapper{puglNewWorld(static_cast(type), + static_cast(flag))} + { + PUGL_CHECK_CONSTRUCTION(cobj(), "Failed to create pugl::World"); + } + + World(WorldType type, WorldFlags flags) : Wrapper{puglNewWorld(static_cast(type), flags)} { PUGL_CHECK_CONSTRUCTION(cobj(), "Failed to create pugl::World"); } explicit World(WorldType type) - : World{type, {}} + : World{type, WorldFlags{}} {} /// @copydoc puglGetNativeWorld diff --git a/examples/pugl_vulkan_cxx_demo.cpp b/examples/pugl_vulkan_cxx_demo.cpp index 154bbaf..677750f 100644 --- a/examples/pugl_vulkan_cxx_demo.cpp +++ b/examples/pugl_vulkan_cxx_demo.cpp @@ -1438,8 +1438,7 @@ makeRects(const size_t numRects, const uint32_t windowWidth) PuglVulkanDemo::PuglVulkanDemo(const PuglTestOptions& o, const size_t numRects) : opts{o} - , world{pugl::WorldType::program, - static_cast(pugl::WorldFlag::threads)} // FIXME? + , world{pugl::WorldType::program, pugl::WorldFlag::threads} , loader{world} , view{world, *this} , rects{makeRects(numRects, extent.width)} -- cgit v1.2.1