ARM nine changes

.github/workflows/ci_linux.yml

@@ -40,9 +40,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-    - name: Install libs
+    - name: Install sdl2 ppa and libs
       run: |
-        sudo apt-get update && sudo apt-get install meson libstdc++-10-dev libvulkan-dev glslang-tools libsdl2-dev libgl-dev libegl-dev
+        sudo add-apt-repository ppa:savoury1/games
+        sudo apt-get update && sudo apt-get install meson libstdc++-10-dev libvulkan-dev glslang-tools libsdl2-dev libgl-dev libegl-dev clang-${{matrix.clang_version}}
         # fix for conan ci
         sudo apt-get install libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev
     - name: Install Conan

CMakeLists.txt

@@ -8,6 +8,9 @@ include(StormSetup)
 option(STORM_ENABLE_CRASH_REPORTS "Enable automatic crash reports" OFF)
 option(STORM_ENABLE_STEAM "Enable Steam integration" OFF)
 option(STORM_ENABLE_SAFE_MODE "Enable additional runtime checks" OFF)
+if (NOT WIN32)
+option(STORM_MESA_NINE "Use Gallium Nine from Mesa (without WINE) for D3D9 API" OFF)
+endif()
 
 ### Set up output paths
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -16,6 +19,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug
 
 set(STORM_WATERMARK_FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/watermark.hpp CACHE FILEPATH "Include file containing build revision, etc." FORCE)
 
