[linux] add D3DXLoadSurfaceFromSurface implementation from WINE

q4a · Mar 15, 2022 · 499e7c8 · 499e7c8
1 parent 3683228
commit 499e7c8
Show file tree

Hide file tree

Showing 5 changed files with 1,014 additions and 3 deletions.
diff --git a/src/libs/common/include/storm_d3dx9.h b/src/libs/common/include/storm_d3dx9.h
@@ -0,0 +1,20 @@
+#pragma once
+#ifndef _WIN32
+
+#include <d3d9.h>
+#include <algorithm>
+
+#define D3DX_DEFAULT ((UINT)-1)
+
+// Textures Methods
+
+HRESULT D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+                                         const PALETTEENTRY *dst_palette, const RECT *dst_rect, const void *src_memory,
+                                         D3DFORMAT src_format, UINT src_pitch, const PALETTEENTRY *src_palette, const RECT *src_rect,
+                                         DWORD filter, D3DCOLOR color_key);
+
+HRESULT D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface,
+        const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface,
+        const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key);
+
+#endif
diff --git a/src/libs/common/include/storm_platform.h b/src/libs/common/include/storm_platform.h
@@ -8,6 +8,7 @@ inline const char *convert_path_sep(const char *cPath)
 
 #include <limits.h>
 
+#include "storm_d3dx9.h"
 #include "linux/winuser.h"
 #include "safe_str_lib.h"
 #undef EXTERN // fix for token.h:72:5: error: expected identifier EXTERN,

diff --git a/src/libs/renderer/src/s_device.cpp b/src/libs/renderer/src/s_device.cpp
@@ -3328,7 +3328,7 @@ void DX9RENDER::MakeScreenShot()
         return;
     }
 
-#ifdef _WIN32 // FIX_LINUX D3DXLoadSurfaceFromSurface
+#ifndef false //#ifdef _WIN32 // FIX_LINUX D3DXLoadSurfaceFromSurface
     if (CHECKD3DERR(D3DXLoadSurfaceFromSurface(surface, NULL, NULL, renderTarget, NULL, NULL, D3DX_DEFAULT, 0)))
 #else
     if (FAILED(d3d9->UpdateSurface(renderTarget, nullptr, surface, nullptr)))
@@ -3845,7 +3845,7 @@ HRESULT DX9RENDER::GetSurfaceLevel(IDirect3DTexture9 *ppTexture, UINT Level, IDi
 HRESULT DX9RENDER::UpdateSurface(IDirect3DSurface9 *pSourceSurface, CONST RECT *pSourceRectsArray, UINT cRects,
                                  IDirect3DSurface9 *pDestinationSurface, CONST POINT *pDestPointsArray)
 {
-#ifdef _WIN32 // FIX_LINUX D3DXLoadSurfaceFromSurface
+#ifndef false //#ifdef _WIN32 // FIX_LINUX D3DXLoadSurfaceFromSurface
     return CHECKD3DERR(D3DXLoadSurfaceFromSurface(pDestinationSurface, nullptr, nullptr, pSourceSurface, nullptr,
                                                   nullptr, D3DX_DEFAULT, 0));
 #else