wip

5 files changed, 234 insertions, 0 deletions

diff --git a/modules/window-vulkan/.nix/derivation.nix b/modules/window-vulkan/.nix/derivation.nix
new file mode 100644
index 0000000..086e200
--- /dev/null
+++ b/modules/window-vulkan/.nix/derivation.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, scons
+, clang-tools
+, version
+, forstio
+, xorg
+}:
+
+let
+
+in stdenv.mkDerivation {
+  pname = "forstio-window-vulkan";
+  inherit version;
+  src = ./..;
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    scons
+    clang-tools
+  ];
+
+  buildInputs = [
+    forstio.core
+    forstio.async
+    forstio.io
+		forstio.codec
+		forstio.window
+    xorg.libX11
+    xorg.libxcb
+ ];
+ 
+  doCheck = false;
+  checkPhase = ''
+    scons test
+    ./bin/tests
+  '';
+
+  outputs = ["out" "dev"];
+}
diff --git a/modules/window-vulkan/SConstruct b/modules/window-vulkan/SConstruct
new file mode 100644
index 0000000..5bc2d58
--- /dev/null
+++ b/modules/window-vulkan/SConstruct
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+
+import sys
+import os
+import os.path
+import glob
+import re
+
+
+if sys.version_info < (3,):
+    def isbasestring(s):
+        return isinstance(s,basestring)
+else:
+    def isbasestring(s):
+        return isinstance(s, (str,bytes))
+
+def add_kel_source_files(self, sources, filetype, lib_env=None, shared=False, target_post=""):
+
+    if isbasestring(filetype):
+        dir_path = self.Dir('.').abspath
+        filetype = sorted(glob.glob(dir_path+"/"+filetype))
+
+    for path in filetype:
+        target_name = re.sub( r'(.*?)(\.cpp|\.c\+\+)', r'\1' + target_post, path )
+        if shared:
+            target_name+='.os'
+            sources.append( self.SharedObject( target=target_name, source=path ) )
+        else:
+            target_name+='.o'
+            sources.append( self.StaticObject( target=target_name, source=path ) )
+    pass
+
+def isAbsolutePath(key, dirname, env):
+	assert os.path.isabs(dirname), "%r must have absolute path syntax" % (key,)
+
+env_vars = Variables(
+	args=ARGUMENTS
+)
+
+env_vars.Add('prefix',
+	help='Installation target location of build results and headers',
+	default='/usr/local/',
+	validator=isAbsolutePath
+)
+
+env_vars.Add(
+    BoolVariable('build_examples',
+        help='Build examples',
+        default=True
+    )
+);
+
+
+env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
+    CPPDEFINES=['SAW_UNIX', 'SAW_UNIX_XCB'],
+    CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
+    LIBS=[
+         'forstio-core'
+        ,'forstio-io'
+        ,'forstio-async'
+        ,'forstio-codec'
+        ,'forstio-window'
+        ,'libX11'
+        ,'libxcb'
+        ,'libX11-xcb'
+    ]
+);
+
+env.__class__.add_source_files = add_kel_source_files
+env.Tool('compilation_db');
+env.cdb = env.CompilationDatabase('compile_commands.json');
+
+env.objects = [];
+env.sources = [];
+env.headers = [];
+env.targets = [];
+
+Export('env')
+SConscript('c++/SConscript')
+SConscript('examples/SConscript')
+
+env.Alias('cdb', env.cdb);
+env.Alias('all', [env.targets]);
+env.Default('all');
+
+env.Alias('install', '$prefix')
diff --git a/modules/window-vulkan/c++/SConscript b/modules/window-vulkan/c++/SConscript
new file mode 100644
index 0000000..0147ff5
--- /dev/null
+++ b/modules/window-vulkan/c++/SConscript
@@ -0,0 +1,38 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+window_env = env.Clone();
+
+window_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+window_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
+
+env.sources += window_env.sources;
+env.headers += window_env.headers;
+
+## Shared lib
+objects_shared = []
+window_env.add_source_files(objects_shared, window_env.sources, shared=True);
+env.library_shared = window_env.SharedLibrary('#build/forstio-window', [objects_shared]);
+
+## Static lib
+objects_static = []
+window_env.add_source_files(objects_static, window_env.sources, shared=False);
+env.library_static = window_env.StaticLibrary('#build/forstio-window', [objects_static]);
+
+# Set Alias
+env.Alias('library_window', [env.library_shared, env.library_static]);
+
+env.targets += ['library_window'];
+
+# Install
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
+env.Install('$prefix/include/forstio/window/', [window_env.headers]);
diff --git a/modules/window-vulkan/examples/SConscript b/modules/window-vulkan/examples/SConscript
new file mode 100644
index 0000000..e64eb92
--- /dev/null
+++ b/modules/window-vulkan/examples/SConscript
@@ -0,0 +1,35 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+examples_env = env.Clone();
+
+
+examples_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+examples_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
+
+env.sources += examples_env.sources;
+env.headers += examples_env.headers;
+
+ex_objects = [];
+# examples_env.add_source_files(ex_objects, ['window_create_kernel.cpp'], shared=True);
+
+objects_static = []
+examples_env.window_create = examples_env.Program('#bin/window_create', ['window_create.cpp', env.library_static]);
+
+# Set Alias
+env.examples = [examples_env.window_create];
+env.Alias('examples', env.examples);
+
+if env["build_examples"]:
+	env.targets += ['examples'];
+	env.Install('$prefix/bin/', env.examples);
+#endif
diff --git a/modules/window-vulkan/examples/window_create.cpp b/modules/window-vulkan/examples/window_create.cpp
new file mode 100644
index 0000000..a5a2ae4
--- /dev/null
+++ b/modules/window-vulkan/examples/window_create.cpp
@@ -0,0 +1,34 @@
+#include <forstio/io/io.hpp>
+
+#include <iostream>
+
+int main(){
+	auto eo_aio = saw::setup_async_io();
+	if(eo_aio.is_error()){
+		auto& err = eo_aio.get_error();
+		std::cerr<<"Error: "<<err.get_category();
+
+		auto err_msg = err.get_message();
+		if(err_msg.size() > 0u){
+			std::cerr<<" - "<<err_msg;
+		}
+
+		std::cerr<<std::endl;
+		return err.get_id();
+	}
+	auto& aio = eo_aio.get_value();
+	saw::wait_scope wait{aio.event_loop};
+
+	bool running = true;
+
+	aio.event_port.on_signal(saw::Signal::Terminate).then([&running](){
+		running = false;
+	}).detach();
+	
+	while(running){
+		device->flush();
+		wait.wait(std::chrono::seconds{1u});
+	}
+
+	return 0;
+}