Version 0.2.0

- Convert code to C++.
- Use Cap'n Proto to send the data over the network.

Author: feserr

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.1.0[{build}]
+version: 0.2.0[{build}]
 
 clone_depth: 1
 
@@ -9,32 +9,40 @@ branches:
 
 cache:
   - c:\usr
+  - c:\tools\vcpkg\installed\
 
-image: Visual Studio 2019
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+configuration:
+  - Debug
+  - Release
 
 environment:
   VULKAN_SDK: C:\VulkanSDK\1.2.135.0
   matrix:
-    - CMAKE_VS_VERSION: "16 2019"
+    - CMAKE_VS_VERSION: "15 2017"
 
 install:
   - curl -L --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.2.135.0/windows/VulkanSDK-1.2.135.0-Installer.exe?Human=true
   - .\VulkanSDK.exe /S
   - appveyor DownloadFile https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-windows-x64-Release.zip -FileName glslangvalidator.zip
   - unzip glslangvalidator.zip
   - set PATH=%APPVEYOR_BUILD_FOLDER%\bin;%PATH%
-
-platform:
-  - x86
-  - x64
-configuration:
-  - Debug
-  - Release
+  - cd C:\Tools\vcpkg
+  - git pull
+  - .\bootstrap-vcpkg.bat
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - vcpkg --disable-metrics install capnproto:%platform%-windows
+  - cd C:\Tools\vcpkg
+  - vcpkg --disable-metrics integrate install
+  - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
   - git submodule -q update --init --recursive
-
-  - cmake -DSTANDALONE=ON -DCMAKE_BUILD_TYPE=%configuration% -G "Visual Studio %CMAKE_VS_VERSION%"
+  - cmake -DCMAKE_PREFIX_PATH=C:/Tools/vcpkg/packages/capnproto_%platform%-windows/ -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -A x64 -DSTANDALONE=ON -DCMAKE_BUILD_TYPE=%configuration% -G "Visual Studio %CMAKE_VS_VERSION%"
 
 build_script:
   project: ALL_BUILD.vcxproj

.gitignore

@@ -251,6 +251,9 @@ xcuserdata
 
 # Unix
 
+# Virtual env
+venv/
+
 # IDEs
 .vscode/
 

.travis.yml

@@ -17,11 +17,13 @@ addons:
       - git-lfs
       - doxygen
       - ninja
+      - capnp
 
 env:
   global:
     - CTEST_EXT_COLOR_OUTPUT=TRUE
     - CTEST_BUILD_FLAGS=-j4
+    - CAPNPROTO_VERSION="0.8.0"
 
 matrix:
   include:
@@ -31,21 +33,25 @@ matrix:
       env:
         - MATRIX_EVAL="CC=gcc && CXX=g++"
         - VULKAN_SDK_VER="1.2.135"
+        - PATH="$PATH:$HOME/capnproto/bin"
+        - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/capnproto/lib"
 
     - os: linux
       name: Ubuntu Bionic clang
       dist: bionic
       env:
         - MATRIX_EVAL="CC=clang && CXX=clang++"
         - VULKAN_SDK_VER="1.2.135"
+        - PATH="$PATH:$HOME/capnproto/bin"
+        - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/capnproto/lib"
 
     - os: osx
       name: OSX xcode11.2 gcc
       osx_image: xcode11.2
       env:
         - MATRIX_EVAL="CC=gcc && CXX=g++"
         - VULKAN_SDK_VER="1.2.135.0"
-        - VULKAN_INSTALL_DIR="$HOME/build/vulkansdk-macos-$VULKAN_SDK_VER"
+        - VULKAN_INSTALL_DIR="$HOME/build/vulkansdk-macos-${VULKAN_SDK_VER}"
         - VULKAN_SDK="$VULKAN_INSTALL_DIR/macOS"
 
     - os: osx
@@ -54,7 +60,7 @@ matrix:
       env:
         - MATRIX_EVAL="CC=clang && CXX=clang++"
         - VULKAN_SDK_VER="1.2.135.0"
