overte-org · ksuprynowicz · Oct 23, 2018 · Oct 28, 2018 · Oct 22, 2018 · Oct 22, 2018
diff --git a/android/libraries/oculus/src/main/assets/shaders/present.vert b/android/libraries/oculus/src/main/assets/shaders/present.vert
@@ -4,12 +4,21 @@ layout(location = 0) out vec4 vTexCoordLR;
 
 void main(void) {
     const float depth = 0.0;
+#ifdef VULKAN
+    const vec4 UNIT_QUAD[4] = vec4[4](
+        vec4(-1.0, 1.0, depth, 1.0),
+        vec4(1.0, 1.0, depth, 1.0),
+        vec4(-1.0, -1.0, depth, 1.0),
+        vec4(1.0, -1.0, depth, 1.0)
+    );
+#else
     const vec4 UNIT_QUAD[4] = vec4[4](
         vec4(-1.0, -1.0, depth, 1.0),
         vec4(1.0, -1.0, depth, 1.0),
         vec4(-1.0, 1.0, depth, 1.0),
         vec4(1.0, 1.0, depth, 1.0)
     );
+#endif
     vec4 pos = UNIT_QUAD[gl_VertexID];
     gl_Position = pos;
     vTexCoordLR.xy = pos.xy;

diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
@@ -1,5 +1,5 @@
 set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
@@ -128,18 +128,17 @@ macro(AUTOSCRIBE_SHADER)
     AUTOSCRIBE_APPEND_QRC("${SHADER_COUNT}/name" "${SHADER_NAME_FILE}")
 
     if (USE_GLES)
-        set(SPIRV_CROSS_ARGS --version 310es)
-        AUTOSCRIBE_PLATFORM_SHADER("310es")
-        AUTOSCRIBE_PLATFORM_SHADER("310es/stereo")
-    else()
+        set(SPIRV_CROSS_ARGS --version 320es)
+        AUTOSCRIBE_PLATFORM_SHADER("320es")
+        AUTOSCRIBE_PLATFORM_SHADER("320es/stereo")
+    elseif(APPLE)
         set(SPIRV_CROSS_ARGS --version 410 --no-420pack-extension)
         AUTOSCRIBE_PLATFORM_SHADER("410")
         AUTOSCRIBE_PLATFORM_SHADER("410/stereo")
-        if (NOT APPLE)
-            set(SPIRV_CROSS_ARGS --version 450)
-            AUTOSCRIBE_PLATFORM_SHADER("450")
-            AUTOSCRIBE_PLATFORM_SHADER("450/stereo")
-        endif()
+    else()
+        set(SPIRV_CROSS_ARGS --version 450)
+        AUTOSCRIBE_PLATFORM_SHADER("450")
+        AUTOSCRIBE_PLATFORM_SHADER("450/stereo")
     endif()
 
     string(CONCAT SHADER_LIST "${SHADER_LIST}" "${SHADER_NAME} = ${SHADER_COUNT},\n")
@@ -407,12 +406,18 @@ macro(AUTOSCRIBE_SHADER_LIBS)
     configure_file(shaders.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/shaders.qrc)
     list(APPEND QT_RESOURCES_FILE ${CMAKE_CURRENT_BINARY_DIR}/shaders.qrc)
 
-    list(APPEND AUTOSCRIBE_SHADER_HEADERS ${AUTOSCRIBE_HEADER_DIR}/mono.glsl ${AUTOSCRIBE_HEADER_DIR}/stereo.glsl)
-    list(APPEND AUTOSCRIBE_SHADER_HEADERS ${AUTOSCRIBE_HEADER_DIR}/450/header.glsl ${AUTOSCRIBE_HEADER_DIR}/410/header.glsl ${AUTOSCRIBE_HEADER_DIR}/310es/header.glsl)
+    list(APPEND AUTOSCRIBE_SHADER_HEADERS 
+        ${AUTOSCRIBE_HEADER_DIR}/mono.glsl 
+        ${AUTOSCRIBE_HEADER_DIR}/stereo.glsl
+        ${AUTOSCRIBE_HEADER_DIR}/450/header.glsl 
+        ${AUTOSCRIBE_HEADER_DIR}/410/header.glsl 
+        ${AUTOSCRIBE_HEADER_DIR}/320es/header.glsl
+    )
+
     source_group("Shader Headers" FILES ${AUTOSCRIBE_HEADER_DIR}/mono.glsl ${AUTOSCRIBE_HEADER_DIR}/stereo.glsl)
     source_group("Shader Headers\\450" FILES ${AUTOSCRIBE_HEADER_DIR}/450/header.glsl)
     source_group("Shader Headers\\410" FILES ${AUTOSCRIBE_HEADER_DIR}/410/header.glsl)
-    source_group("Shader Headers\\310es" FILES ${AUTOSCRIBE_HEADER_DIR}/310es/header.glsl)
+    source_group("Shader Headers\\320es" FILES ${AUTOSCRIBE_HEADER_DIR}/320es/header.glsl)
 
     list(APPEND AUTOSCRIBE_SHADER_LIB_SRC ${AUTOSCRIBE_SHADER_HEADERS})
     list(APPEND AUTOSCRIBE_SHADER_LIB_SRC ${CMAKE_CURRENT_BINARY_DIR}/ShaderEnums.h ${CMAKE_CURRENT_BINARY_DIR}/ShaderEnums.cpp)

diff --git a/cmake/macros/TargetVulkan.cmake b/cmake/macros/TargetVulkan.cmake
@@ -6,6 +6,8 @@
 # 
 macro(TARGET_VULKAN)
     find_package(Vulkan REQUIRED)
+    find_package(Qt5 COMPONENTS X11Extras REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${VULKAN_INCLUDE_DIR})
     target_link_libraries(${TARGET_NAME} ${VULKAN_LIBRARY})
-endmacro()
+    target_link_libraries(${TARGET_NAME} ${Qt5X11Extras_LIBRARIES})
+endmacro()
diff --git a/cmake/modules/FindVulkan.cmake b/cmake/modules/FindVulkan.cmake
@@ -0,0 +1,16 @@
+if (WIN32)
+    find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS "$ENV{VULKAN_SDK}/Include" "$ENV{VK_SDK_PATH}/Include")
+    if (CMAKE_CL_64)
+        find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS "$ENV{VULKAN_SDK}/Lib" "$ENV{VK_SDK_PATH}/Bin")
+    else()
+        find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS "$ENV{VULKAN_SDK}/Lib32" "$ENV{VK_SDK_PATH}/Bin32")
+    endif()
+else()
+    find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS "$ENV{VULKAN_SDK}/include")
+    find_library(VULKAN_LIBRARY NAMES vulkan HINTS
+        "$ENV{VULKAN_SDK}/lib")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR)
+mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIBRARY)
diff --git a/cmake/ports/hifi-client-deps/CONTROL b/cmake/ports/hifi-client-deps/CONTROL
@@ -1,4 +1,4 @@
 Source: hifi-client-deps
 Version: 0.1
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: hifi-deps, aristo (windows), glslang, liblo (windows), nlohmann-json, openvr ((linux&!arm)|windows), quazip (!android), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), sranipal (windows), vulkanmemoryallocator, discord-rpc (!android)
+Build-Depends: hifi-deps, aristo (windows), glslang, liblo (windows), nlohmann-json, openvr ((linux&!arm)|windows), quazip (!android), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), sranipal (windows), vulkanmemoryallocator, vulkan (windows), vulkan-validationlayers (windows), discord-rpc (!android)
diff --git a/cmake/ports/mimalloc/add_ref_to_page_malloc_zero.patch b/cmake/ports/mimalloc/add_ref_to_page_malloc_zero.patch
@@ -0,0 +1,12 @@
+diff --git a/src/alloc.c b/src/alloc.c
+index 86aaae75..b543e859 100644
+--- a/src/alloc.c
++++ b/src/alloc.c
+@@ -584,6 +584,7 @@ mi_decl_nodiscard void* mi_new_reallocn(void* p, size_t newcount, size_t size) {
+ #ifdef __cplusplus
+ void* _mi_externs[] = {
+   (void*)&_mi_page_malloc,
++  (void*)&_mi_page_malloc_zero,
+   (void*)&_mi_heap_malloc_zero,
+   (void*)&_mi_heap_malloc_zero_ex,
+   (void*)&mi_malloc,
diff --git a/cmake/ports/mimalloc/fix-cmake.patch b/cmake/ports/mimalloc/fix-cmake.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcfe91d8..a1e5a2b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -471,10 +471,10 @@ if(MI_BUILD_SHARED)
+     add_custom_command(TARGET mimalloc POST_BUILD
+       COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc>
+       COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory")
+-    install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_bindir})
++    install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR})
+   endif()
+
+-  install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${mi_install_bindir} LIBRARY DESTINATION ${mi_install_libdir})
++  install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir})
+   install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
+ endif()
+
diff --git a/cmake/ports/mimalloc/fix-param.patch b/cmake/ports/mimalloc/fix-param.patch
@@ -0,0 +1,13 @@
+diff --git a/src/arena.c b/src/arena.c
+index 648ee84..ee55989 100644
+--- a/src/arena.c
++++ b/src/arena.c
+@@ -794,7 +794,7 @@ bool _mi_arena_segment_clear_abandoned(mi_segment_t* segment )
+ // clears the thread_id.
+ void _mi_arena_segment_mark_abandoned(mi_segment_t* segment) 
+ {
+-  mi_atomic_store_release(&segment->thread_id, 0);
++  mi_atomic_store_release(&segment->thread_id, (uintptr_t)0);
+   mi_assert_internal(segment->used == segment->abandoned);
+   if (segment->memid.memkind != MI_MEM_ARENA) {
+     // not in an arena; count it as abandoned and return
diff --git a/cmake/ports/mimalloc/portfile.cmake b/cmake/ports/mimalloc/portfile.cmake
@@ -0,0 +1,74 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/mimalloc
+    REF "v${VERSION}"
+    SHA512 4e30976758015c76a146acc1bfc8501e2e5c61b81db77d253de0d58a8edef987669243f232210667b32ef8da3a33286642acb56ba526fd24c4ba925b44403730
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+        add_ref_to_page_malloc_zero.patch
+        fix-param.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        asm         MI_SEE_ASM
+        secure      MI_SECURE
+        override    MI_OVERRIDE
+)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS_DEBUG
+        -DMI_DEBUG_FULL=ON
+    OPTIONS_RELEASE
+        -DMI_DEBUG_FULL=OFF
+    OPTIONS
+        -DMI_USE_CXX=ON
+        -DMI_BUILD_TESTS=OFF
+        -DMI_BUILD_OBJECT=OFF
+        ${FEATURE_OPTIONS}
+        -DMI_BUILD_STATIC=${MI_BUILD_STATIC}
+        -DMI_BUILD_SHARED=${MI_BUILD_SHARED}
+        -DMI_INSTALL_TOPLEVEL=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+file(COPY
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/usage"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/mimalloc.h"
+        "!defined(MI_SHARED_LIB)"
+        "0 // !defined(MI_SHARED_LIB)"
+    )
+endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
+set(mi_basename "mimalloc")
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    string(APPEND mi_basename "-static")
+endif()
+if("secure" IN_LIST FEATURES)
+    string(APPEND mi_basename "-secure")
+endif()
+if(NOT "mimalloc" STREQUAL "${mi_basename}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mimalloc.pc" " -lmimalloc" " -l${mi_basename}")
+endif()
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mimalloc.pc" " -lmimalloc" " -l${mi_basename}-debug")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/cmake/ports/mimalloc/usage b/cmake/ports/mimalloc/usage
@@ -0,0 +1,9 @@
+mimalloc provides CMake targets:
+
+  find_package(mimalloc CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:mimalloc-static>,mimalloc-static,mimalloc>)
+
+To ensure the mimalloc-override.dll is loaded at runtime on Windows with
+dynamic linkage, it is suggested to insert some call to the mimalloc API
+in the main function, eg. `mi_version()`. Cf.
+https://github.com/microsoft/mimalloc/blob/dev/readme.md#dynamic-override-on-windows
diff --git a/cmake/ports/mimalloc/vcpkg-cmake-wrapper.cmake b/cmake/ports/mimalloc/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,21 @@
+_find_package(${ARGS})
+
+if(CMAKE_CURRENT_LIST_DIR STREQUAL "${MIMALLOC_CMAKE_DIR}/${MIMALLOC_VERSION_DIR}")
+    set(MIMALLOC_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+    # As in vcpkg.cmake
+    if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$")
+        set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")
+    else()
+        set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+    endif()
+    set(MIMALLOC_OBJECT_DIR "MIMALLOC_OBJECT_DIR-NOTFOUND") # not installed
+    set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}")
+endif()
+
+if(TARGET mimalloc AND NOT TARGET mimalloc-static)
+    add_library(mimalloc-static INTERFACE IMPORTED)
+    set_target_properties(mimalloc-static PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc)
+elseif(TARGET mimalloc-static AND NOT TARGET mimalloc)
+    add_library(mimalloc INTERFACE IMPORTED)
+    set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static)
+endif()
diff --git a/cmake/ports/mimalloc/vcpkg.json b/cmake/ports/mimalloc/vcpkg.json
@@ -0,0 +1,30 @@
+{
+  "name": "mimalloc",
+  "version": "2.1.7",
+  "port-version": 1,
+  "description": "Compact general purpose allocator with excellent performance",
+  "homepage": "https://github.com/microsoft/mimalloc",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "asm": {
+      "description": "Generate assembly files"
+    },
+    "override": {
+      "description": "Override the standard malloc interface"
+    },
+    "secure": {
+      "description": "Use security mitigations (like guard pages and randomization)"
+    }
+  }
+}
diff --git a/cmake/ports/robin-hood-hashing/portfile.cmake b/cmake/ports/robin-hood-hashing/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO martinus/robin-hood-hashing
+	REF 3.11.5
+	SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
+	HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+	SOURCE_PATH "${SOURCE_PATH}"
+	OPTIONS
+		-DRH_STANDALONE_PROJECT=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+	PACKAGE_NAME robin_hood
+	CONFIG_PATH lib/cmake/robin_hood
+)
+
+file(REMOVE_RECURSE
+	"${CURRENT_PACKAGES_DIR}/debug"
+	"${CURRENT_PACKAGES_DIR}/lib"
+)
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/cmake/ports/robin-hood-hashing/vcpkg.json b/cmake/ports/robin-hood-hashing/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "robin-hood-hashing",
+  "version": "3.11.5",
+  "description": "Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20",
+  "homepage": "https://github.com/martinus/robin-hood-hashing",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/cmake/ports/spirv-headers/portfile.cmake b/cmake/ports/spirv-headers/portfile.cmake
@@ -0,0 +1,20 @@
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/SPIRV-Headers
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 b4f975d3051eda41ef5c3a6efc832607a165adfd6f43d7af171d2c0446b227bdcb5de0017a081fa9e7a3d2710ba8583fadbc06c0a364043b2778b02818d01040
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/cmake/ports/spirv-headers/vcpkg.json b/cmake/ports/spirv-headers/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "spirv-headers",
+  "version": "1.3.296.0",
+  "description": "Machine-readable files for the SPIR-V Registry",
+  "homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}