dxvk-ok1

.github/workflows/ci_linux.yml

@@ -0,0 +1,43 @@
+name: CI Linux
+
+on:
+  push:
+    paths-ignore:
+      - 'docs/**'
+      - 'tools/**'
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'tools/**'
+      - '*.md'
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration: [Debug]
+    name: 'build-linux [${{ matrix.configuration}}]'
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: Install libs
+      run: sudo apt update && sudo apt install meson libvulkan-dev glslang-tools libsdl2-dev libgl-dev libegl-dev
+    - name: Install Conan
+      run: pip install conan
+    - name: Configure with cmake
+      run: |
+        export CC=clang-11
+        export CXX=clang++-11
+        ${CXX} --version
+        mkdir build && cd build
+        cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}}
+    - name: Build dependencies
+      run: ninja dependencies
+      working-directory: build
+    - name: Build project
+      run: ninja
+      working-directory: build

CMakeLists.txt

@@ -36,6 +36,32 @@ conan_cmake_run(CONANFILE conanfile.py
         steam=${STORM_ENABLE_STEAM}
 )
 
+if (NOT WIN32)
+    message("Using DXVK-native for D3D9 API")
+
+    include(ExternalProject)
+    #PATCH_COMMAND for ubuntu: https://bugs.launchpad.net/ubuntu/+source/libsdl2-ttf/+bug/1872023
+    ExternalProject_Add(dxvk-native
+        GIT_REPOSITORY    https://github.com/Joshua-Ashton/dxvk-native
+        GIT_TAG           a2dc99c407340432d4ba5bfa29efa685c27942ea
+        PATCH_COMMAND     sed -i "s+directx')+directx', '/usr/include/SDL2')+g" meson.build
+        GIT_SHALLOW       ON
+        BUILD_ALWAYS      OFF
+        CONFIGURE_HANDLED_BY_BUILD ON
+        CONFIGURE_COMMAND meson ../dxvk-native
+        BUILD_COMMAND     ninja
+        INSTALL_COMMAND   ""
+    )
+    ExternalProject_Get_property(dxvk-native SOURCE_DIR BINARY_DIR)
+    set(DXVK_NATIVE_INCLUDE_DIRS
+        "${SOURCE_DIR}/include/native/directx"
+        "${SOURCE_DIR}/include/native/windows"
+    )
+    set(DXVK_NATIVE_D3D9_LIB ${BINARY_DIR}/src/d3d9/libdxvk_d3d9.so)
+    include_directories("${DXVK_NATIVE_INCLUDE_DIRS}")
+    ADD_CUSTOM_TARGET(dependencies ALL DEPENDS dxvk-native)
+endif()
+
 ### Define library ALIASes for use without CONAN_PKG:: prefix
 foreach (conan_target ${CONAN_TARGETS})
     string(REPLACE "CONAN_PKG::" "" unprefixed_target ${conan_target})

cmake/StormSetup.cmake

@@ -222,6 +222,9 @@ macro(STORM_SETUP)
                           ${_SETUP_DEPENDENCIES})
 
     if(${_SETUP_TYPE} STREQUAL "executable")
+      if(NOT WIN32)
+        list(APPEND target_link_flags "-Wl,--whole-archive")
+      endif()
       foreach(dep ${_SETUP_DEPENDENCIES})
         if(TARGET ${dep})
           get_property(
@@ -231,10 +234,17 @@ macro(STORM_SETUP)
             SET)
           if(is_storm_module)
             # TODO: make it portable? (at least for gcc it is --whole-archive)
-            list(APPEND target_link_flags "/WHOLEARCHIVE:${dep}")
+            if (WIN32)
+              list(APPEND target_link_flags "/WHOLEARCHIVE:${dep}")
+            else()
+              list(APPEND target_link_flags "${CMAKE_BINARY_DIR}/lib/lib${dep}.a")
+            endif()
           endif()
         endif()
       endforeach()
+      if(NOT WIN32)
+        list(APPEND target_link_flags "-Wl,--no-whole-archive")
+      endif()
     endif()
   endif()
 

conanfile.py

@@ -16,14 +16,20 @@ class StormEngine(ConanFile):
 
     # dependencies used in deploy binaries
     # conan-center