-        - VULKAN_INSTALL_DIR="$HOME/build/vulkansdk-macos-$VULKAN_SDK_VER"
+        - VULKAN_INSTALL_DIR="$HOME/build/vulkansdk-macos-${VULKAN_SDK_VER}"
         - VULKAN_SDK="$VULKAN_INSTALL_DIR/macOS"
 
 before_install:
@@ -64,17 +70,24 @@ install:
   - |
     case "${TRAVIS_OS_NAME:-linux}" in
     linux)
-      # No need to install git-lfs. It is part of Travis's Xenial environment.
       wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - &&
-      sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VER-xenial.list http://packages.lunarg.com/vulkan/$VULKAN_SDK_VER/lunarg-vulkan-$VULKAN_SDK_VER-xenial.list &&
+      sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-${VULKAN_SDK_VER}-bionic.list http://packages.lunarg.com/vulkan/${VULKAN_SDK_VER}/lunarg-vulkan-${VULKAN_SDK_VER}-bionic.list &&
       sudo apt update &&
-      sudo apt install lunarg-vulkan-sdk
+      sudo apt install vulkan-sdk &&
+      curl -O https://capnproto.org/capnproto-c++-${CAPNPROTO_VERSION}.tar.gz &&
+      tar zxf capnproto-c++-${CAPNPROTO_VERSION}.tar.gz &&
+      cd capnproto-c++-${CAPNPROTO_VERSION} &&
+      ./configure --prefix=$HOME/capnproto &&
+      make -j3 &&
+      make install &&
+      LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/capnproto/lib &&
+      cd ../
       ;;
     osx)
       # Current directory is .../build/{KhronosGroup,msc-}/KTX-Software. cd to 'build'.
       pushd ../.. &&
-      wget -O vulkansdk-macos-$VULKAN_SDK_VER.tar.gz https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/mac/vulkansdk-macos-$VULKAN_SDK_VER.tar.gz?Human=true &&
-      tar -xzf vulkansdk-macos-$VULKAN_SDK_VER.tar.gz &&
+      wget -O vulkansdk-macos-${VULKAN_SDK_VER}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VER}/mac/vulkansdk-macos-${VULKAN_SDK_VER}.tar.gz?Human=true &&
+      tar -xzf vulkansdk-macos-${VULKAN_SDK_VER}.tar.gz &&
       wget -O Packages.dmg http://s.sudre.free.fr/Software/files/Packages.dmg &&
       hdiutil attach Packages.dmg &&
       sudo installer -pkg /Volumes/Packages*/packages/packages.pkg -target / &&

CMakeLists.txt

@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
-cmake_policy(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+cmake_policy(VERSION 3.10.2)
 # cmake_policy(SET CMP0046 OLD)
 cmake_policy(SET CMP0057 NEW)
 
-set (REPO_VERSION 0.0.1)
+set (REPO_VERSION 0.2.0)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-modules)
 
@@ -22,10 +22,7 @@ elseif(APPLE)
 endif()
 
 # Use FindVulkan module added with CMAKE 3.7
-if(NOT CMAKE_VERSION VERSION_LESS 3.7.0)
-  message(STATUS "Using module to find Vulkan")
-  find_package(Vulkan REQUIRED FATAL_ERROR)
-endif()
+find_package(Vulkan REQUIRED FATAL_ERROR)
 
 include_directories(${Vulkan_INCLUDE_DIRS})
 
@@ -52,8 +49,8 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 # Set the debug or relese mode.
 if (CMAKE_BUILD_TYPE MATCHES Debug)
@@ -221,6 +218,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
 
 add_subdirectory(external/angelia)
+add_subdirectory(proxy-protos)
 add_subdirectory(proxy-vulkan)
 add_subdirectory(proxy-vulkan-server)
 add_subdirectory(samples)

README.md

