Dxvk v1

CMakeLists.txt

@@ -71,6 +71,10 @@ if (STATIC_BUILD)
     #add_definitions(-DXRAY_STATIC_BUILD)
 endif()
 
+if (NOT WIN32)
+    option(USE_MESA_NINE "Use Gallium Nine from Mesa (without WINE) for D3D9 API" OFF)
+endif()
+
 function(xr_install tgt)
     if (NOT MSVC)
         install(TARGETS ${tgt} DESTINATION "."
@@ -251,6 +255,73 @@ if (NOT WIN32)
     find_package(Theora REQUIRED)
     find_package(LZO REQUIRED)
     find_package(mimalloc NAMES mimalloc2 mimalloc2.0 mimalloc)
+
+    if (USE_MESA_NINE) # for Gallium Nine
+        message("Using Gallium Nine for native D3D9 API")
+        add_definitions(-DUSE_MESA_NINE)
+
+        #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
+            CMAKE_ARGS        -DCMAKE_BUILD_TYPE=Release -DNINE_POSITION_INDEPENDENT=ON
+            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(${PROJECT_NAME}
+            "${NINE_NATIVE_INCLUDE_DIRS}"
+        )
+        add_custom_target(dependencies ALL DEPENDS nine-native)
+    else() # for DXVK Native
+        message("Using DXVK Native for D3D9 API")
+        add_definitions(-DUSE_DXVK_NATIVE)
+
+        include(ExternalProject)
+        ExternalProject_Add(dxvk-native
+            GIT_REPOSITORY    https://github.com/q4a/dxvk-native
+            GIT_TAG           e6d339793721ceeb0db8848c6a6d62c22754fa33
+#            GIT_REPOSITORY    https://github.com/q4a/dxvk
+#            GIT_TAG           308cfcb3867210ef454077c5b49541aba9b2f1e5
+#            GIT_REPOSITORY    https://github.com/doitsujin/dxvk
+#            GIT_TAG           d11878e7935023819226a674abe951f8cdfc17c9
+            GIT_SHALLOW       ON
+            BUILD_ALWAYS      OFF
+            CONFIGURE_HANDLED_BY_BUILD ON
+            CONFIGURE_COMMAND meson setup ../dxvk-native --buildtype=release -Denable_d3d11=false -Denable_d3d10=false -Denable_dxgi=false
+            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(NATIVE_D3D9_LIBS ${BINARY_DIR}/src/d3d9/libdxvk_d3d9.so)
+        include_directories("${DXVK_NATIVE_INCLUDE_DIRS}")
+        add_custom_target(dependencies ALL DEPENDS dxvk-native)
+    endif()
 endif()
 
 # Memory allocator option

Externals/imgui-proj/imgui.cmake

@@ -13,6 +13,8 @@ set(KERNEL_SRC
     "${IMGUI_DIR}/imgui_internal.h"
     "${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp"
     "${IMGUI_DIR}/backends/imgui_impl_opengl3.h"
+    "${IMGUI_DIR}/backends/imgui_impl_dx9.cpp"
+    "${IMGUI_DIR}/backends/imgui_impl_dx9.h"
     "${IMGUI_DIR}/imstb_rectpack.h"
     "${IMGUI_DIR}/imstb_textedit.h"
     "${IMGUI_DIR}/imstb_truetype.h"

src/Common/PlatformLinux.inl

@@ -28,9 +28,9 @@
 
 #define _MAX_PATH PATH_MAX + 1
 #define MAX_PATH PATH_MAX + 1
-
+#ifndef USE_DX9
 #define WINAPI
-
+#endif
 #define _copysign copysign
 
 #define _cdecl //__attribute__((cdecl))
@@ -46,6 +46,8 @@
 #define __declspec(x)
 #define CALLBACK
 #define TEXT(x) strdup(x)
+#define LOWORD(l) ((uint16_t) (l))
+#define HIWORD(l) ((uint16_t) (((uint32_t) (l) >> 16) & 0xffff))
 
 /*
 inline char* _strlwr_l(char* str, locale_t loc)
@@ -161,7 +163,9 @@ typedef char* LPTSTR;
 typedef const char* LPCSTR;
 typedef const char* LPCTSTR;
 typedef unsigned int UINT;
+#ifndef USE_DX9
 typedef long long int LARGE_INTEGER;
+#endif
 typedef unsigned long long int ULARGE_INTEGER;
 
 typedef wchar_t WCHAR;
@@ -219,11 +223,14 @@ typedef void* PVOID;
 typedef void* LPVOID;
 typedef UINT_PTR WPARAM;
 typedef LONG_PTR LPARAM;
+#ifndef USE_DX9
 typedef long HRESULT;
+#endif
 typedef long LRESULT;
 typedef void* HWND;
 typedef void* HDC;
 
+#ifndef USE_DX9
 typedef struct _RECT {
     long left;
     long top;
@@ -235,6 +242,7 @@ typedef struct tagPOINT {
     long x;
     long y;
 } POINT, *PPOINT, *LPPOINT;
+#endif
 
 #define DWORD_PTR UINT_PTR
 #define WM_USER 0x0400
@@ -474,6 +482,7 @@ inline int _mkdir(const char *dir) { return mkdir(dir, S_IRWXU); }
     ((DWORD)(uint8_t)(ch2) << 16) | ((DWORD)(uint8_t)(ch3) << 24 ))
 #endif
 
+#ifndef USE_DX9
 typedef enum _D3DFORMAT {
     D3DFMT_UNKNOWN              =   0,
 
@@ -1014,6 +1023,14 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {
 
     D3DTTFF_FORCE_DWORD     = 0x7fffffff
 } D3DTEXTURETRANSFORMFLAGS;
+#endif // USE_DX9
+
+typedef struct _D3DXMACRO
+{
+    LPCSTR Name;
+    LPCSTR Definition;
+
+} D3DXMACRO, *LPD3DXMACRO;
 
 #define D3DTS_WORLD  D3DTS_WORLDMATRIX(0)
 #define D3DTS_WORLD1 D3DTS_WORLDMATRIX(1)
@@ -1103,3 +1120,83 @@ inline void restore_path_separators(char * path)
 inline tm* localtime_safe(const time_t *time, struct tm* result){ return localtime_r(time, result); }
 
 #define xr_strerror(errno, buffer, bufferSize) strerror_r(errno, buffer, sizeof(buffer))
+
+// wine/include/d3dx9shader.h
+
+typedef enum _D3DXREGISTER_SET
+{
+    D3DXRS_BOOL,
+    D3DXRS_INT4,
+    D3DXRS_FLOAT4,
+    D3DXRS_SAMPLER,
+    D3DXRS_FORCE_DWORD = 0x7fffffff
+} D3DXREGISTER_SET, *LPD3DXREGISTER_SET;
+
+typedef enum D3DXPARAMETER_CLASS
+{
+    D3DXPC_SCALAR,
+    D3DXPC_VECTOR,
+    D3DXPC_MATRIX_ROWS,
+    D3DXPC_MATRIX_COLUMNS,
+    D3DXPC_OBJECT,
+    D3DXPC_STRUCT,
+    D3DXPC_FORCE_DWORD = 0x7fffffff,
+} D3DXPARAMETER_CLASS, *LPD3DXPARAMETER_CLASS;
+
+typedef enum D3DXPARAMETER_TYPE
+{
+    D3DXPT_VOID,
+    D3DXPT_BOOL,
+    D3DXPT_INT,
+    D3DXPT_FLOAT,
+    D3DXPT_STRING,
+    D3DXPT_TEXTURE,
+    D3DXPT_TEXTURE1D,
+    D3DXPT_TEXTURE2D,
+    D3DXPT_TEXTURE3D,
+    D3DXPT_TEXTURECUBE,
+    D3DXPT_SAMPLER,
+    D3DXPT_SAMPLER1D,
+    D3DXPT_SAMPLER2D,
+    D3DXPT_SAMPLER3D,
+    D3DXPT_SAMPLERCUBE,
+    D3DXPT_PIXELSHADER,
+    D3DXPT_VERTEXSHADER,
+    D3DXPT_PIXELFRAGMENT,
+    D3DXPT_VERTEXFRAGMENT,
+    D3DXPT_UNSUPPORTED,
+    D3DXPT_FORCE_DWORD = 0x7fffffff,
+} D3DXPARAMETER_TYPE, *LPD3DXPARAMETER_TYPE;
+
+typedef struct _D3DXSHADER_CONSTANTTABLE
+{
+    DWORD Size;
+    DWORD Creator;
+    DWORD Version;
+    DWORD Constants;
+    DWORD ConstantInfo;
+    DWORD Flags;
+    DWORD Target;
+} D3DXSHADER_CONSTANTTABLE, *LPD3DXSHADER_CONSTANTTABLE;
+
+typedef struct _D3DXSHADER_CONSTANTINFO
+{
+    DWORD Name;
+    WORD  RegisterSet;
+    WORD  RegisterIndex;
+    WORD  RegisterCount;
+    WORD  Reserved;
+    DWORD TypeInfo;
+    DWORD DefaultValue;
+} D3DXSHADER_CONSTANTINFO, *LPD3DXSHADER_CONSTANTINFO;
+
+typedef struct _D3DXSHADER_TYPEINFO
+{
+    WORD  Class;
+    WORD  Type;
+    WORD  Rows;
+    WORD  Columns;
+    WORD  Elements;
+    WORD  StructMembers;
+    DWORD StructMemberInfo;
+} D3DXSHADER_TYPEINFO, *LPD3DXSHADER_TYPEINFO;

src/Layers/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_subdirectory(xrAPI)
-#add_subdirectory(xrRenderPC_R1)
+add_subdirectory(xrRenderPC_R1)
 #add_subdirectory(xrRenderPC_R2)
 #add_subdirectory(xrRenderPC_R3)
 #add_subdirectory(xrRenderPC_R4)

src/Layers/xrRender/Debug/dxPixEventWrapper.h

@@ -4,7 +4,7 @@
 #   define PIX_EVENT(Name) do { } while (false)
 #else
 #if defined(USE_DX9) || defined(USE_DX11)
-#   define PIX_EVENT(Name) dxPixEventWrapper pixEvent##Name(L#Name)
+#   define PIX_EVENT(Name) dxPixEventWrapper pixEvent##Name(L""#Name"")
 
 class dxPixEventWrapper
 {

src/Layers/xrRender/DetailModel.cpp

@@ -119,7 +119,7 @@ void CDetail::Load(IReader* S)
 }
 
 #if !defined(_EDITOR) && (defined(USE_DX9) || defined(USE_DX11))
-#include "xrstripify.h"
+#include "xrStripify.h"
 
 void CDetail::Optimize()
 {

src/Layers/xrRender/R_Backend_Runtime.cpp

@@ -8,7 +8,7 @@
 #include "Layers/xrRenderDX11/StateManager/dx11ShaderResourceStateCache.h"
 #endif
 
-#if defined(USE_DX9) || defined(USE_DX11)
+#if defined(XR_PLATFORM_WINDOWS) && (defined(USE_DX9) || defined(USE_DX11))
 #include <DirectXMath.h>
 #endif
 
@@ -162,6 +162,7 @@ void CBackend::set_ClipPlanes(u32 _enable, Fplane* _planes /*=NULL */, u32 count
     if (count > HW.Caps.geometry.dwClipPlanes)
         count = HW.Caps.geometry.dwClipPlanes;
 
+#if defined(XR_PLATFORM_WINDOWS) // FIX_LINUX XMMATRIX
     using namespace DirectX;
 
     const XMMATRIX transform = XMLoadFloat4x4(reinterpret_cast<XMFLOAT4X4*>(&Device.mFullTransform));
@@ -176,6 +177,9 @@ void CBackend::set_ClipPlanes(u32 _enable, Fplane* _planes /*=NULL */, u32 count
         XMStoreFloat4(&planeClip, XMPlaneTransform(planeWorld, worldToClipMatrixIT));
         CHK_DX(HW.pDevice->SetClipPlane(it, reinterpret_cast<float*>(&planeClip)));
     }
+#else
+    Msg("q4a XMMATRIX");
+#endif
 
     // Enable them
     u32 e_mask = (1 << count) - 1;

src/Layers/xrRender/SH_Texture.cpp

@@ -3,7 +3,9 @@
 
 #include "ResourceManager.h"
 
+#if defined(XR_PLATFORM_WINDOWS)
 #include "xrEngine/tntQAVI.h"
+#endif
 #include "xrEngine/xrTheora_Surface.h"
 
 #define PRIORITY_HIGH 12
@@ -106,6 +108,7 @@ void CTexture::apply_theora(u32 dwStage)
 };
 void CTexture::apply_avi(u32 dwStage) const
 {
+#if defined(XR_PLATFORM_WINDOWS)
     if (pAVI->NeedUpdate())
     {
         R_ASSERT(D3DRTYPE_TEXTURE == pSurface->GetType());
@@ -123,6 +126,7 @@ void CTexture::apply_avi(u32 dwStage) const
 
         R_CHK(T2D->UnlockRect(0));
     }
+#endif
     CHK_DX(HW.pDevice->SetTexture(dwStage, pSurface));
 };
 void CTexture::apply_seq(u32 dwStage)
@@ -216,6 +220,7 @@ void CTexture::Load()
         }
         else if (FS.exist(fn, "$game_textures$", *cName, ".avi"))
         {
+#if defined(XR_PLATFORM_WINDOWS)
             // AVI
             pAVI = xr_new<CAviPlayerCustom>();
 
@@ -241,6 +246,7 @@ void CTexture::Load()
                     pSurface = nullptr;
                 }
             }
+#endif
         }
         else if (FS.exist(fn, "$game_textures$", *cName, ".seq"))
         {

src/Layers/xrRender/ShaderResourceTraits.h

@@ -694,6 +694,7 @@ T* CResourceManager::CreateShader(cpcstr name, pcstr filename /*= nullptr*/, u32
         pcstr c_target, c_entry;
         ShaderTypeTraits<T>::GetCompilationTarget(c_target, c_entry, data);
 
+#if defined(XR_PLATFORM_WINDOWS) // FIX_LINUX shader_compile
 #if defined(USE_DX9)
 #   ifdef NDEBUG
         flags |= D3DXSHADER_PACKMATRIX_ROWMAJOR;
@@ -706,6 +707,7 @@ T* CResourceManager::CreateShader(cpcstr name, pcstr filename /*= nullptr*/, u32
 #   else
         flags |= D3DCOMPILE_PACK_MATRIX_ROW_MAJOR | (xrDebug::DebuggerIsPresent() ? D3DCOMPILE_DEBUG : 0);
 #   endif
+#endif
 #endif
 
         // Compile