nerdcruft/libcruft-vk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: transition from experimental filesystem

Browse Source
This commit is contained in:
Danny Robson 2018-12-05 19:12:03 +11:00
parent dff63c6178
commit 96c1c53071
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icd/vendor.hpp
View File

@ -5,7 +5,7 @@
#include <cruft/util/library.hpp> #include <cruft/util/library.hpp>
#include <string> #include <string>
#include <experimental/filesystem> #include <filesystem>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -13,7 +13,7 @@ namespace cruft::vk::icd {
struct icd_t { struct icd_t {
std::string file_format_version; std::string file_format_version;
struct { struct {
std::experimental::filesystem::path library_path; std::filesystem::path library_path;
std::string api_version; std::string api_version;
} icd; } icd;
}; };

2
icd/vendor_posix.cpp
View File

@ -8,7 +8,7 @@
#include <wordexp.h> #include <wordexp.h>
namespace fs = std::experimental::filesystem; namespace fs = std::filesystem;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

8
shader_module.cpp
View File

@ -19,7 +19,7 @@ using cruft::vk::shader_module;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
struct cruft::vk::shader_module::cookie : public create_t { struct cruft::vk::shader_module::cookie : public create_t {
public: public:
cookie (const std::experimental::filesystem::path &src): cookie (std::filesystem::path const &src):
create_t {}, create_t {},
m_bytes (cruft::slurp<uint32_t> (src)) m_bytes (cruft::slurp<uint32_t> (src))
{ {
@ -36,8 +36,10 @@ private:
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
shader_module::shader_module (device &owner, shader_module::shader_module (
const std::experimental::filesystem::path &src): device &owner,
std::filesystem::path const &src
):
shader_module (owner, cookie (src)) shader_module (owner, cookie (src))
{ ; } { ; }

4
shader_module.hpp
View File

@ -13,14 +13,14 @@
#include "./object.hpp" #include "./object.hpp"
#include "./fwd.hpp" #include "./fwd.hpp"
#include <experimental/filesystem> #include <filesystem>
namespace cruft::vk { namespace cruft::vk {
struct shader_module : public owned<shader_module,device> { struct shader_module : public owned<shader_module,device> {
using create_t = create_info_t<native_type>; using create_t = create_info_t<native_type>;
shader_module (device&, const std::experimental::filesystem::path &src); shader_module (device&, const std::filesystem::path &src);
private: private:
// used as a convenience to allow taking address of a temporary // used as a convenience to allow taking address of a temporary

2
tools/hello.cpp
View File

@ -29,7 +29,7 @@
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#include <iostream> #include <iostream>
#include <experimental/filesystem> #include <filesystem>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////