-    requires = ["zlib/1.2.11", "spdlog/1.9.2", "7zip/19.00", "fast_float/3.4.0", "sdl/2.0.18", "mimalloc/2.0.3",
+    requires = ["zlib/1.2.11", "spdlog/1.9.2", "fast_float/3.4.0", "sdl/2.0.18", "mimalloc/2.0.3",
     # storm.jfrog.io
     "sentry-native/0.4.13@storm/patched", "directx/9.0@storm/prebuilt", "fmod/2.02.05@storm/prebuilt"]
     # aux dependencies (e.g. for tests)
     build_requires = "catch2/2.13.7"
 
     # optional dependencies
     def requirements(self):
+        if self.settings.os == "Windows":
+            # conan-center
+            self.requires("7zip/19.00")
+        else:
+            # conan-center
+            self.requires("libsafec/3.6.0")
         if self.options.steam:
             self.requires("steamworks/1.5.1@storm/prebuilt")
 
@@ -32,11 +38,14 @@ def requirements(self):
     default_options = {
         "sdl2:sdl2main": False,
         "sentry-native:backend": "crashpad",
-        "sentry-native:transport": "winhttp",
         "mimalloc:shared": True,
         "mimalloc:override": True
     }
 
+    def configure(self):
+        if self.settings.os == "Windows":
+            self.default_options["sentry-native:transport"] = "winhttp"
+
     def imports(self):
         self.__dest = str(self.options.output_directory) + "/" + getenv("CONAN_IMPORT_PATH", "bin")
         self.__install_folder("/src/techniques", "/resource/techniques")

src/CMakeLists.txt

@@ -40,6 +40,7 @@ if (MSVC)
     add_link_options("$<$<CONFIG:Release>:/OPT:ICF>") # Perform identical COMDAT folding, needs to be explicitly specified with /DEBUG
     add_link_options("$<$<CONFIG:Release>:/LTCG>") # Enable link-time code generation
 else()
+    add_definitions(-D_GLIBCXX_USE_TBB_PAR_BACKEND=0) # Don't use tbb
     add_compile_options(-std=c++20)
 
     # Verbose output

src/apps/engine/CMakeLists.txt

@@ -6,6 +6,14 @@ else()
   set(MIMALLOC_DEP "$<IF:$<CONFIG:Release>,${CONAN_LIB_DIRS_MIMALLOC_RELEASE}/libmimalloc.so,${CONAN_LIB_DIRS_MIMALLOC_DEBUG}/libmimalloc-debug.so>")
 endif()
 
+if (WIN32)
+set(SYSTEM_DEPS
+    "comctl32"
+    "dbghelp"
+    "winhttp"
+)
+endif()
+
 STORM_SETUP(
     TARGET_NAME engine
     TYPE executable
@@ -69,7 +77,5 @@ STORM_SETUP(
     zlib
 
     # system
-    comctl32
-    dbghelp
-    winhttp
+    ${SYSTEM_DEPS}
 )

src/apps/engine/src/compiler.cpp

@@ -5,7 +5,11 @@
 
 #include <zlib.h>
 
+#ifdef _WIN32 // FIX_LINUX s_debug.h
 #include "s_debug.h"
+#else
+#include "core_impl.h"
+#endif
 #include "logging.hpp"
 #include "script_cache.h"
 #include "storm_assert.h"
@@ -133,7 +137,9 @@ void COMPILER::SetProgramDirectory(const char *dir_name)
         strcpy_s(ProgramDirectory, len, dir_name);
         strcat_s(ProgramDirectory, len, "\\");
     }
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     CDebug->SetProgramDirectory(dir_name);
+#endif
 }
 
 // load file into memory
@@ -327,8 +333,10 @@ void COMPILER::SetError(const char *data_PTR, ...)
 
     logError_->error(ErrorBuffer);
 
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     if (bBreakOnError)
         CDebug->SetTraceMode(TMODE_MAKESTEP);
+#endif
 }
 
 void COMPILER::SetWarning(const char *data_PTR, ...)
@@ -391,11 +399,13 @@ void COMPILER::LoadPreprocess()
         // else bScriptTrace = true;
     }
 
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     auto ini = fio->OpenIniFile(PROJECT_NAME);
     if (ini)
     {
         bBreakOnError = (ini->GetInt("options", "break_on_error", 0) == 1);
     }
+#endif
 }
 
 bool COMPILER::CreateProgram(const char *file_name)
@@ -615,8 +625,14 @@ VDATA *COMPILER::ProcessEvent(const char *event_name)
 
     bEventsBreak = false;
 
+#ifdef _WIN32 // FIX_LINUX GetTickCount
     uint32_t nTimeOnEvent = GetTickCount();
+#else
+    auto nStartEventTime = std::chrono::system_clock::now();
+#endif
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     current_debug_mode = CDebug->GetTraceMode();
+#endif
 
     pVD = nullptr;
     if (event_name == nullptr)
@@ -683,14 +699,22 @@ VDATA *COMPILER::ProcessEvent(const char *event_name)
             break;
     }
 