@@ -10,6 +10,7 @@
 - [About](#about)
 - [What's New?](#whats-new)
 - [How to Build](#how-to-build)
+- [How to Run](#how-to-run)
 - [Requirements](#requirements)
 - [Dependencies](#dependencies)
 - [Future features](#future)
@@ -20,41 +21,72 @@
 
 <a name="about"></a>
 
-# Proxy Vulkan 0.1.0
+# Proxy Vulkan 0.2.0
 
 Proxy Vulkan is an open source proxy library for Vulkan.
 
-Version: 0.1.0 - Released: 7rd June 2020
+Version: 0.2.0 - Released: 25th October 2020
 
 <a name="whats-new"></a>
 
-## What's new in 0.1.0?
+## What's new in 0.1.1?
 
-- Proxy vkEnumerateInstanceLayerProperties function.
+- Convert to C++.
+- Use Cap'n Proto to send the data over TCP.
 
 <a name="how-to-build"></a>
 
 ## How to Build
 
 Coming soon...
 
+<a name="how-to-run"></a>
+
+## How to Run (in development)
+
+Currently, the IP are hard-coded.
+
+To run the server:
+```bash
+./proxy-vulkan-server
+```
+
+To run the proxy library, for example for the create instance example:
+- Windows:
+```bash
+./create_instance
+```
+
+- MacOS:
+```bash
+DYLD_LIBRARY_PATH=. ./create_instance
+```
+
+- Linux
+```bash
+LD_LIBRARY_PATH=. ./create_instance
+```
+
 <a name="requirements"></a>
 
 ## Requirements
 
-Coming soon...
+- C++14 or above compatible compiler.
 
 <a name="dependencies"></a>
 
 ## Dependencies
 
-Coming soon...
+- [Vulkan](https://vulkan.lunarg.com)
+- [Angelia](https://github.com/feserr/angelia)
+- [Hephaestus](https://github.com/feserr/hephaestus)
+- [Cap'n Proto](https://capnproto.org)
 
 <a name="future"></a>
 
 ## Future features
 
-Coming soon...
+- IP address are configured using a file.
 
 <a name="contributing"></a>
 

build_linux.sh

@@ -3,6 +3,6 @@
 workspace=`pwd`
 
 mkdir -p build
-cmake -DCMAKE_BUILD_TYPE=Release -H${workspace} -B${workspace}/build -G "Ninja"
-cmake --build ${workspace}/build --config Release --target all -- -j 10
+cmake -DCMAKE_PREFIX_PATH=$HOME/capnproto -DCMAKE_BUILD_TYPE=Release -H${workspace} -B${workspace}/build -G "Ninja"
+cmake --build ${workspace}/build --config Release --target all -- -j 3
 # ctest -C Release

build_osx.sh

@@ -5,5 +5,5 @@ workspace=`pwd`
 
 mkdir -p build
 cmake -DCMAKE_BUILD_TYPE=Release -H${workspace} -B${workspace}/build -G "Ninja"
-cmake --build ${workspace}/build --config Release --target all -- -j 10
+cmake --build ${workspace}/build --config Release --target all -- -j 3
 # ctest -C Release

external/angelia

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+
+set(NAME proxy_protos)
+
+project(${NAME} VERSION ${REPO_VERSION} DESCRIPTION "Proxy Vulkan Protobuffers")
+
+find_package(CapnProto CONFIG REQUIRED)
+
+include_directories(${CAPNP_INCLUDE_DIRS})
+
+capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS
+  protos/result.capnp
+  protos/function.capnp
+  protos/instance.capnp)
+
+add_library(${NAME} ${CAPNP_HDRS} ${CAPNP_SRCS})
+add_library(proxyvulkan::protos ALIAS ${NAME})

proxy-protos/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Copyright 2020 feserr. All rights reserved.
+# License: https://github.com/feserr/proxy-vulkan#license
+
+@0xd838357daca11376;
+
+enum VkType {
+  proxyEnd @0;
+  proxyVkEnumerateInstanceLayerProperties @1;
+}
+
+struct ProxyFunction {
+  function @0 : VkType;
+  retrieve @1 : Bool;
+}