test commits for debug on Windows

CMakeLists.txt

@@ -7,6 +7,9 @@ include(StormSetup)
 
 option(STORM_ENABLE_CRASH_REPORTS "Enable automatic crash reports" OFF)
 option(STORM_ENABLE_STEAM "Enable Steam integration" 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})
@@ -15,6 +18,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
@@ -37,12 +52,35 @@ conan_cmake_run(CONANFILE conanfile.py
 )
 
 if (NOT WIN32)
+    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)
+
+    add_subdirectory(nine-native)
+    set(NINE_NATIVE_INCLUDE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}/nine-native/include"
+        "${CMAKE_CURRENT_SOURCE_DIR}/nine-native/include/D3D9"
+    )
+    include_directories("${NINE_NATIVE_INCLUDE_DIRS}")
+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

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("libsafec/3.6.0")

nine-native/CMakeLists.txt

@@ -0,0 +1,23 @@
+project(nine-native)
+
+add_library(${PROJECT_NAME} STATIC
+    include/nine_sdl.h
+    src/nine_sdl.c
+    src/dri3.c
+    src/dri3.h
+)
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+    include
+    include/D3D9
+)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    SDL2
+    X11
+    xcb
+    xcb-present
+    xcb-dri3
+    xcb-xfixes
+    X11-xcb
+)