+#ifdef _WIN32 // FIX_LINUX GetTickCount
     nTimeOnEvent = GetTickCount() - nTimeOnEvent;
 
     nRuntimeTicks += nTimeOnEvent;
+#else
+    std::chrono::duration<double, std::milli> nTimeOnEvent = std::chrono::system_clock::now() - nStartEventTime;
+
+    nRuntimeTicks += static_cast<uint32_t>(nTimeOnEvent.count());
+#endif
 
     pRun_fi = nullptr;
 
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     if (current_debug_mode == TMODE_CONTINUE)
         CDebug->SetTraceMode(TMODE_CONTINUE);
+#endif
     // SetFocus(core_internal.App_Hwnd);        // VANO CHANGES
 
     RDTSC_E(dwRDTSC);
@@ -816,7 +840,7 @@ bool COMPILER::BC_LoadSegment(const char *file_name)
     // const auto len = strlen(file_name) + 1;
     // SegmentTable[index].name = new char[len];
     // memcpy(SegmentTable[index].name, file_name, len);
-    SegmentTable[index].name = _strdup(file_name);
+    SegmentTable[index].name = strdup(file_name);
     SegmentTable[index].id = id;
     SegmentTable[index].bUnload = false;
     SegmentTable[index].pData = nullptr;
@@ -1895,7 +1919,8 @@ bool COMPILER::Compile(SEGMENT_DESC &Segment, char *pInternalCode, uint32_t pInt
     uint32_t dwR;
     if (bWriteCodeFile)
     {
-        _splitpath(Segment.name.c_str(), nullptr, nullptr, file_name, nullptr);
+        auto fName = std::filesystem::path(Segment.name.c_str()).filename().string();
+        strcpy_s(file_name, fName.c_str());
         strcat_s(file_name, ".b");
         std::wstring FileNameW = utf8::ConvertUtf8ToWide(file_name);
         auto fileS = fio->_CreateFile(file_name, std::ios::binary | std::ios::out);
@@ -3619,7 +3644,9 @@ bool COMPILER::BC_CallFunction(uint32_t func_code, uint32_t &ip, DATA *&pVResult
     mem_pfi = pRun_fi;
     mem_codebase = pRunCodeBase;
 
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     nDebugEnterMode = CDebug->GetTraceMode();
+#endif
     uint64_t nTicks;
     if (call_fi.segment_id == INTERNAL_SEGMENT_ID)
     {
@@ -3670,10 +3697,12 @@ bool COMPILER::BC_CallFunction(uint32_t func_code, uint32_t &ip, DATA *&pVResult
             core_internal.Trace("Invalid func_code = %u for AddTime", func_code);
         }
     }
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     if (nDebugEnterMode == TMODE_MAKESTEP)
     {
         CDebug->SetTraceMode(TMODE_MAKESTEP);
     }
+#endif
 
     if (pVResult)
     {
@@ -3881,7 +3910,9 @@ bool COMPILER::BC_Execute(uint32_t function_code, DATA *&pVReturnResult, const c
         switch (Token_type)
         {
         case ARGS_NUM:
+#ifdef _WIN32 // FIX_LINUX __debugbreak
             __debugbreak();
+#endif
             break;
         case STACK_COMPARE:
             pV = SStack.Read();
@@ -4230,6 +4261,7 @@ bool COMPILER::BC_Execute(uint32_t function_code, DATA *&pVReturnResult, const c
                 break;
             if (bDebugExpressionRun)
                 break;
+#ifdef _WIN32 // FIX_LINUX s_debug.h
             memcpy(&nDebugTraceLineCode, &pCodeBase[ip], sizeof(uint32_t));
             if (bTraceMode)
             {
@@ -4279,6 +4311,7 @@ bool COMPILER::BC_Execute(uint32_t function_code, DATA *&pVReturnResult, const c
                     }
                 }
             }
+#endif
             break;
         case DEBUG_FILE_NAME:
 
@@ -6445,11 +6478,11 @@ void COMPILER::SaveVariable(DATA *pV, bool bdim)
         break;
     case VAR_AREFERENCE:
         pString = nullptr;
-        __try
+        try
         {
             pA = TraceARoot(pV->AttributesClass, pString);
         }
-        __except (EXCEPTION_EXECUTE_HANDLER)
+        catch (...)
         {
             SetError("Save - ARef to non existing attributes branch");
             WriteVDword(0xffffffff);
@@ -7959,5 +7992,7 @@ void COMPILER::FormatDialog(char *file_name)
 
 void STRING_CODEC::VariableChanged()
 {
+#ifdef _WIN32 // FIX_LINUX s_debug.h
     CDebug->SetTraceMode(TMODE_MAKESTEP);
+#endif
 }