+message(STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR})
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "armv*")
+    set(PROJECT_PLATFORM_ARM TRUE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    set(PROJECT_PLATFORM_ARM64 TRUE)
+endif()
+
+if (PROJECT_PLATFORM_ARM)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -fsigned-char")
+endif()
+
 ### Set up third-party dependencies
 set(ENV{CONAN_REVISIONS_ENABLED} 1)
 conan_add_remote(NAME bincrafters
@@ -38,27 +53,72 @@ conan_cmake_run(CONANFILE conanfile.py
 )
 
 if (NOT WIN32)
-    message("Using DXVK-native for D3D9 API")
+    find_package(SDL2 REQUIRED)
+    message(STATUS "SDL2_LIBRARIES="${SDL2_LIBRARIES})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${SDL2_INCLUDE_DIRS} -fsigned-char")
+    message(STATUS "CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS})
+endif()
+
+if (WIN32)
+    message("Using Windows D3D9 API")
+    set(SDL2_LIBRARIES "sdl")
+elseif (STORM_MESA_NINE) # for Gallium Nine
+    message("Using Gallium Nine for native D3D9 API")
+
+    #sudo apt install libd3dadapter9-mesa-dev
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(D3D REQUIRED IMPORTED_TARGET d3d)
+
+    include(ExternalProject)
+    ExternalProject_Add(nine-native
+        GIT_REPOSITORY    https://github.com/q4a/nine-native
+        GIT_TAG           main
+        GIT_SHALLOW       ON
+        BUILD_ALWAYS      OFF
+        BUILD_BYPRODUCTS  <BINARY_DIR>/libnine-native.a
+        INSTALL_COMMAND   ""
+    )
+    ExternalProject_Get_property(nine-native SOURCE_DIR BINARY_DIR)
+    set(NINE_NATIVE_INCLUDE_DIRS
+        "${SOURCE_DIR}/include"
+        "${SOURCE_DIR}/include/D3D9"
+        "${SOURCE_DIR}/include/windows"
+    )
+    set(NATIVE_D3D9_LIBS
+        "${BINARY_DIR}/libnine-native.a"
+        "PkgConfig::D3D"
+        X11
+        xcb
+        xcb-present
+        xcb-dri3
+        xcb-xfixes
+        X11-xcb
+    )
+    include_directories("${NINE_NATIVE_INCLUDE_DIRS}")
+    add_custom_target(dependencies ALL DEPENDS nine-native)
+else() # for DXVK Native
+    message("Using DXVK Native for D3D9 API")
 
     include(ExternalProject)
     ExternalProject_Add(dxvk-native
-        GIT_REPOSITORY    https://github.com/Joshua-Ashton/dxvk-native
-        GIT_TAG           a2dc99c407340432d4ba5bfa29efa685c27942ea
+        GIT_REPOSITORY    https://github.com/IonAgorria/dxvk-native
+        GIT_TAG           2e91e784a86bc1355100518cd90eee48433551ac
         GIT_SHALLOW       ON
         BUILD_ALWAYS      OFF
         CONFIGURE_HANDLED_BY_BUILD ON
-        CONFIGURE_COMMAND meson ../dxvk-native
+        CONFIGURE_COMMAND meson setup ../dxvk-native --buildtype=release -Denable_d3d11=false -Denable_d3d10=false -Denable_dxgi=false
         BUILD_COMMAND     ninja
+        BUILD_BYPRODUCTS  <BINARY_DIR>/src/d3d9/libdxvk_d3d9.so
         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)
+    set(NATIVE_D3D9_LIBS ${BINARY_DIR}/src/d3d9/libdxvk_d3d9.so)
     include_directories("${DXVK_NATIVE_INCLUDE_DIRS}")
-    ADD_CUSTOM_TARGET(dependencies ALL DEPENDS dxvk-native)
+    add_custom_target(dependencies ALL DEPENDS dxvk-native)
 endif()
 
 ### Define library ALIASes for use without CONAN_PKG:: prefix

conanfile.py

@@ -16,7 +16,7 @@ class StormEngine(ConanFile):
 
     # dependencies used in deploy binaries
     # conan-center
-    requires = ["zlib/1.2.11", "spdlog/1.9.2", "fast_float/3.4.0", "sdl/2.0.18", "mimalloc/2.0.3", "sentry-native/0.5.0",
+    requires = ["zlib/1.2.11", "spdlog/1.9.2", "fast_float/3.4.0", "mimalloc/2.0.3", "sentry-native/0.5.0",
     # storm.jfrog.io
     "directx/9.0@storm/prebuilt", "fmod/2.02.05@storm/prebuilt"]
     # aux dependencies (e.g. for tests)
@@ -27,6 +27,7 @@ def requirements(self):
         if self.settings.os == "Windows":
             # conan-center
             self.requires("7zip/19.00")
+            self.requires("sdl/2.0.18")
         else:
             # conan-center
             self.requires("openssl/1.1.1n")#fix for error: 'sentry-crashpad/0.4.13' requires 'openssl/1.1.1n' while 'pulseaudio/14.2' requires 'openssl/1.1.1q'

src/CMakeLists.txt

@@ -6,6 +6,10 @@ if (STORM_ENABLE_STEAM)
     add_definitions(-DSTORM_ENABLE_STEAM=1)
 endif()
 
+if (STORM_MESA_NINE)
+    add_definitions(-DSTORM_MESA_NINE=1)
+endif()
+
 if(STORM_ENABLE_CRASH_REPORTS)
 	add_definitions(-DSTORM_ENABLE_CRASH_REPORTS=1)
 endif()

src/apps/engine/CMakeLists.txt

@@ -32,9 +32,9 @@ STORM_SETUP(
     # external
     mimalloc
     sentry-native
-    sdl
+    ${SDL2_LIBRARIES}
     zlib
 
     # system
     ${SYSTEM_DEPS}
-)
+)

src/libs/battle_interface/src/spyglass/spyglass.cpp

@@ -487,7 +487,9 @@ void ISPYGLASS::FindNewTargetShip()
                     continue;
                 Sphere sph;
                 const auto &vec = pSD->pShip->GetPos();
-                sph.pos = {vec.x, vec.y, vec.z};
+                sph.x = vec.x;
+                sph.y = vec.y;
+                sph.z = vec.z;
                 sph.r = 40.f;
                 if (sph.Intersection(vsrc, vdst))
                 {

src/libs/battle_interface/src/timer/timer.cpp

@@ -83,8 +83,10 @@ bool BITimer::ReadAndCreate()
     BIUtils::ReadRectFromAttr(AttributesPointer, "timerforeuv", rForeUV, rForeUV);
 
     // read texture & color
-    auto *pcBackTexture = AttributesPointer ? AttributesPointer->GetAttribute("timerbacktexture") : nullptr;
-    auto *pcForeTexture = AttributesPointer ? AttributesPointer->GetAttribute("timerforetexture") : nullptr;
+    auto *pcBackTexture =
+        AttributesPointer ? static_cast<const char *>(AttributesPointer->GetAttribute("timerbacktexture")) : nullptr;
+    auto *pcForeTexture =
+        AttributesPointer ? static_cast<const char *>(AttributesPointer->GetAttribute("timerforetexture")) : nullptr;
     auto dwColorBack =
         AttributesPointer ? AttributesPointer->GetAttributeAsDword("timerbackcolor", 0xFFFFFFFF) : 0xFFFFFFFF;
     auto dwColorFore =

src/libs/core/CMakeLists.txt

@@ -1,5 +1,5 @@
 STORM_SETUP(
     TARGET_NAME core
     TYPE library
-    DEPENDENCIES diagnostics math shared_headers steam_api fast_float sdl window
-)
+    DEPENDENCIES diagnostics math shared_headers steam_api fast_float ${SDL2_LIBRARIES} window
+)

src/libs/core/src/compiler.cpp

@@ -3845,6 +3845,7 @@ bool COMPILER::BC_Execute(uint32_t function_code, DATA *&pVReturnResult, const c
     S_TOKEN_TYPE Token_type;
     FuncInfo fi;
     const VarInfo *real_var;
+    float float_var;
     DATA *pV;
     DATA *pVResult;
     //    DATA   ExpressionResult;    // while compile expression not ready, each function have its own register
@@ -5386,7 +5387,8 @@ bool COMPILER::BC_Execute(uint32_t function_code, DATA *&pVReturnResult, const c
                 pV->Set(*((int32_t *)&pRunCodeBase[TLR_DataOffset]));
                 break;
             case FLOAT_NUMBER:
-                pV->Set(*((float *)&pRunCodeBase[TLR_DataOffset]));
+                float_var = *((float *)&pRunCodeBase[TLR_DataOffset]);
+                pV->Set(float_var);
                 break;
             case STRING:
                 pV->Set((char *)&pRunCodeBase[TLR_DataOffset + 4]); // 4 - string length

src/libs/input/CMakeLists.txt

@@ -1,5 +1,5 @@
 STORM_SETUP(
     TARGET_NAME input
     TYPE library
-    DEPENDENCIES sdl util
-)
+    DEPENDENCIES ${SDL2_LIBRARIES} util
+)

src/libs/input/src/sdl_input.cpp

@@ -293,7 +293,7 @@ SDLInput::SDLInput()
     keyStates_ = SDL_GetKeyboardState(nullptr);
 #ifndef _WIN32
     // since SDL 2.0.18 breaks WINAPI mouse api
-    SDL_SetRelativeMouseMode(SDL_TRUE);
+    //SDL_SetRelativeMouseMode(SDL_TRUE);
 #endif
     SDL_AddEventWatch(&SDLEventHandler, this);
     OpenController();

src/libs/location/src/character.cpp

@@ -5206,7 +5206,7 @@ void Character::FindNearCharacters(MESSAGE &message)
     // Find the surrounding characters
     auto *const location = GetLocation();
     auto fndCharacter = location->supervisor.FindCharacters(this, rad, viewAng, planeDist, ax, isSort);
-    auto n = fndCharacter.size();
+    int32_t n = fndCharacter.size();
     if (fndCharacter.empty())
     {
         num->Set(0);

src/libs/location/src/location_camera.cpp

@@ -764,10 +764,10 @@ bool LocationCamera::LoadCameraTrack(const char *pcTrackFile, float fTrackTime)
     Matrix view;
     m_track.GetPoint(0.f, pos, ang);
     ang.GetMatrix(view);
-    view.vx = -view.vx;
-    view.vz = -view.vz;
+    view.v.vx = -view.v.vx;
+    view.v.vz = -view.v.vz;
     view.Inverse();
-    view.pos = view * -pos;
+    view.v.pos = view * -pos;
     rs->SetView(*(CMatrix *)&view);
     rs->SetPerspective(cameraPerspective);
 
@@ -786,8 +786,8 @@ void LocationCamera::TurnOffTrackCamera()
         Matrix view;
         m_track.GetPoint(0.99999f, pos, ang);
         ang.GetMatrix(view);
-        view.vx = -view.vx;
-        view.vz = -view.vz;
+        view.v.vx = -view.v.vx;
+        view.v.vz = -view.v.vz;
         view.Inverse();
 
         oldPos = *(CVECTOR *)&pos;
@@ -811,10 +811,10 @@ void LocationCamera::ProcessTrackCamera()
     Matrix view;
     m_track.GetPoint(fTrackTime / m_fTrackMaxTime, pos, ang);
     ang.GetMatrix(view);
-    view.vx = -view.vx;
-    view.vz = -view.vz;
+    view.v.vx = -view.v.vx;
+    view.v.vz = -view.v.vz;
     view.Inverse();
-    view.pos = view * -pos;
+    view.v.pos = view * -pos;
     rs->SetView(*(CMatrix *)&view);
     rs->SetPerspective(cameraPerspective);
 }

src/libs/math/CMakeLists.txt

@@ -1,4 +1,4 @@
 STORM_SETUP(
     TARGET_NAME math
     TYPE library
-)
+)

src/libs/math/include/math3d.h

@@ -8,7 +8,14 @@
 
 #include <cstdint>
 
+#include "platform/platform.hpp"
+#if defined(ARCH_X86) || defined(ARCH_X64)
 #include <xmmintrin.h> // espkk # remove inline asm # 30/Dec/2017
+#elif defined(ARCH_ARM) || defined(ARCH_ARM64)
+#include "sse2neon.h"
+#else
+#error Add your platform here
+#endif
 
 //#define inline __forceinline